Mobile complete. Errors fixed. Initial release.

Vanguard90 · Dec 6, 2016 · 7175869 · 7175869
1 parent 600be7d
commit 7175869
Show file tree

Hide file tree

Showing 43 changed files with 159 additions and 10 deletions.
diff --git a/secondary/Color.txt → mock-website/Color.txt b/secondary/Color.txt → mock-website/Color.txt
diff --git a/secondary/fonts/anson/Anson-Regular.otf → mock-website/fonts/anson/Anson-Regular.otf b/secondary/fonts/anson/Anson-Regular.otf → mock-website/fonts/anson/Anson-Regular.otf
diff --git a/secondary/fonts/garamond/Garamond.ttf → mock-website/fonts/garamond/Garamond.ttf b/secondary/fonts/garamond/Garamond.ttf → mock-website/fonts/garamond/Garamond.ttf
diff --git a/secondary/fonts/roboto/NOTICE.txt → mock-website/fonts/roboto/NOTICE.txt b/secondary/fonts/roboto/NOTICE.txt → mock-website/fonts/roboto/NOTICE.txt
diff --git a/secondary/fonts/roboto/Roboto-Black.ttf → mock-website/fonts/roboto/Roboto-Black.ttf b/secondary/fonts/roboto/Roboto-Black.ttf → mock-website/fonts/roboto/Roboto-Black.ttf
diff --git a/...ndary/fonts/roboto/Roboto-BlackItalic.ttf → ...bsite/fonts/roboto/Roboto-BlackItalic.ttf b/...ndary/fonts/roboto/Roboto-BlackItalic.ttf → ...bsite/fonts/roboto/Roboto-BlackItalic.ttf
diff --git a/secondary/fonts/roboto/Roboto-Bold.ttf → mock-website/fonts/roboto/Roboto-Bold.ttf b/secondary/fonts/roboto/Roboto-Bold.ttf → mock-website/fonts/roboto/Roboto-Bold.ttf
diff --git a/...ary/fonts/roboto/Roboto-BoldCondensed.ttf → ...ite/fonts/roboto/Roboto-BoldCondensed.ttf b/...ary/fonts/roboto/Roboto-BoldCondensed.ttf → ...ite/fonts/roboto/Roboto-BoldCondensed.ttf
diff --git a/...nts/roboto/Roboto-BoldCondensedItalic.ttf → ...nts/roboto/Roboto-BoldCondensedItalic.ttf b/...nts/roboto/Roboto-BoldCondensedItalic.ttf → ...nts/roboto/Roboto-BoldCondensedItalic.ttf
diff --git a/secondary/fonts/roboto/Roboto-BoldItalic.ttf → ...ebsite/fonts/roboto/Roboto-BoldItalic.ttf b/secondary/fonts/roboto/Roboto-BoldItalic.ttf → ...ebsite/fonts/roboto/Roboto-BoldItalic.ttf
diff --git a/secondary/fonts/roboto/Roboto-Condensed.ttf → ...website/fonts/roboto/Roboto-Condensed.ttf b/secondary/fonts/roboto/Roboto-Condensed.ttf → ...website/fonts/roboto/Roboto-Condensed.ttf
diff --git a/...y/fonts/roboto/Roboto-CondensedItalic.ttf → ...e/fonts/roboto/Roboto-CondensedItalic.ttf b/...y/fonts/roboto/Roboto-CondensedItalic.ttf → ...e/fonts/roboto/Roboto-CondensedItalic.ttf
diff --git a/secondary/fonts/roboto/Roboto-Italic.ttf → mock-website/fonts/roboto/Roboto-Italic.ttf b/secondary/fonts/roboto/Roboto-Italic.ttf → mock-website/fonts/roboto/Roboto-Italic.ttf
diff --git a/secondary/fonts/roboto/Roboto-Light.ttf → mock-website/fonts/roboto/Roboto-Light.ttf b/secondary/fonts/roboto/Roboto-Light.ttf → mock-website/fonts/roboto/Roboto-Light.ttf
diff --git a/...ndary/fonts/roboto/Roboto-LightItalic.ttf → ...bsite/fonts/roboto/Roboto-LightItalic.ttf b/...ndary/fonts/roboto/Roboto-LightItalic.ttf → ...bsite/fonts/roboto/Roboto-LightItalic.ttf
diff --git a/secondary/fonts/roboto/Roboto-Medium.ttf → mock-website/fonts/roboto/Roboto-Medium.ttf b/secondary/fonts/roboto/Roboto-Medium.ttf → mock-website/fonts/roboto/Roboto-Medium.ttf
diff --git a/...dary/fonts/roboto/Roboto-MediumItalic.ttf → ...site/fonts/roboto/Roboto-MediumItalic.ttf b/...dary/fonts/roboto/Roboto-MediumItalic.ttf → ...site/fonts/roboto/Roboto-MediumItalic.ttf
diff --git a/secondary/fonts/roboto/Roboto-Regular.ttf → mock-website/fonts/roboto/Roboto-Regular.ttf b/secondary/fonts/roboto/Roboto-Regular.ttf → mock-website/fonts/roboto/Roboto-Regular.ttf
diff --git a/secondary/fonts/roboto/Roboto-Thin.ttf → mock-website/fonts/roboto/Roboto-Thin.ttf b/secondary/fonts/roboto/Roboto-Thin.ttf → mock-website/fonts/roboto/Roboto-Thin.ttf
diff --git a/secondary/fonts/roboto/Roboto-ThinItalic.ttf → ...ebsite/fonts/roboto/Roboto-ThinItalic.ttf b/secondary/fonts/roboto/Roboto-ThinItalic.ttf → ...ebsite/fonts/roboto/Roboto-ThinItalic.ttf
diff --git a/...ary/fonts/roboto/Roboto_Specimen_Book.pdf → ...ite/fonts/roboto/Roboto_Specimen_Book.pdf b/...ary/fonts/roboto/Roboto_Specimen_Book.pdf → ...ite/fonts/roboto/Roboto_Specimen_Book.pdf
diff --git a/secondary/img/header/hamburger-svg-white.svg → ...ebsite/img/header/hamburger-svg-white.svg b/secondary/img/header/hamburger-svg-white.svg → ...ebsite/img/header/hamburger-svg-white.svg
diff --git a/secondary/img/header/leaf1-thumbnail.jpg → mock-website/img/header/leaf1-thumbnail.jpg b/secondary/img/header/leaf1-thumbnail.jpg → mock-website/img/header/leaf1-thumbnail.jpg
diff --git a/secondary/img/header/leaf2-thumbnail.jpg → mock-website/img/header/leaf2-thumbnail.jpg b/secondary/img/header/leaf2-thumbnail.jpg → mock-website/img/header/leaf2-thumbnail.jpg
diff --git a/secondary/img/header/leaf3-thumbnail.jpg → mock-website/img/header/leaf3-thumbnail.jpg b/secondary/img/header/leaf3-thumbnail.jpg → mock-website/img/header/leaf3-thumbnail.jpg
diff --git a/secondary/img/icons/facebook-icon-invert.png → ...ebsite/img/icons/facebook-icon-invert.png b/secondary/img/icons/facebook-icon-invert.png → ...ebsite/img/icons/facebook-icon-invert.png
diff --git a/secondary/img/icons/instagram-icon-white.png → ...ebsite/img/icons/instagram-icon-white.png b/secondary/img/icons/instagram-icon-white.png → ...ebsite/img/icons/instagram-icon-white.png
diff --git a/secondary/img/icons/linkedin-icon-white.png → ...website/img/icons/linkedin-icon-white.png b/secondary/img/icons/linkedin-icon-white.png → ...website/img/icons/linkedin-icon-white.png
diff --git a/secondary/img/icons/twitter-icon-white.png → ...-website/img/icons/twitter-icon-white.png b/secondary/img/icons/twitter-icon-white.png → ...-website/img/icons/twitter-icon-white.png
diff --git a/.../img/masthead/trees-masthead-1920x600.jpg → .../img/masthead/trees-masthead-1920x600.jpg b/.../img/masthead/trees-masthead-1920x600.jpg → .../img/masthead/trees-masthead-1920x600.jpg
diff --git a/.../img/masthead/trees-masthead-1920x800.jpg → .../img/masthead/trees-masthead-1920x800.jpg b/.../img/masthead/trees-masthead-1920x800.jpg → .../img/masthead/trees-masthead-1920x800.jpg
diff --git a/...y/img/masthead/trees-masthead-450x350.jpg → ...e/img/masthead/trees-masthead-450x350.jpg b/...y/img/masthead/trees-masthead-450x350.jpg → ...e/img/masthead/trees-masthead-450x350.jpg
diff --git a/...y/img/masthead/trees-masthead-700x350.jpg → ...e/img/masthead/trees-masthead-700x350.jpg b/...y/img/masthead/trees-masthead-700x350.jpg → ...e/img/masthead/trees-masthead-700x350.jpg
diff --git a/...y/img/masthead/trees-masthead-960x600.jpg → ...e/img/masthead/trees-masthead-960x600.jpg b/...y/img/masthead/trees-masthead-960x600.jpg → ...e/img/masthead/trees-masthead-960x600.jpg
diff --git a/secondary/img/section-1/wood-1-l.jpg → mock-website/img/section-1/wood-1-l.jpg b/secondary/img/section-1/wood-1-l.jpg → mock-website/img/section-1/wood-1-l.jpg
diff --git a/secondary/img/section-1/wood-2-l.jpg → mock-website/img/section-1/wood-2-l.jpg b/secondary/img/section-1/wood-2-l.jpg → mock-website/img/section-1/wood-2-l.jpg
diff --git a/secondary/img/section-1/wood-3-l.jpg → mock-website/img/section-1/wood-3-l.jpg b/secondary/img/section-1/wood-3-l.jpg → mock-website/img/section-1/wood-3-l.jpg
diff --git a/secondary/img/section-2/forest-teaser-l.jpg → ...website/img/section-2/forest-teaser-l.jpg b/secondary/img/section-2/forest-teaser-l.jpg → ...website/img/section-2/forest-teaser-l.jpg
diff --git a/secondary/img/section-2/moss-teaser-2-l.jpg → ...website/img/section-2/moss-teaser-2-l.jpg b/secondary/img/section-2/moss-teaser-2-l.jpg → ...website/img/section-2/moss-teaser-2-l.jpg
diff --git a/secondary/index.html → mock-website/index.html b/secondary/index.html → mock-website/index.html
@@ -1,6 +1,13 @@
 <!DOCTYPE html>
 <html>
     <head>
