Merge pull request #4284 from gocemitevski/site-logo-height

Limit maximum height of site logo to scale down very large images
ckan · Jun 11, 2018 · 0c69a13 · 0c69a13
2 parents 61a8b19 + 1864aa2
commit 0c69a13
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/ckan/public-bs2/base/less/masthead.less b/ckan/public-bs2/base/less/masthead.less
@@ -24,13 +24,13 @@
           span.text {
             margin: 0 2px 0 4px;
           }
-          
+
           span.text {
             position: absolute;
             top: -9999px;
             left: -9999px;
           }
-          
+
           &:hover {
             color: mix(@mastheadBackgroundColor, @mastheadLinkColor, 15%);
             background-color: darken(@mastheadBackgroundColor, 15%);
@@ -118,7 +118,12 @@
       white-space: nowrap;
     }
   }
-
+  .logo{
+    display: inline-block;
+    img{
+      max-height: @logoMaxHeight;
+    }
+  }
   .nav-collapse {
     padding-top:10px;
   }

diff --git a/ckan/public-bs2/base/less/variables.less b/ckan/public-bs2/base/less/variables.less
@@ -12,6 +12,7 @@
 @layoutBackgroundColor: #eee;
 @layoutTrimBackgroundColor: #fff;
 @layoutTrimBorderColor: #ccc;
+@logoMaxHeight: 55px;
 
 @navLinkColor: #333;
 @navActiveBackgroundColor: #f6f6f6;

diff --git a/ckan/public/base/less/masthead.less b/ckan/public/base/less/masthead.less
@@ -113,6 +113,12 @@
             white-space: nowrap;
         }
     }
+    .logo{
+      display: inline-block;
+      img{
+        max-height: @logoMaxHeight;
+      }
+    }
     .navbar-collapse {
         padding: @grid-gutter-width/3 0;
     }

diff --git a/ckan/public/base/less/variables.less b/ckan/public/base/less/variables.less
@@ -12,6 +12,7 @@
 @layoutBackgroundColor: #eee;
 @layoutTrimBackgroundColor: #fff;
 @layoutTrimBorderColor: #ccc;
+@logoMaxHeight: 60px;
 
 @navLinkColor: #333;
 @navActiveBackgroundColor: #f6f6f6;