From 389b53cb719c27914605f412bd4044ba7dfaf418 Mon Sep 17 00:00:00 2001 From: idanceinbetween <46828701+idanceinbetween@users.noreply.github.com> Date: Tue, 16 Jul 2019 19:14:10 +0100 Subject: [PATCH 1/5] Add grey line below nav bar, change logo img max height 44px --- .../stylesheets/darkswarm/menu.css.scss | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/menu.css.scss b/app/assets/stylesheets/darkswarm/menu.css.scss index 3cf8032b80..ed36ba9506 100644 --- a/app/assets/stylesheets/darkswarm/menu.css.scss +++ b/app/assets/stylesheets/darkswarm/menu.css.scss @@ -1,8 +1,8 @@ -@import "compass"; -@import "branding"; -@import "mixins"; -@import "typography"; -@import "variables"; +@import 'compass'; +@import 'branding'; +@import 'mixins'; +@import 'typography'; +@import 'variables'; nav.top-bar { @include textpress; @@ -42,6 +42,8 @@ nav.top-bar { } .top-bar-section { + border-bottom: 1px solid lightgray; + a.icon { &:hover { text-decoration: none; @@ -57,7 +59,9 @@ nav.top-bar { } // Avoid menu items blocking logo - li:not(.has-form), li:not(.has-form) a:not(.button), li:not(.has-form) a:not(.button):hover { + li:not(.has-form), + li:not(.has-form) a:not(.button), + li:not(.has-form) a:not(.button):hover { background-color: transparent; } @@ -123,7 +127,9 @@ nav.top-bar { li > a { opacity: 0.8; - &:hover, &:focus, &:active { + &:hover, + &:focus, + &:active { opacity: 1; } @@ -173,7 +179,8 @@ nav.top-bar { background-color: #f4704c; padding: 13px; - a, span { + a, + span { color: white; display: inline-block; } @@ -202,7 +209,6 @@ nav.top-bar { } } - .off-canvas-list li.language-switcher ul li { list-style-type: none; padding-left: 0.5em; @@ -231,7 +237,7 @@ nav.top-bar { .top-bar .ofn-logo img { height: auto; width: auto; - max-height: 51px; + max-height: 44px; max-width: 250px; } @@ -273,7 +279,8 @@ nav.top-bar { @media screen and (max-width: 1450px) { nav .top-bar-section { - ul li a, .has-dropdown > a { + ul li a, + .has-dropdown > a { padding: 0 ($topbar-height / 8) !important; } From abd3efe82a23383cf7aaf0a485f2be9693b128f1 Mon Sep 17 00:00:00 2001 From: idanceinbetween <46828701+idanceinbetween@users.noreply.github.com> Date: Tue, 16 Jul 2019 19:32:19 +0100 Subject: [PATCH 2/5] Replace lightgray to hex --- app/assets/stylesheets/darkswarm/menu.css.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/darkswarm/menu.css.scss b/app/assets/stylesheets/darkswarm/menu.css.scss index ed36ba9506..8e3141d5d0 100644 --- a/app/assets/stylesheets/darkswarm/menu.css.scss +++ b/app/assets/stylesheets/darkswarm/menu.css.scss @@ -42,7 +42,7 @@ nav.top-bar { } .top-bar-section { - border-bottom: 1px solid lightgray; + border-bottom: 1px solid #d3d3d3; a.icon { &:hover { From 1d8cfe59a29838d9798c869dd24b26ca92c77045 Mon Sep 17 00:00:00 2001 From: idanceinbetween <46828701+idanceinbetween@users.noreply.github.com> Date: Tue, 16 Jul 2019 19:37:08 +0100 Subject: [PATCH 3/5] Change hex value to variable --- app/assets/stylesheets/darkswarm/menu.css.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/darkswarm/menu.css.scss b/app/assets/stylesheets/darkswarm/menu.css.scss index 8e3141d5d0..d54c35d62c 100644 --- a/app/assets/stylesheets/darkswarm/menu.css.scss +++ b/app/assets/stylesheets/darkswarm/menu.css.scss @@ -42,7 +42,7 @@ nav.top-bar { } .top-bar-section { - border-bottom: 1px solid #d3d3d3; + border-bottom: 1px solid $ofn-grey; a.icon { &:hover { From 35570feba04b329d7c0cfaed45b80c4cc014805b Mon Sep 17 00:00:00 2001 From: idanceinbetween <46828701+idanceinbetween@users.noreply.github.com> Date: Tue, 16 Jul 2019 20:04:50 +0100 Subject: [PATCH 4/5] Comment out new changes --- app/assets/stylesheets/darkswarm/menu.css.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/darkswarm/menu.css.scss b/app/assets/stylesheets/darkswarm/menu.css.scss index d54c35d62c..e4910cd8e4 100644 --- a/app/assets/stylesheets/darkswarm/menu.css.scss +++ b/app/assets/stylesheets/darkswarm/menu.css.scss @@ -42,7 +42,7 @@ nav.top-bar { } .top-bar-section { - border-bottom: 1px solid $ofn-grey; + // border-bottom: 1px solid $ofn-grey; a.icon { &:hover { From 41b775b17383e38a6ed424e58ffc7208ec735070 Mon Sep 17 00:00:00 2001 From: idanceinbetween <46828701+idanceinbetween@users.noreply.github.com> Date: Tue, 16 Jul 2019 20:10:18 +0100 Subject: [PATCH 5/5] Remove multiline --- app/assets/stylesheets/darkswarm/menu.css.scss | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/menu.css.scss b/app/assets/stylesheets/darkswarm/menu.css.scss index e4910cd8e4..cc950c892b 100644 --- a/app/assets/stylesheets/darkswarm/menu.css.scss +++ b/app/assets/stylesheets/darkswarm/menu.css.scss @@ -42,7 +42,7 @@ nav.top-bar { } .top-bar-section { - // border-bottom: 1px solid $ofn-grey; + border-bottom: 1px solid $ofn-grey; a.icon { &:hover { @@ -59,9 +59,7 @@ nav.top-bar { } // Avoid menu items blocking logo - li:not(.has-form), - li:not(.has-form) a:not(.button), - li:not(.has-form) a:not(.button):hover { + li:not(.has-form), li:not(.has-form) a:not(.button), li:not(.has-form) a:not(.button):hover { background-color: transparent; } @@ -127,9 +125,7 @@ nav.top-bar { li > a { opacity: 0.8; - &:hover, - &:focus, - &:active { + &:hover, &:focus, &:active { opacity: 1; }