diff options
author | Ariejan de Vroom <ariejan@ariejan.net> | 2012-12-07 01:35:48 -0800 |
---|---|---|
committer | Ariejan de Vroom <ariejan@ariejan.net> | 2012-12-07 01:35:48 -0800 |
commit | 3d9ba7b76c869bd9972ca4827ce43412d29f6f10 (patch) | |
tree | 38e383ea3b84463b7646d86d27754c93c4836072 | |
parent | 85db534afc442a23c81f319d65c49f274ce6ab4b (diff) | |
parent | 55f776f095cdab330d418db3b4590c62cc975658 (diff) | |
download | gitlab-ce-3d9ba7b76c869bd9972ca4827ce43412d29f6f10.tar.gz |
Merge pull request #2202 from gitlabhq/ui/tiny_nav
Redesign for navigation bar.
-rw-r--r-- | app/assets/stylesheets/sections/nav.scss | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/app/assets/stylesheets/sections/nav.scss b/app/assets/stylesheets/sections/nav.scss index 595568fc059..bc19bc75a67 100644 --- a/app/assets/stylesheets/sections/nav.scss +++ b/app/assets/stylesheets/sections/nav.scss @@ -3,15 +3,13 @@ * */ ul.main_menu { - @include border-radius(4px); margin: auto; margin: 30px 0; - border: 1px solid #BBB; + margin-top: 10px; + border-bottom: 1px solid #DDD; height: 37px; - @include bg-gray-gradient; position: relative; overflow: hidden; - @include shade; .count { position: relative; top: -1px; @@ -24,9 +22,6 @@ ul.main_menu { line-height: 14px; text-align: center; color: #777; - background: #f2f2f2; - border-top: 1px solid #CCC; - @include border-radius(8px); } .label { background: $hover; @@ -38,23 +33,10 @@ ul.main_menu { margin: 0; display: table-cell; width: 1%; - border-right: 1px solid #DDD; - border-left: 1px solid #EEE; - border-bottom: 2px solid #CFCFCF; - - &:first-child{ - @include border-radius(5px 0 0 5px); - border-left: 0; - } - &.active { - background-color: #D5D5D5; - border-right: 1px solid #BBB; - border-left: 1px solid #BBB; - @include border-radius(0 0 1px 1px); - &:first-child{ - border-bottom: none; - border-left: none; + border-bottom: 2px solid #474D57; + a { + color: $style_color; } } @@ -73,10 +55,10 @@ ul.main_menu { a { display: block; text-align: center; - font-weight: bold; + font-weight: normal; height: 35px; line-height: 36px; - color: $style_color; + color: #777; text-shadow: 0 1px 1px white; padding: 0 10px; } |