Commit 55024ed13af87cea939c6250103c11f8a6e6fa10
1 parent
3f71f2fa
Exists in
spb-stable
and in
3 other branches
Use default bootstrap pills
Showing
2 changed files
with
5 additions
and
45 deletions
Show diff stats
app/assets/stylesheets/gl_bootstrap.scss
| @@ -6,6 +6,9 @@ | @@ -6,6 +6,9 @@ | ||
| 6 | * | 6 | * |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | +$font-size-base: 13px !default; | ||
| 10 | +$nav-pills-active-link-hover-bg: $bg_style_color; | ||
| 11 | +$pagination-active-bg: $bg_style_color; | ||
| 9 | 12 | ||
| 10 | // Core variables and mixins | 13 | // Core variables and mixins |
| 11 | @import "bootstrap/variables"; | 14 | @import "bootstrap/variables"; |
| @@ -137,49 +140,8 @@ | @@ -137,49 +140,8 @@ | ||
| 137 | } | 140 | } |
| 138 | } | 141 | } |
| 139 | 142 | ||
| 140 | -.nav-tabs > li > a, .nav-pills > li > a { color: $style_color; } | 143 | +.nav-tabs > li > a, .nav-pills > li > a { color: #666; } |
| 141 | 144 | ||
| 142 | -// Nav pills | ||
| 143 | -.nav-pills { | ||
| 144 | - .active a { | ||
| 145 | - background: $primary_color; | ||
| 146 | - } | ||
| 147 | - | ||
| 148 | - &.nav-stacked { | ||
| 149 | - > li > a { | ||
| 150 | - @include border-radius(0); | ||
| 151 | - border-left: 4px solid #EEE; | ||
| 152 | - padding: 12px; | ||
| 153 | - color: #777; | ||
| 154 | - } | ||
| 155 | - > .active > a { | ||
| 156 | - border-color: $primary_color; | ||
| 157 | - background: none; | ||
| 158 | - color: #333; | ||
| 159 | - font-weight: bolder; | ||
| 160 | - | ||
| 161 | - &:hover { | ||
| 162 | - background: none; | ||
| 163 | - color: #333; | ||
| 164 | - } | ||
| 165 | - } | ||
| 166 | - | ||
| 167 | - &.nav-stacked-menu { | ||
| 168 | - li > a { | ||
| 169 | - padding: 16px; | ||
| 170 | - } | ||
| 171 | - } | ||
| 172 | - } | ||
| 173 | - | ||
| 174 | - &.nav-pills-small { | ||
| 175 | - > li > a { | ||
| 176 | - padding: 8px 12px; | ||
| 177 | - font-size: 12px; | ||
| 178 | - } | ||
| 179 | - } | ||
| 180 | -} | ||
| 181 | - | ||
| 182 | -.nav-pills > .active > a > i[class^="icon-"] { background: inherit; } | ||
| 183 | 145 | ||
| 184 | /* | 146 | /* |
| 185 | * Callouts from Bootstrap3 docs | 147 | * Callouts from Bootstrap3 docs |
app/assets/stylesheets/main/variables.scss
| 1 | -/** Override bootstrap variables **/ | ||
| 2 | -$font-size-base: 13px !default; | ||
| 3 | - | ||
| 4 | /** | 1 | /** |
| 5 | * General Colors | 2 | * General Colors |
| 6 | */ | 3 | */ |
| 7 | $primary_color: #2FA0BB; | 4 | $primary_color: #2FA0BB; |
| 8 | $link_color: #3A89A3; | 5 | $link_color: #3A89A3; |
| 9 | $style_color: #474D57; | 6 | $style_color: #474D57; |
| 7 | +$bg_style_color: #2299BB; | ||
| 10 | $hover: #D9EDF7; | 8 | $hover: #D9EDF7; |
| 11 | 9 | ||
| 12 | /** | 10 | /** |