From ff1908d2e6de295d121f4f0b94f156fa12897be2 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Mon, 9 Apr 2018 01:52:49 +0530 Subject: [PATCH 1/5] added navbar-transparent styles to glasfaser.css --- datacenterlight/static/datacenterlight/css/common.css | 5 ++++- .../static/datacenterlight/css/landing-page.css | 4 ---- ungleich_page/static/ungleich_page/css/glasfaser.css | 8 +++++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/datacenterlight/static/datacenterlight/css/common.css b/datacenterlight/static/datacenterlight/css/common.css index 88db9376..895256ef 100644 --- a/datacenterlight/static/datacenterlight/css/common.css +++ b/datacenterlight/static/datacenterlight/css/common.css @@ -74,6 +74,10 @@ a.list-group-item-danger.active:focus { padding: 10px; } +.navbar-brand > img { + height: 100%; +} + #logoWhite, .navbar-transparent #logoBlack { display: none; @@ -82,7 +86,6 @@ a.list-group-item-danger.active:focus { #logoBlack, .navbar-transparent #logoWhite { display: block; - width: 220px; } @media (min-width: 768px) { diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css index 41c5a42f..33bf6425 100755 --- a/datacenterlight/static/datacenterlight/css/landing-page.css +++ b/datacenterlight/static/datacenterlight/css/landing-page.css @@ -89,10 +89,6 @@ textarea { border-radius: 6px; } -.navbar-brand > img { - max-height: 30px; -} - @media (max-width: 767px) { .navbar-default .navbar-nav>li>a{ font-weight: 400; diff --git a/ungleich_page/static/ungleich_page/css/glasfaser.css b/ungleich_page/static/ungleich_page/css/glasfaser.css index b9062087..a3262aaf 100644 --- a/ungleich_page/static/ungleich_page/css/glasfaser.css +++ b/ungleich_page/static/ungleich_page/css/glasfaser.css @@ -1,9 +1,11 @@ -.topnav img { - height: 100%; +#logoWhite, +.navbar-transparent #logoBlack { + display: none; } +#logoBlack, .navbar-transparent #logoWhite { - width: 140px; + display: block; } .navbar-default { From e6629a1357a14e8e097332dbc3301e8e2c909efa Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Mon, 9 Apr 2018 02:00:42 +0530 Subject: [PATCH 2/5] update changelog --- Changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Changelog b/Changelog index 49459422..a325a822 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,6 @@ +next: + * #4327: [dcl] fix navbar logo repeat + * bgfix: [dcl] remove ghost migrations from squashed migration 1.6.4: 2018-04-06 * #4362: [cms] Fix the need of dummy home page for different CMS-based sites 1.6.3: 2018-04-05 From 600cc7899afd99e31954a5fdf7715f1395364388 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Mon, 9 Apr 2018 02:34:34 +0530 Subject: [PATCH 3/5] mobile visibility --- ungleich_page/static/ungleich_page/css/glasfaser.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ungleich_page/static/ungleich_page/css/glasfaser.css b/ungleich_page/static/ungleich_page/css/glasfaser.css index a3262aaf..fe17bc0e 100644 --- a/ungleich_page/static/ungleich_page/css/glasfaser.css +++ b/ungleich_page/static/ungleich_page/css/glasfaser.css @@ -14,6 +14,15 @@ padding: 5px; } +@media (max-width: 767px) { + .navbar-transparent #logoBlack { + display: block; + } + .navbar-transparent #logoWhite { + display: none; + } +} + @media (min-width: 768px) { .navbar-transparent { padding: 20px; From 4305c5cc41f07e7e227dc7ca9bf9196eb3737707 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Mon, 9 Apr 2018 02:46:09 +0530 Subject: [PATCH 4/5] fix logo link url to ungleich home --- ungleich_page/templates/ungleich_page/glasfaser.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ungleich_page/templates/ungleich_page/glasfaser.html b/ungleich_page/templates/ungleich_page/glasfaser.html index c7a3c3b3..e1c350aa 100644 --- a/ungleich_page/templates/ungleich_page/glasfaser.html +++ b/ungleich_page/templates/ungleich_page/glasfaser.html @@ -50,8 +50,8 @@ - - + +