diff --git a/ckan/public-bs2/base/less/masthead.less b/ckan/public-bs2/base/less/masthead.less index 8c1ccf1bc0b..ebb13672783 100644 --- 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 index 19420bb644c..8ac44efb25c 100644 --- 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 index 791deb32185..59c95ad3031 100644 --- 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 index c8062284843..9347eb03711 100644 --- 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;