From ac1e5e53e199c6ab81321a910cd602dd5f6fb1bb Mon Sep 17 00:00:00 2001 From: Alex Hokanson <571756+ingshtrom@users.noreply.github.com> Date: Wed, 16 Sep 2020 10:38:38 -0400 Subject: [PATCH 1/4] fix the background color of the sidebar on 'medium' sized devices --- _scss/_mobile.scss | 3 +++ _scss/_night-mode.scss | 1 + 2 files changed, 4 insertions(+) diff --git a/_scss/_mobile.scss b/_scss/_mobile.scss index 1a182c8533..23d7f8f9af 100755 --- a/_scss/_mobile.scss +++ b/_scss/_mobile.scss @@ -310,6 +310,9 @@ .toc-nav a { font-size: 11px; } + .sidebar { + background-color: $bg-sidebar; + } } /* Portrait */ diff --git a/_scss/_night-mode.scss b/_scss/_night-mode.scss index fe455e4595..a6fdc1a0df 100755 --- a/_scss/_night-mode.scss +++ b/_scss/_night-mode.scss @@ -55,6 +55,7 @@ body.night { .nav-secondary .search-form input[type=search]:focus { background: rgba(255, 255, 255, 0.17) url(/images/search.png) no-repeat 10px 9px !important; } + .sidebar, .sidebar-home, #sidebar-wrapper, #sidebar-wrapper-home, From ea886946c470ddfb5ee4312ad54c18a4a6f47002 Mon Sep 17 00:00:00 2001 From: Alex Hokanson <571756+ingshtrom@users.noreply.github.com> Date: Wed, 16 Sep 2020 12:27:56 -0400 Subject: [PATCH 2/4] make colors more consistent at all sizes Signed-off-by: Alex Hokanson <571756+ingshtrom@users.noreply.github.com> --- _scss/_mobile.scss | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/_scss/_mobile.scss b/_scss/_mobile.scss index 23d7f8f9af..7862b54b84 100755 --- a/_scss/_mobile.scss +++ b/_scss/_mobile.scss @@ -61,6 +61,7 @@ position: fixed; width: 100%; z-index: 100; + background-color: $bg-sidebar; } .main-content { padding: 22px 35px 25px 30px; @@ -117,16 +118,10 @@ .header { height: 100px; } - .nav-secondary-tabs, - .nav-secondary { - background-color: $black; - } - .nav-secondary input[type=search] { - background: rgb(78, 77, 77) url(/images/search.png) no-repeat 10px 9px; - } + /*.nav-secondary-tabs, .nav-sidebar a { color: #a8a8a8; - } + }*/ .tabs { float: left; margin: 0; @@ -147,8 +142,8 @@ } .sidebar, .sidebar-home { - background-color: #15212e; - border-right: 1px solid rgba(204,204,204,0.29); + background-color: $bg-sidebar; + /*border-right: 1px solid rgba(204,204,204,0.29);*/ top: 51px; left: 0; display: block; @@ -246,13 +241,12 @@ .main-content { padding: 0 10px; } - .nav-sidebar a { + /*.nav-sidebar a { color: #a8a8a8; - } + }*/ .sidebar, .sidebar-home { - background-color: #15212e; - border-right: 1px solid rgba(204,204,204,0.29); + background-color: $bg-sidebar; top: 51px; left: 0; display: block; From 5b734e70e7e693c5c519e4d11dae7a0c7165a470 Mon Sep 17 00:00:00 2001 From: Alex Hokanson <571756+ingshtrom@users.noreply.github.com> Date: Thu, 17 Sep 2020 09:21:43 -0400 Subject: [PATCH 3/4] search input on top navbar has consistent coloring Signed-off-by: Alex Hokanson <571756+ingshtrom@users.noreply.github.com> --- _scss/_mobile.scss | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/_scss/_mobile.scss b/_scss/_mobile.scss index 7862b54b84..5edc53a2a8 100755 --- a/_scss/_mobile.scss +++ b/_scss/_mobile.scss @@ -232,7 +232,7 @@ height: 100px; } .nav-secondary { - background: $black; + background: $bg-sidebar; height: 100px; } .content { @@ -309,16 +309,6 @@ } } -/* Portrait */ -@media only screen - and (min-device-width: 768px) - and (max-device-width: 1024px) - and (orientation: portrait) { - .nav-secondary input[type=search] { - background: rgba(255, 255, 255, 0.17) url(/images/search.png) no-repeat 10px 9px; - } -} - /* Landscape */ @media only screen and (min-device-width: 768px) @@ -334,9 +324,6 @@ .sidebar, .sidebar.affix { width: 270px; } - .nav-secondary input[type=search] { - background: rgba(255, 255, 255, 0.17) url(/images/search.png) no-repeat 10px 9px; - } } .navbar-toggle { @@ -355,8 +342,8 @@ @media (max-width: 1024px) { .nav-secondary-tabs.affix-top { - // background-color: $bg-secondary; - background-color: rgba(0,0,0,.05); + /*background-color: $bg-secondary; + background-color: rgba(0,0,0,.05); */ position: fixed; top: 0; } From 3961a2536413f0a725682cb209b628180f682e23 Mon Sep 17 00:00:00 2001 From: Alex Hokanson <571756+ingshtrom@users.noreply.github.com> Date: Thu, 17 Sep 2020 09:29:09 -0400 Subject: [PATCH 4/4] remove height and color addition to nav-secondary on landscape Signed-off-by: Alex Hokanson <571756+ingshtrom@users.noreply.github.com> --- _scss/_mobile.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/_scss/_mobile.scss b/_scss/_mobile.scss index 5edc53a2a8..b720e3a47f 100755 --- a/_scss/_mobile.scss +++ b/_scss/_mobile.scss @@ -231,10 +231,6 @@ .nav-secondary-tabs { height: 100px; } - .nav-secondary { - background: $bg-sidebar; - height: 100px; - } .content { padding: 120px 20px; }