From 519519b41bcf3d72a040a004ecb176b0e62ce6a9 Mon Sep 17 00:00:00 2001 From: Anxhelo Lushka Date: Sat, 8 Sep 2018 13:36:28 +0200 Subject: [PATCH] Changes to sidebar colors and hover --- _site/assets/styles/layout.scss | 23 +++++------------------ _site/assets/styles/main.css | 10 +--------- assets/styles/layout.scss | 23 +++++------------------ 3 files changed, 11 insertions(+), 45 deletions(-) diff --git a/_site/assets/styles/layout.scss b/_site/assets/styles/layout.scss index 7c7f9a9..848475e 100644 --- a/_site/assets/styles/layout.scss +++ b/_site/assets/styles/layout.scss @@ -42,8 +42,8 @@ color: $oc-black !important; transition-timing-function: linear; -webkit-transition-timing-function: linear; - -webkit-transition-duration: .15s; - transition-duration: .15s; + -webkit-transition-duration: .3s; + transition-duration: .3s; } &:active { @@ -58,19 +58,14 @@ .active, .active:hover { - background-color: $oc-gray-3 !important; - box-shadow: inset 5px 0 $primary; + // background-color: $oc-gray-3 !important; +// box-shadow: inset 5px 0 $primary; & * { color: $primary !important; } } -.rb-sidebar__2 .active { - background-color: $oc-gray-3 !important; - box-shadow: inset 5px 0 $primary; -} - .rp-navbar__top { background-color: $primary; } @@ -94,14 +89,6 @@ } } -.rb-sidebar__1 { - background-color: $oc-gray-1; -} - -.rb-sidebar__2 { - background-color: $oc-gray-0; -} - .rb-contain { width: 100%; height: auto; @@ -146,7 +133,7 @@ .list-group-item:focus, .list-group-item:hover { - background-color: $oc-gray-2 !important; + // background-color: $oc-gray-2 !important; & * { color: $primary; diff --git a/_site/assets/styles/main.css b/_site/assets/styles/main.css index 2bf4a23..a64b48f 100644 --- a/_site/assets/styles/main.css +++ b/_site/assets/styles/main.css @@ -9,16 +9,13 @@ .sidebar-wrapper { background-color: #dee2e6; } .sidebar__link__light { color: #868e96 !important; } -.sidebar__link__light:hover { color: #000000 !important; transition-timing-function: linear; -webkit-transition-timing-function: linear; -webkit-transition-duration: .15s; transition-duration: .15s; } +.sidebar__link__light:hover { color: #000000 !important; transition-timing-function: linear; -webkit-transition-timing-function: linear; -webkit-transition-duration: .3s; transition-duration: .3s; } .sidebar__link__light:active { color: #4661A9; } .row { margin: auto !important; } -.active, .active:hover { background-color: #dee2e6 !important; box-shadow: inset 5px 0 #4661A9; } .active *, .active:hover * { color: #4661A9 !important; } -.rb-sidebar__2 .active { background-color: #dee2e6 !important; box-shadow: inset 5px 0 #4661A9; } - .rp-navbar__top { background-color: #4661A9; } .navbar-light .navbar-toggler { border-color: rgba(255, 255, 255, 0.5); } @@ -28,10 +25,6 @@ .navbar-light .navbar-nav .nav-link { color: rgba(255, 255, 255, 0.5); } .navbar-light .navbar-nav .nav-link:hover { color: #ffffff; } -.rb-sidebar__1 { background-color: #f1f3f5; } - -.rb-sidebar__2 { background-color: #f8f9fa; } - .rb-contain { width: 100%; height: auto; max-height: 100%; } .max-width-150 { max-width: 150px; } @@ -49,7 +42,6 @@ @media screen and (max-width: 991px) { .hidden-sm { display: none !important; } } .sidebar-fill { width: 12.45%; } -.list-group-item:focus, .list-group-item:hover { background-color: #e9ecef !important; } .list-group-item:focus *, .list-group-item:hover * { color: #4661A9; } .list-group-item.active { color: #4661A9; } diff --git a/assets/styles/layout.scss b/assets/styles/layout.scss index 7c7f9a9..848475e 100644 --- a/assets/styles/layout.scss +++ b/assets/styles/layout.scss @@ -42,8 +42,8 @@ color: $oc-black !important; transition-timing-function: linear; -webkit-transition-timing-function: linear; - -webkit-transition-duration: .15s; - transition-duration: .15s; + -webkit-transition-duration: .3s; + transition-duration: .3s; } &:active { @@ -58,19 +58,14 @@ .active, .active:hover { - background-color: $oc-gray-3 !important; - box-shadow: inset 5px 0 $primary; + // background-color: $oc-gray-3 !important; +// box-shadow: inset 5px 0 $primary; & * { color: $primary !important; } } -.rb-sidebar__2 .active { - background-color: $oc-gray-3 !important; - box-shadow: inset 5px 0 $primary; -} - .rp-navbar__top { background-color: $primary; } @@ -94,14 +89,6 @@ } } -.rb-sidebar__1 { - background-color: $oc-gray-1; -} - -.rb-sidebar__2 { - background-color: $oc-gray-0; -} - .rb-contain { width: 100%; height: auto; @@ -146,7 +133,7 @@ .list-group-item:focus, .list-group-item:hover { - background-color: $oc-gray-2 !important; + // background-color: $oc-gray-2 !important; & * { color: $primary;