+<!-- Google Tag Manager -->
+<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+})(window,document,'script','dataLayer','GTM-KZJH48');</script>
+<!-- End Google Tag Manager -->
         <meta charset="utf-8">
         <meta http-equiv="x-ua-compatible" content="ie=edge">
         <meta name="viewport" content="width-device-width, initial-scale=1">

diff --git a/secondary/js-main.js → mock-website/js-main.js b/secondary/js-main.js → mock-website/js-main.js
@@ -62,6 +62,8 @@ headerTag.removeChild(hamburgerMenu);
 
 /* Mobile hamburger click start */
 
+if (windowWidth < 701) {
+
 let hamburgerImage = document.getElementsByClassName("hamburger-image");
 let nav = document.getElementsByClassName("nav");
 let imgTag = document.getElementsByTagName("img")[1];
@@ -88,13 +90,16 @@ if (imgTag.classList.contains('hamburger-active')) {
 
 }
 
+}
+
 /*Mobile hamburger click end */
 
 /* No link click event start */
 
 var buttonClick = document.getElementsByClassName("noLink");
 var i;
 for (i = 0; i < buttonClick.length; i++) {
+
     buttonClick[i].addEventListener("click", function clickFunction() {alert('This link is not the link you are looking for.')}, false);
 }
 

