Commit aaec545a677f08a39a49d40db2e454e57ed72cbe
1 parent
560b1ac5
Exists in
master
and in
4 other branches
Gitlab styled tabs. Better ref selector
Showing
2 changed files
with
42 additions
and
10 deletions
Show diff stats
app/assets/stylesheets/gitlab_bootstrap/common.scss
| @@ -33,7 +33,29 @@ | @@ -33,7 +33,29 @@ | ||
| 33 | .nav-pills a:hover { background-color:#888; } | 33 | .nav-pills a:hover { background-color:#888; } |
| 34 | .nav-pills .active a { background-color: $style_color; } | 34 | .nav-pills .active a { background-color: $style_color; } |
| 35 | .nav-tabs > li > a, .nav-pills > li > a { color:$style_color; } | 35 | .nav-tabs > li > a, .nav-pills > li > a { color:$style_color; } |
| 36 | -.nav-tabs > .active > a { font-weight:bold; } | 36 | +.nav.nav-tabs { |
| 37 | + li { | ||
| 38 | + > a { | ||
| 39 | + padding:8px 20px; | ||
| 40 | + margin-right: 7px; | ||
| 41 | + border-color: #EEE; | ||
| 42 | + color:#888; | ||
| 43 | + border-bottom: 1px solid #ddd; | ||
| 44 | + .badge { | ||
| 45 | + background-color: #eee; | ||
| 46 | + color:#888; | ||
| 47 | + text-shadow:0 1px 1px #fff; | ||
| 48 | + } | ||
| 49 | + } | ||
| 50 | + &.active { | ||
| 51 | + > a { | ||
| 52 | + border-color: #CCC; | ||
| 53 | + border-bottom: 1px solid #fff; | ||
| 54 | + color:#333; | ||
| 55 | + } | ||
| 56 | + } | ||
| 57 | + } | ||
| 58 | +} | ||
| 37 | 59 | ||
| 38 | /** ALERT MESSAGES **/ | 60 | /** ALERT MESSAGES **/ |
| 39 | .alert-message { @extend .alert; } | 61 | .alert-message { @extend .alert; } |
app/assets/stylesheets/ref_select.scss
| @@ -12,35 +12,45 @@ | @@ -12,35 +12,45 @@ | ||
| 12 | width:120px; | 12 | width:120px; |
| 13 | } | 13 | } |
| 14 | 14 | ||
| 15 | -.project-refs-form .chzn-container { | 15 | +.project-refs-form .chzn-container { |
| 16 | position: relative; | 16 | position: relative; |
| 17 | top: 0; | 17 | top: 0; |
| 18 | left: 0; | 18 | left: 0; |
| 19 | margin-right: 10px; | 19 | margin-right: 10px; |
| 20 | 20 | ||
| 21 | - .chzn-drop { | 21 | + .chzn-drop { |
| 22 | margin:7px 0; | 22 | margin:7px 0; |
| 23 | - border: 1px solid #CCC; | ||
| 24 | - min-width: 300px; | 23 | + min-width: 400px; |
| 24 | + border: 2px solid $blue_link; | ||
| 25 | + @include border-radius(4px); | ||
| 25 | 26 | ||
| 26 | - .chzn-results { | 27 | + .chzn-results { |
| 27 | max-height:300px; | 28 | max-height:300px; |
| 29 | + | ||
| 30 | + .group-result { | ||
| 31 | + color: $blue_link; | ||
| 32 | + } | ||
| 33 | + .active-result { | ||
| 34 | + &.highlighted { | ||
| 35 | + background: $blue_link; | ||
| 36 | + } | ||
| 37 | + } | ||
| 28 | } | 38 | } |
| 29 | 39 | ||
| 30 | .chzn-search input { | 40 | .chzn-search input { |
| 31 | - min-width:200px; | 41 | + min-width:300px; |
| 32 | } | 42 | } |
| 33 | } | 43 | } |
| 34 | 44 | ||
| 35 | - .chzn-single { | 45 | + .chzn-single { |
| 36 | @include bg-gray-gradient; | 46 | @include bg-gray-gradient; |
| 37 | 47 | ||
| 38 | - div { | 48 | + div { |
| 39 | background:transparent; | 49 | background:transparent; |
| 40 | border-left:none; | 50 | border-left:none; |
| 41 | } | 51 | } |
| 42 | 52 | ||
| 43 | - span { | 53 | + span { |
| 44 | font-weight: normal; | 54 | font-weight: normal; |
| 45 | } | 55 | } |
| 46 | } | 56 | } |