diff options
author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-05-03 11:44:55 -0500 |
---|---|---|
committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-05-03 12:36:04 -0500 |
commit | f53557a4faa02c4596d16819c4b5c7783829677a (patch) | |
tree | 7f40066d0fad24ea0d8092842f733252959a98af /app/assets | |
parent | bdda1eeddeb8a49484d221ae7217a9983bf984c4 (diff) | |
download | gitlab-ce-f53557a4faa02c4596d16819c4b5c7783829677a.tar.gz |
Group navigation design update
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 7 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/header.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 10 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 |
4 files changed, 20 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index e72e4aa47ef..57f722c4818 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -150,6 +150,13 @@ right: auto; } } + + &.groups-cover-block { + background: $white-light; + border-bottom: 1px solid $border-color; + text-align: left; + padding: 24px 0; + } } .block-connector { diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 5fa10d29a87..97f9d582007 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -30,6 +30,10 @@ header { border: none; border-bottom: 1px solid $border-color; + &.with-horizontal-nav { + border-bottom: none; + } + .container-fluid { width: 100% !important; filter: none; diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index 5fe687dcec3..40b24e96fa3 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -26,8 +26,8 @@ } &.active a { - color: #000; - border-bottom: 2px solid #4688f1; + border-bottom: 2px solid $link-underline-blue; + color: $black; } .badge { @@ -193,7 +193,7 @@ .controls { float: right; position: relative; - top: 10px; + top: 0; .dropdown { margin-left: 7px; @@ -202,5 +202,9 @@ .nav-links { border-bottom: none; + + a { + padding-top: 2px; + } } } diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index b8ed7e8a74c..3b69e50aca7 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -74,6 +74,7 @@ $btn-transparent-color: #8f8f8f; $settings-icon-size: 18px; $provider-btn-group-border: #e5e5e5; $provider-btn-not-active-color: #4688f1; +$link-underline-blue: #4a8bee; /* * Color schema @@ -108,6 +109,7 @@ $red-light: #e52c5a; $red-normal: #d22852; $red-dark: darken($red-normal, 5%); +$black: #000000; $black-transparent: rgba(0, 0, 0, 0.3); $border-white-light: #f1f2f4; |