Download as
Browse Code »

Commit 3d9ba7b76c869bd9972ca4827ce43412d29f6f10

Authored by Ariejan de Vroom
2 parents 85db534a 55f776f0
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #2202 from gitlabhq/ui/tiny_nav 

Redesign for navigation bar.
Showing 1 changed file with 7 additions and 25 deletions   Show diff stats
app/assets/stylesheets/sections/nav.scss
  Diff comments   View file @3d9ba7b
@@ -3,15 +3,13 @@ @@ -3,15 +3,13 @@
3 * 3 *
4 */ 4 */
5 ul.main_menu { 5 ul.main_menu {
6 - @include border-radius(4px);  
7 margin: auto; 6 margin: auto;
8 margin: 30px 0; 7 margin: 30px 0;
9 - border: 1px solid #BBB; 8 + margin-top: 10px;
  9 + border-bottom: 1px solid #DDD;
10 height: 37px; 10 height: 37px;
11 - @include bg-gray-gradient;  
12 position: relative; 11 position: relative;
13 overflow: hidden; 12 overflow: hidden;
14 - @include shade;  
15 .count { 13 .count {
16 position: relative; 14 position: relative;
17 top: -1px; 15 top: -1px;
@@ -24,9 +22,6 @@ ul.main_menu { @@ -24,9 +22,6 @@ ul.main_menu {
24 line-height: 14px; 22 line-height: 14px;
25 text-align: center; 23 text-align: center;
26 color: #777; 24 color: #777;
27 - background: #f2f2f2;  
28 - border-top: 1px solid #CCC;  
29 - @include border-radius(8px);  
30 } 25 }
31 .label { 26 .label {
32 background: $hover; 27 background: $hover;
@@ -38,23 +33,10 @@ ul.main_menu { @@ -38,23 +33,10 @@ ul.main_menu {
38 margin: 0; 33 margin: 0;
39 display: table-cell; 34 display: table-cell;
40 width: 1%; 35 width: 1%;
41 - border-right: 1px solid #DDD;  
42 - border-left: 1px solid #EEE;  
43 - border-bottom: 2px solid #CFCFCF;  
44 -  
45 - &:first-child{  
46 - @include border-radius(5px 0 0 5px);  
47 - border-left: 0;  
48 - }  
49 -  
50 &.active { 36 &.active {
51 - background-color: #D5D5D5;  
52 - border-right: 1px solid #BBB;  
53 - border-left: 1px solid #BBB;  
54 - @include border-radius(0 0 1px 1px);  
55 - &:first-child{  
56 - border-bottom: none;  
57 - border-left: none; 37 + border-bottom: 2px solid #474D57;
  38 + a {
  39 + color: $style_color;
58 } 40 }
59 } 41 }
60 42
@@ -73,10 +55,10 @@ ul.main_menu { @@ -73,10 +55,10 @@ ul.main_menu {
73 a { 55 a {
74 display: block; 56 display: block;
75 text-align: center; 57 text-align: center;
76 - font-weight: bold; 58 + font-weight: normal;
77 height: 35px; 59 height: 35px;
78 line-height: 36px; 60 line-height: 36px;
79 - color: $style_color; 61 + color: #777;
80 text-shadow: 0 1px 1px white; 62 text-shadow: 0 1px 1px white;
81 padding: 0 10px; 63 padding: 0 10px;
82 } 64 }