Commit 5d6f5be0603e51514705976e35c2a6f2fff74c84
1 parent
e53f4a4e
Exists in
spb-stable
and in
2 other branches
New colors for success/warning/primary
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
2 changed files
with
8 additions
and
14 deletions
Show diff stats
app/assets/stylesheets/gl_bootstrap.scss
| @@ -7,8 +7,8 @@ | @@ -7,8 +7,8 @@ | ||
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | $font-size-base: 13px !default; | 9 | $font-size-base: 13px !default; |
| 10 | -$nav-pills-active-link-hover-bg: $bg_style_color; | ||
| 11 | -$pagination-active-bg: $bg_style_color; | 10 | +$nav-pills-active-link-hover-bg: $bg_primary; |
| 11 | +$pagination-active-bg: $bg_primary; | ||
| 12 | 12 | ||
| 13 | // Core variables and mixins | 13 | // Core variables and mixins |
| 14 | @import "bootstrap/variables"; | 14 | @import "bootstrap/variables"; |
app/assets/stylesheets/main/variables.scss
| @@ -11,32 +11,26 @@ $hover: #D9EDF7; | @@ -11,32 +11,26 @@ $hover: #D9EDF7; | ||
| 11 | /* | 11 | /* |
| 12 | * Success colors (green) | 12 | * Success colors (green) |
| 13 | */ | 13 | */ |
| 14 | -$border_success: #4cae4c; | ||
| 15 | -$bg_success: #5cb85c; | ||
| 16 | -$bg_light_success: #dff0d8; | ||
| 17 | -$color_success: #3c763d; | 14 | +$border_success: #469408; |
| 15 | +$bg_success: #469408; | ||
| 18 | 16 | ||
| 19 | /* | 17 | /* |
| 20 | * Danger colors (red) | 18 | * Danger colors (red) |
| 21 | */ | 19 | */ |
| 22 | $border_danger: #d43f3a; | 20 | $border_danger: #d43f3a; |
| 23 | $bg_danger: #d9534f; | 21 | $bg_danger: #d9534f; |
| 24 | -$bg_light_danger: #f2dede; | ||
| 25 | -$color_danger: #a94442; | ||
| 26 | 22 | ||
| 27 | /* | 23 | /* |
| 28 | * Primary colors (blue) | 24 | * Primary colors (blue) |
| 29 | */ | 25 | */ |
| 30 | -$border_primary: #358ebd; | ||
| 31 | -$bg_primary: #429bca; | ||
| 32 | -$bg_light_primary: #d9edf7; | ||
| 33 | -$color_primary: #31708f; | 26 | +$border_primary: #446e9b; |
| 27 | +$bg_primary: #446e9b; | ||
| 34 | 28 | ||
| 35 | /* | 29 | /* |
| 36 | * Warning colors (yellow) | 30 | * Warning colors (yellow) |
| 37 | */ | 31 | */ |
| 38 | -$bg_warning: #f39c12; | ||
| 39 | -$border_warning: #f39c12; | 32 | +$bg_warning: #d9831f; |
| 33 | +$border_warning: #d9831f; | ||
| 40 | 34 | ||
| 41 | /** | 35 | /** |
| 42 | * Commit Diff Colors | 36 | * Commit Diff Colors |