Commit b1b3f485a199affd0f77e8a694202f2547bf6fd5
1 parent
6dfbd3f7
Exists in
spb-stable
and in
3 other branches
Move nav-tabs to gl_bootstrap
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
2 changed files
with
39 additions
and
32 deletions
Show diff stats
app/assets/stylesheets/generic/nav.scss
| @@ -22,6 +22,11 @@ | @@ -22,6 +22,11 @@ | ||
| 22 | background: none; | 22 | background: none; |
| 23 | color: #333; | 23 | color: #333; |
| 24 | font-weight: bolder; | 24 | font-weight: bolder; |
| 25 | + | ||
| 26 | + &:hover { | ||
| 27 | + background: none; | ||
| 28 | + color: #333; | ||
| 29 | + } | ||
| 25 | } | 30 | } |
| 26 | 31 | ||
| 27 | &.nav-stacked-menu { | 32 | &.nav-stacked-menu { |
| @@ -48,38 +53,6 @@ | @@ -48,38 +53,6 @@ | ||
| 48 | * | 53 | * |
| 49 | */ | 54 | */ |
| 50 | .nav-tabs > li > a, .nav-pills > li > a { color: $style_color; } | 55 | .nav-tabs > li > a, .nav-pills > li > a { color: $style_color; } |
| 51 | -.nav.nav-tabs { | ||
| 52 | - li { | ||
| 53 | - > a { | ||
| 54 | - padding: 8px 20px; | ||
| 55 | - margin-right: 7px; | ||
| 56 | - line-height: 20px; | ||
| 57 | - border-color: #EEE; | ||
| 58 | - color: #888; | ||
| 59 | - border-bottom: 1px solid #ddd; | ||
| 60 | - .badge { | ||
| 61 | - background-color: #eee; | ||
| 62 | - color: #888; | ||
| 63 | - text-shadow: 0 1px 1px #fff; | ||
| 64 | - } | ||
| 65 | - i[class^="icon-"] { | ||
| 66 | - line-height: 14px; | ||
| 67 | - } | ||
| 68 | - } | ||
| 69 | - &.active { | ||
| 70 | - > a { | ||
| 71 | - border-color: #CCC; | ||
| 72 | - border-bottom: 1px solid #fff; | ||
| 73 | - color: #333; | ||
| 74 | - font-weight: bold; | ||
| 75 | - } | ||
| 76 | - } | ||
| 77 | - } | ||
| 78 | - | ||
| 79 | - &.nav-small-tabs > li > a { padding: 6px 9px; } | ||
| 80 | -} | ||
| 81 | - | ||
| 82 | - | ||
| 83 | 56 | ||
| 84 | /** | 57 | /** |
| 85 | * fix to keep tooltips position in top navigation bar | 58 | * fix to keep tooltips position in top navigation bar |
app/assets/stylesheets/gl_bootstrap.scss
| @@ -93,3 +93,37 @@ | @@ -93,3 +93,37 @@ | ||
| 93 | background-color: #333333; | 93 | background-color: #333333; |
| 94 | } | 94 | } |
| 95 | } | 95 | } |
| 96 | + | ||
| 97 | +// Nav tabs | ||
| 98 | +.nav.nav-tabs { | ||
| 99 | + li { | ||
| 100 | + > a { | ||
| 101 | + padding: 8px 20px; | ||
| 102 | + margin-right: 7px; | ||
| 103 | + line-height: 20px; | ||
| 104 | + border-color: #EEE; | ||
| 105 | + color: #888; | ||
| 106 | + border-bottom: 1px solid #ddd; | ||
| 107 | + .badge { | ||
| 108 | + background-color: #eee; | ||
| 109 | + color: #888; | ||
| 110 | + text-shadow: 0 1px 1px #fff; | ||
| 111 | + } | ||
| 112 | + i[class^="icon-"] { | ||
| 113 | + line-height: 14px; | ||
| 114 | + } | ||
| 115 | + } | ||
| 116 | + &.active { | ||
| 117 | + > a { | ||
| 118 | + border-color: #CCC; | ||
| 119 | + border-bottom: 1px solid #fff; | ||
| 120 | + color: #333; | ||
| 121 | + font-weight: bold; | ||
| 122 | + } | ||
| 123 | + } | ||
| 124 | + } | ||
| 125 | + | ||
| 126 | + &.nav-small-tabs > li > a { | ||
| 127 | + padding: 6px 9px; | ||
| 128 | + } | ||
| 129 | +} |