summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-07-28 10:14:32 +0100
committerPhil Hughes <me@iamphill.com>2017-07-28 10:14:32 +0100
commit948deb97cb40dbffaf3c290534bb9ffe2f3499c8 (patch)
tree65c4af9b3f06cee195b0f9a5f93275090b8f41ee
parentd6b2c87061e02be5949a80d7c107b3d34fa6e14b (diff)
downloadgitlab-ce-948deb97cb40dbffaf3c290534bb9ffe2f3499c8.tar.gz
updated hover text color of main links in sidebar
fixed colors in fly-out navigation fixed spacing in fly-out navigation
-rw-r--r--app/assets/stylesheets/new_sidebar.scss26
1 files changed, 18 insertions, 8 deletions
diff --git a/app/assets/stylesheets/new_sidebar.scss b/app/assets/stylesheets/new_sidebar.scss
index 06c2efb3a4d..d0568e92f84 100644
--- a/app/assets/stylesheets/new_sidebar.scss
+++ b/app/assets/stylesheets/new_sidebar.scss
@@ -195,23 +195,32 @@ $new-sidebar-width: 220px;
> li {
> a {
@media (min-width: $screen-sm-min) {
- margin-left: 4px;
margin-right: 2px;
}
+
+ &:hover {
+ color: $gl-text-color;
+ }
}
&:not(.active) {
+ a {
+ margin-left: 1px;
+ margin-right: 3px;
+ }
+
.sidebar-sub-level-items {
@media (min-width: $screen-sm-min) {
position: fixed;
top: 0;
- left: 219px;
+ left: 220px;
width: 150px;
margin-top: -1px;
- padding: 1px;
+ padding: 8px 1px;
background-color: $white-light;
box-shadow: 2px 1px 3px $dropdown-shadow-color;
border: 1px solid $gray-darker;
+ border-left: 0;
border-radius: 0 3px 3px 0;
&::before {
@@ -248,6 +257,8 @@ $new-sidebar-width: 220px;
}
a {
+ color: $gl-text-color;
+
&:hover,
&:focus {
background-color: $gray-darker;
@@ -266,6 +277,10 @@ $new-sidebar-width: 220px;
&.active {
background: $active-background;
+ > a {
+ margin-left: 4px;
+ }
+
.badge {
color: $active-color;
font-weight: 600;
@@ -279,11 +294,6 @@ $new-sidebar-width: 220px;
&:not(.active):hover > a,
> a:hover {
background-color: $white-light;
-
- .badge {
- background-color: $indigo-500;
- color: $hover-color;
- }
}
}
}