Merge pull request #24 from IUCN-ELC/update_logo

Update logo
IUCN-ELC · Nov 27, 2018 · cc71954 · cc71954
2 parents fa933bf + 7903e33
commit cc71954
Show file tree

Hide file tree

Showing 12 changed files with 188 additions and 47 deletions.
diff --git a/web/themes/iucn_frontend/assets/css/style.css b/web/themes/iucn_frontend/assets/css/style.css
diff --git a/web/themes/iucn_frontend/assets/css/style.css.map b/web/themes/iucn_frontend/assets/css/style.css.map
diff --git a/web/themes/iucn_frontend/assets/css/style.min.css b/web/themes/iucn_frontend/assets/css/style.min.css
diff --git a/web/themes/iucn_frontend/assets/css/style.min.css.map b/web/themes/iucn_frontend/assets/css/style.min.css.map
diff --git a/web/themes/iucn_frontend/assets/img/logos/iucn.svg b/web/themes/iucn_frontend/assets/img/logos/iucn.svg
diff --git a/web/themes/iucn_frontend/less/footer.less b/web/themes/iucn_frontend/less/footer.less
@@ -40,6 +40,9 @@ body {
     a {
       display: block;
     }
+    img {
+      max-width: 100%;
+    }
   }
 }
 
@@ -70,7 +73,8 @@ body {
     text-align: center;
 
     .logos {
-      display: inline-block;
+      align-items: center;
+      display: inline-flex;
       float: none;
     }
   }
@@ -80,3 +84,7 @@ body {
     float: none;
   }
 }
+
+.iucn-logo {
+  margin-right: 1em;
+}
diff --git a/web/themes/iucn_frontend/less/jumbotron.less b/web/themes/iucn_frontend/less/jumbotron.less
@@ -35,7 +35,7 @@
 
   .path-frontpage & {
     // background-position: center bottom;
-    height: calc(100vh - 182px);
+    height: calc(100vh - 182px - @navbar-increase);
     margin-bottom: 0;
     min-height: 231px;
 
@@ -139,19 +139,20 @@
 @media (max-width: 767px) {
   .jumbotron {
     .path-frontpage & {
-      height: calc(100vh - 239px);
+      height: calc(100vh - 239px - @navbar-increase);
+      min-height: 340px;
     }
 
     .path-frontpage #sliding-popup ~ & {
-      height: calc(100vh - 286px);
+      height: calc(100vh - 286px - @navbar-increase);
     }
 
     .path-frontpage.toolbar-fixed & {
-      height: calc(100vh - 278px);
+      height: calc(100vh - 278px - @navbar-increase);
     }
 
     .path-frontpage.toolbar-fixed.toolbar-tray-open & {
-      height: calc(100vh - 318px);
+      height: calc(100vh - 318px - @navbar-increase);
     }
   }
 }
diff --git a/web/themes/iucn_frontend/less/navbar.less b/web/themes/iucn_frontend/less/navbar.less
@@ -6,6 +6,14 @@
     margin-right: 20px;
     margin-top: 12px;
     padding-right: 0;
+    height: @navbar-logo-height--mobile;
+    @media (min-width: 1200px) {
+      height: @navbar-logo-height;
+    }
+    img {
+      height: 100%;
+      width: auto;
+    }
   }
 }
 
@@ -26,3 +34,15 @@
     }
   }
 }
+
+@media (min-width: 1200px) {
+  .navbar-nav>li>a {
+    padding-top: (33px + (@navbar-increase / 2));
+    padding-bottom: (33px + (@navbar-increase / 2));
+  }
+}
+
+.navbar-toggle {
+  margin-top: (27px + (@navbar-increase--mobile / 2));
+  margin-bottom: (27px + (@navbar-increase--mobile / 2));
+}
diff --git a/web/themes/iucn_frontend/less/variables.less b/web/themes/iucn_frontend/less/variables.less
@@ -1 +1,7 @@
 @node-modules: "../node_modules";
+
+@navbar-logo-height: 90px;
+@navbar-logo-height--mobile: 80px;
+// Variable used to increase the site logo height across page components (e.g. jumbotron height, main menu item paddings)
+@navbar-increase: (@navbar-logo-height - 64px);
+@navbar-increase--mobile: (@navbar-logo-height--mobile - 64px);