diff --git a/secondary/Color.txt b/mock-website/Color.txt similarity index 100% rename from secondary/Color.txt rename to mock-website/Color.txt diff --git a/secondary/fonts/anson/Anson-Regular.otf b/mock-website/fonts/anson/Anson-Regular.otf similarity index 100% rename from secondary/fonts/anson/Anson-Regular.otf rename to mock-website/fonts/anson/Anson-Regular.otf diff --git a/secondary/fonts/garamond/Garamond.ttf b/mock-website/fonts/garamond/Garamond.ttf similarity index 100% rename from secondary/fonts/garamond/Garamond.ttf rename to mock-website/fonts/garamond/Garamond.ttf diff --git a/secondary/fonts/roboto/NOTICE.txt b/mock-website/fonts/roboto/NOTICE.txt similarity index 100% rename from secondary/fonts/roboto/NOTICE.txt rename to mock-website/fonts/roboto/NOTICE.txt diff --git a/secondary/fonts/roboto/Roboto-Black.ttf b/mock-website/fonts/roboto/Roboto-Black.ttf similarity index 100% rename from secondary/fonts/roboto/Roboto-Black.ttf rename to mock-website/fonts/roboto/Roboto-Black.ttf diff --git a/secondary/fonts/roboto/Roboto-BlackItalic.ttf b/mock-website/fonts/roboto/Roboto-BlackItalic.ttf similarity index 100% rename from secondary/fonts/roboto/Roboto-BlackItalic.ttf rename to mock-website/fonts/roboto/Roboto-BlackItalic.ttf diff --git a/secondary/fonts/roboto/Roboto-Bold.ttf b/mock-website/fonts/roboto/Roboto-Bold.ttf similarity index 100% rename from secondary/fonts/roboto/Roboto-Bold.ttf rename to mock-website/fonts/roboto/Roboto-Bold.ttf diff --git a/secondary/fonts/roboto/Roboto-BoldCondensed.ttf b/mock-website/fonts/roboto/Roboto-BoldCondensed.ttf similarity index 100% rename from secondary/fonts/roboto/Roboto-BoldCondensed.ttf rename to mock-website/fonts/roboto/Roboto-BoldCondensed.ttf diff --git a/secondary/fonts/roboto/Roboto-BoldCondensedItalic.ttf b/mock-website/fonts/roboto/Roboto-BoldCondensedItalic.ttf similarity index 100% rename from secondary/fonts/roboto/Roboto-BoldCondensedItalic.ttf rename to mock-website/fonts/roboto/Roboto-BoldCondensedItalic.ttf diff --git a/secondary/fonts/roboto/Roboto-BoldItalic.ttf b/mock-website/fonts/roboto/Roboto-BoldItalic.ttf similarity index 100% rename from secondary/fonts/roboto/Roboto-BoldItalic.ttf rename to mock-website/fonts/roboto/Roboto-BoldItalic.ttf diff --git a/secondary/fonts/roboto/Roboto-Condensed.ttf b/mock-website/fonts/roboto/Roboto-Condensed.ttf similarity index 100% rename from secondary/fonts/roboto/Roboto-Condensed.ttf rename to mock-website/fonts/roboto/Roboto-Condensed.ttf diff --git a/secondary/fonts/roboto/Roboto-CondensedItalic.ttf b/mock-website/fonts/roboto/Roboto-CondensedItalic.ttf similarity index 100% rename from secondary/fonts/roboto/Roboto-CondensedItalic.ttf rename to mock-website/fonts/roboto/Roboto-CondensedItalic.ttf diff --git a/secondary/fonts/roboto/Roboto-Italic.ttf b/mock-website/fonts/roboto/Roboto-Italic.ttf similarity index 100% rename from secondary/fonts/roboto/Roboto-Italic.ttf rename to mock-website/fonts/roboto/Roboto-Italic.ttf diff --git a/secondary/fonts/roboto/Roboto-Light.ttf b/mock-website/fonts/roboto/Roboto-Light.ttf similarity index 100% rename from secondary/fonts/roboto/Roboto-Light.ttf rename to mock-website/fonts/roboto/Roboto-Light.ttf diff --git a/secondary/fonts/roboto/Roboto-LightItalic.ttf b/mock-website/fonts/roboto/Roboto-LightItalic.ttf similarity index 100% rename from secondary/fonts/roboto/Roboto-LightItalic.ttf rename to mock-website/fonts/roboto/Roboto-LightItalic.ttf diff --git a/secondary/fonts/roboto/Roboto-Medium.ttf b/mock-website/fonts/roboto/Roboto-Medium.ttf similarity index 100% rename from secondary/fonts/roboto/Roboto-Medium.ttf rename to mock-website/fonts/roboto/Roboto-Medium.ttf diff --git a/secondary/fonts/roboto/Roboto-MediumItalic.ttf b/mock-website/fonts/roboto/Roboto-MediumItalic.ttf similarity index 100% rename from secondary/fonts/roboto/Roboto-MediumItalic.ttf rename to mock-website/fonts/roboto/Roboto-MediumItalic.ttf diff --git a/secondary/fonts/roboto/Roboto-Regular.ttf b/mock-website/fonts/roboto/Roboto-Regular.ttf similarity index 100% rename from secondary/fonts/roboto/Roboto-Regular.ttf rename to mock-website/fonts/roboto/Roboto-Regular.ttf diff --git a/secondary/fonts/roboto/Roboto-Thin.ttf b/mock-website/fonts/roboto/Roboto-Thin.ttf similarity index 100% rename from secondary/fonts/roboto/Roboto-Thin.ttf rename to mock-website/fonts/roboto/Roboto-Thin.ttf diff --git a/secondary/fonts/roboto/Roboto-ThinItalic.ttf b/mock-website/fonts/roboto/Roboto-ThinItalic.ttf similarity index 100% rename from secondary/fonts/roboto/Roboto-ThinItalic.ttf rename to mock-website/fonts/roboto/Roboto-ThinItalic.ttf diff --git a/secondary/fonts/roboto/Roboto_Specimen_Book.pdf b/mock-website/fonts/roboto/Roboto_Specimen_Book.pdf similarity index 100% rename from secondary/fonts/roboto/Roboto_Specimen_Book.pdf rename to mock-website/fonts/roboto/Roboto_Specimen_Book.pdf diff --git a/secondary/img/header/hamburger-svg-white.svg b/mock-website/img/header/hamburger-svg-white.svg similarity index 100% rename from secondary/img/header/hamburger-svg-white.svg rename to mock-website/img/header/hamburger-svg-white.svg diff --git a/secondary/img/header/leaf1-thumbnail.jpg b/mock-website/img/header/leaf1-thumbnail.jpg similarity index 100% rename from secondary/img/header/leaf1-thumbnail.jpg rename to mock-website/img/header/leaf1-thumbnail.jpg diff --git a/secondary/img/header/leaf2-thumbnail.jpg b/mock-website/img/header/leaf2-thumbnail.jpg similarity index 100% rename from secondary/img/header/leaf2-thumbnail.jpg rename to mock-website/img/header/leaf2-thumbnail.jpg diff --git a/secondary/img/header/leaf3-thumbnail.jpg b/mock-website/img/header/leaf3-thumbnail.jpg similarity index 100% rename from secondary/img/header/leaf3-thumbnail.jpg rename to mock-website/img/header/leaf3-thumbnail.jpg diff --git a/secondary/img/icons/facebook-icon-invert.png b/mock-website/img/icons/facebook-icon-invert.png similarity index 100% rename from secondary/img/icons/facebook-icon-invert.png rename to mock-website/img/icons/facebook-icon-invert.png diff --git a/secondary/img/icons/instagram-icon-white.png b/mock-website/img/icons/instagram-icon-white.png similarity index 100% rename from secondary/img/icons/instagram-icon-white.png rename to mock-website/img/icons/instagram-icon-white.png diff --git a/secondary/img/icons/linkedin-icon-white.png b/mock-website/img/icons/linkedin-icon-white.png similarity index 100% rename from secondary/img/icons/linkedin-icon-white.png rename to mock-website/img/icons/linkedin-icon-white.png diff --git a/secondary/img/icons/twitter-icon-white.png b/mock-website/img/icons/twitter-icon-white.png similarity index 100% rename from secondary/img/icons/twitter-icon-white.png rename to mock-website/img/icons/twitter-icon-white.png diff --git a/secondary/img/masthead/trees-masthead-1920x600.jpg b/mock-website/img/masthead/trees-masthead-1920x600.jpg similarity index 100% rename from secondary/img/masthead/trees-masthead-1920x600.jpg rename to mock-website/img/masthead/trees-masthead-1920x600.jpg diff --git a/secondary/img/masthead/trees-masthead-1920x800.jpg b/mock-website/img/masthead/trees-masthead-1920x800.jpg similarity index 100% rename from secondary/img/masthead/trees-masthead-1920x800.jpg rename to mock-website/img/masthead/trees-masthead-1920x800.jpg diff --git a/secondary/img/masthead/trees-masthead-450x350.jpg b/mock-website/img/masthead/trees-masthead-450x350.jpg similarity index 100% rename from secondary/img/masthead/trees-masthead-450x350.jpg rename to mock-website/img/masthead/trees-masthead-450x350.jpg diff --git a/secondary/img/masthead/trees-masthead-700x350.jpg b/mock-website/img/masthead/trees-masthead-700x350.jpg similarity index 100% rename from secondary/img/masthead/trees-masthead-700x350.jpg rename to mock-website/img/masthead/trees-masthead-700x350.jpg diff --git a/secondary/img/masthead/trees-masthead-960x600.jpg b/mock-website/img/masthead/trees-masthead-960x600.jpg similarity index 100% rename from secondary/img/masthead/trees-masthead-960x600.jpg rename to mock-website/img/masthead/trees-masthead-960x600.jpg diff --git a/secondary/img/section-1/wood-1-l.jpg b/mock-website/img/section-1/wood-1-l.jpg similarity index 100% rename from secondary/img/section-1/wood-1-l.jpg rename to mock-website/img/section-1/wood-1-l.jpg diff --git a/secondary/img/section-1/wood-2-l.jpg b/mock-website/img/section-1/wood-2-l.jpg similarity index 100% rename from secondary/img/section-1/wood-2-l.jpg rename to mock-website/img/section-1/wood-2-l.jpg diff --git a/secondary/img/section-1/wood-3-l.jpg b/mock-website/img/section-1/wood-3-l.jpg similarity index 100% rename from secondary/img/section-1/wood-3-l.jpg rename to mock-website/img/section-1/wood-3-l.jpg diff --git a/secondary/img/section-2/forest-teaser-l.jpg b/mock-website/img/section-2/forest-teaser-l.jpg similarity index 100% rename from secondary/img/section-2/forest-teaser-l.jpg rename to mock-website/img/section-2/forest-teaser-l.jpg diff --git a/secondary/img/section-2/moss-teaser-2-l.jpg b/mock-website/img/section-2/moss-teaser-2-l.jpg similarity index 100% rename from secondary/img/section-2/moss-teaser-2-l.jpg rename to mock-website/img/section-2/moss-teaser-2-l.jpg diff --git a/secondary/index.html b/mock-website/index.html similarity index 95% rename from secondary/index.html rename to mock-website/index.html index 05633b01..5b6b837e 100644 --- a/secondary/index.html +++ b/mock-website/index.html @@ -1,6 +1,13 @@ + + + diff --git a/secondary/js-main.js b/mock-website/js-main.js similarity index 99% rename from secondary/js-main.js rename to mock-website/js-main.js index 3a829835..972117ed 100644 --- a/secondary/js-main.js +++ b/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,6 +90,8 @@ if (imgTag.classList.contains('hamburger-active')) { } +} + /*Mobile hamburger click end */ /* No link click event start */ @@ -95,6 +99,7 @@ if (imgTag.classList.contains('hamburger-active')) { 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 b/mock-website/main.css similarity index 91% rename from secondary/main.css rename to mock-website/main.css index 30cb9d4a..ed9ecc55 100644 --- a/secondary/main.css +++ b/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 deleted file mode 100644 index 1d91635e..00000000 Binary files a/secondary/img/header/tree-thumbnail-mock-logo.jpg and /dev/null differ