diff --git a/secondary/main.css → mock-website/main.css b/secondary/main.css → mock-website/main.css
@@ -13,7 +13,6 @@ menu, nav, output, ruby, section, summary,
 time, mark, audio, video {
     margin: 0 0 0 0;
     padding: 0 0 0 0;
-    border: 0 0 0 0;
     line-height: 1;
 }
 
@@ -245,7 +244,7 @@ h1 {
 
 h2 {
     font-size: 36px;
-    font-weight: 350;
+    font-weight: 400;
 }
 
 .main-section {
@@ -464,6 +463,11 @@ footer div h4 a:hover {
   src: url("fonts/garamond/Garamond.ttf");
 }
 
+@font-face {
+  font-family: "Anson";
+  src: url("fonts/anson/Anson-Regular.otf");
+}
+
 header {
 
     background: rgba(39,52,46,0.7);
@@ -661,7 +665,7 @@ h1, h2 {
 
     h2 {
     font-size: 32px;
-    font-weight: 350;
+    font-weight: 400;
     }
 
 .main-section {
@@ -904,6 +908,11 @@ footer div h4 a:hover {
   src: url("fonts/garamond/Garamond.ttf");
 }
 
+@font-face {
+  font-family: "Anson";
+  src: url("fonts/anson/Anson-Regular.otf");
+}
+
 header {
 
     background: rgba(39,52,46,0.7);
@@ -1013,7 +1022,7 @@ header ol li:hover .header-element-11, header ol li:hover .header-element-12, he
 
 .hamburger-image {
 
-    vertical-align: center;
+    vertical-align: middle;
 }
 
 .nav {
@@ -1111,7 +1120,7 @@ h1 {
 
 h2 {
     font-size: 28px;
-    font-weight: 350;
+    font-weight: 400;
 }
 
 .main-section {
@@ -1304,7 +1313,7 @@ footer div h4 a:hover {
 /* Mobile-specific changes */
 
 .left {
-    float: center;
+    float: initial;
 }
 
 /*Mobile spesific changes end */
@@ -1316,7 +1325,7 @@ footer div h4 a:hover {
 /* Mobile-specific changes */
 
 .right {
-    float: center;
+    float: initial;
     text-align: center;
 }
 
@@ -1349,6 +1358,129 @@ footer div h4 a:hover {
   src: url("fonts/garamond/Garamond.ttf");
 }
 
+@font-face {
+  font-family: "Anson";
+  src: url("fonts/anson/Anson-Regular.otf");
+}
+
+header {
+
+    background: rgba(39,52,46,0.7);
+    min-height: 50px;
+    width: 100%;
+    z-index: 1;
+    position: absolute;
+}
+
+header div {
+
+    width: 49%;
+    height: 50px;
+    padding-right: 0%;
+    display: inline-block;
+}
+
+header div img.first-image, header div img.second-image, header div img.third-image {
+
+    position: absolute;
+}
+
+.header-element {
+
+    font-size: 16px;
+    width: 100%;
+    font-weight: 900;
+    margin-top: 0.5%;
+    padding: 0 0.4%;
+}
+
+header ol {
+
+    list-style-type:none;
+    position: relative;
+    display: block;
+    float: right;
+    font-family: "Anson", sans-serif;
+    min-height: 50px;
+    margin-top: 0.4%;
+    width: 100%;
+}
+
+header ol li:last-child {
+
+    margin-right: 0;
+}
+
+header ol li {
+
+    position: relative;
+    display: block;
+    float: left;
+    text-align: center;
+    vertical-align: middle;
+    margin-bottom: 1%;
+}
+
+header ol li a {
+
+    color: #e1e4e7;
+    font-size: 18px;
+    text-decoration: none;
+}
+
+.header-element ul li a {
+
+    color: #27342e;
+}
+
+.header-element-11, .header-element-12, .header-element-13 {
+
+    display: none;
+    width: inherit;
+    position: relative;
+
+}
+
+header ol li:hover .header-element-11, header ol li:hover .header-element-12, header ol li:hover .header-element-13 {
+
+    display: block;
+    width: 100%;
+    z-index: 2;
+    background-color: #ffffff;
+    padding: 15px 5px 5px 5px;
+}
+
+.header-element-11, .header-element-12, .header-element-13 {
+
+    font-weight: 500;
+    padding-top: 20px;
+}
+
+.mobile-hamburger {
+
+    min-height: 50px;
+}
+
+.hamburger-menu {
+  position: relative;
+  padding-right: 3%;
+  padding-top: 0px;
+  height: 20%;
+  width: 20%;
+  float: right;
+}
+
+.hamburger-image {
+
+    vertical-align: middle;
+}
+
+.nav {
+
+    display: none;
+}
+
+
 .popup {
 
     display: none;
@@ -1438,7 +1570,7 @@ h1 {
 
 h2 {
     font-size: 24px;
-    font-weight: 350;
+    font-weight: 400;
 }
 
 .main-section {
@@ -1587,6 +1719,11 @@ footer {
     padding-right: 1%;
     border-right: solid #e1e4e7 1px;
 }
+
+.left ul li:last-child {
+    border-right: none;
+}
+
 /* Mobile-specific changes */
 
 .mobile-full {
@@ -1625,7 +1762,7 @@ footer div h4 a:hover {
 /* Mobile-specific changes */
 
 .left {
-    float: center;
+    float: initial;
 }
 
 /*Mobile spesific changes end */
@@ -1637,7 +1774,7 @@ footer div h4 a:hover {
 /* Mobile-specific changes */
 
 .right {
-    float: center;
+    float: initial;
     text-align: center;
 }
 

diff --git a/secondary/img/header/tree-thumbnail-mock-logo.jpg b/secondary/img/header/tree-thumbnail-mock-logo.jpg