From d27d19e02ad5e2708d376099b8dbf0f13317849c Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Fri, 17 Jun 2016 14:18:52 +0100 Subject: [PATCH 1/4] added override for navbar background image --- services/web/app/views/layout/navbar.jade | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/web/app/views/layout/navbar.jade b/services/web/app/views/layout/navbar.jade index a65fd72fc1..b6b3c61741 100644 --- a/services/web/app/views/layout/navbar.jade +++ b/services/web/app/views/layout/navbar.jade @@ -3,7 +3,9 @@ nav.navbar.navbar-default .navbar-header button.navbar-toggle(ng-init="navCollapsed = true", ng-click="navCollapsed = !navCollapsed", ng-class="{active: !navCollapsed}") i.fa.fa-bars - if nav.title + if settings.nav.custom_logo + a(href='/', style='background-image:url("#{settings.nav.custom_logo}")').navbar-brand + else if (nav.title) a(href='/').navbar-title #{nav.title} else a(href='/').navbar-brand From 8b79587c9b7993c58e9e780b07132e7da7dd0425 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Fri, 17 Jun 2016 14:22:20 +0100 Subject: [PATCH 2/4] add settings as a value to reference in defaults file --- services/web/config/settings.defaults.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee index beb933e4c9..ce95780075 100644 --- a/services/web/config/settings.defaults.coffee +++ b/services/web/config/settings.defaults.coffee @@ -15,7 +15,7 @@ httpAuthUsers[httpAuthUser] = httpAuthPass sessionSecret = "secret-please-change" -module.exports = +module.exports = settings = # File storage # ------------ # From 732a0fdca0f9d4aef78e6e8361762cc7af74bc3f Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Fri, 17 Jun 2016 14:37:39 +0100 Subject: [PATCH 3/4] Fit brand image into container. --- services/web/public/stylesheets/components/navbar.less | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/web/public/stylesheets/components/navbar.less b/services/web/public/stylesheets/components/navbar.less index 9a7555cb81..e0897cbc8e 100755 --- a/services/web/public/stylesheets/components/navbar.less +++ b/services/web/public/stylesheets/components/navbar.less @@ -382,9 +382,10 @@ .navbar-brand { background-image: url('/img/logo.png'); - background-size: 135px 16px; + background-size: contain; background-repeat: no-repeat; - height: 16px; + background-position: left center; + height: 37px; margin-top: 10px; padding: 0; width: 135px; From 7316a429c07953909a1dfa7452340c910dd58144 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Fri, 17 Jun 2016 14:55:04 +0100 Subject: [PATCH 4/4] Increase maximum brand image height. --- services/web/public/stylesheets/components/navbar.less | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/services/web/public/stylesheets/components/navbar.less b/services/web/public/stylesheets/components/navbar.less index e0897cbc8e..5079b10b7e 100755 --- a/services/web/public/stylesheets/components/navbar.less +++ b/services/web/public/stylesheets/components/navbar.less @@ -381,14 +381,15 @@ padding: 1rem 2rem; .navbar-brand { + position: absolute; + top: 5px; + bottom: 5px; + width: 135px; + padding: 0; background-image: url('/img/logo.png'); background-size: contain; background-repeat: no-repeat; background-position: left center; - height: 37px; - margin-top: 10px; - padding: 0; - width: 135px; } @media only screen and (-webkit-min-device-pixel-ratio: 2),