Commit 52bd8d40667f6755828fdcc486dafbf34eb88627
1 parent
cb58e1cb
Exists in
spb-stable
and in
2 other branches
Improve issue box colors. Move colors to variables for future reuse
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
2 changed files
with
40 additions
and
15 deletions
Show diff stats
app/assets/stylesheets/generic/issue_box.scss
| @@ -15,39 +15,39 @@ | @@ -15,39 +15,39 @@ | ||
| 15 | @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.05)); | 15 | @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.05)); |
| 16 | 16 | ||
| 17 | &.issue-box-closed { | 17 | &.issue-box-closed { |
| 18 | - border-color: #DA4E49; | 18 | + border-color: $border_danger; |
| 19 | .state { | 19 | .state { |
| 20 | - background-color: #f2dede; | ||
| 21 | - border-color: #ebccd1; | ||
| 22 | - color: #a94442; | 20 | + background-color: $bg_light_danger; |
| 21 | + border-color: $border_danger; | ||
| 22 | + color: $color_danger; | ||
| 23 | .state-label { | 23 | .state-label { |
| 24 | - background: #DA4E49; | 24 | + background-color: $bg_danger; |
| 25 | color: #FFF; | 25 | color: #FFF; |
| 26 | } | 26 | } |
| 27 | } | 27 | } |
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | &.issue-box-merged { | 30 | &.issue-box-merged { |
| 31 | - border-color: #31708f; | 31 | + border-color: $border_primary; |
| 32 | .state { | 32 | .state { |
| 33 | - background-color: #d9edf7; | ||
| 34 | - border-color: #bce8f1; | ||
| 35 | - color: #31708f; | 33 | + background-color: $bg_light_primary; |
| 34 | + border-color: $border_primary; | ||
| 35 | + color: $color_primary; | ||
| 36 | .state-label { | 36 | .state-label { |
| 37 | - background: #31708f; | 37 | + background-color: $bg_primary; |
| 38 | color: #FFF; | 38 | color: #FFF; |
| 39 | } | 39 | } |
| 40 | } | 40 | } |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | &.issue-box-open { | 43 | &.issue-box-open { |
| 44 | - border-color: #4A4; | 44 | + border-color: $border_success; |
| 45 | .state { | 45 | .state { |
| 46 | - background-color: #dff0d8; | ||
| 47 | - border-color: #d6e9c6; | ||
| 48 | - color: #3c763d; | 46 | + background-color: $bg_light_success; |
| 47 | + border-color: $border_success; | ||
| 48 | + color: $color_success; | ||
| 49 | .state-label { | 49 | .state-label { |
| 50 | - background: #4A4; | 50 | + background-color: $bg_success; |
| 51 | color: #FFF; | 51 | color: #FFF; |
| 52 | } | 52 | } |
| 53 | } | 53 | } |
app/assets/stylesheets/main/variables.scss
| @@ -8,6 +8,31 @@ $bg_style_color: #2299BB; | @@ -8,6 +8,31 @@ $bg_style_color: #2299BB; | ||
| 8 | $list-group-active-bg: $bg_style_color; | 8 | $list-group-active-bg: $bg_style_color; |
| 9 | $hover: #D9EDF7; | 9 | $hover: #D9EDF7; |
| 10 | 10 | ||
| 11 | +/* | ||
| 12 | + * Success colors (green) | ||
| 13 | + */ | ||
| 14 | +$border_success: #4cae4c; | ||
| 15 | +$bg_success: #5cb85c; | ||
| 16 | +$bg_light_success: #dff0d8; | ||
| 17 | +$color_success: #3c763d; | ||
| 18 | + | ||
| 19 | +/* | ||
| 20 | + * Danger colors (red) | ||
| 21 | + */ | ||
| 22 | +$border_danger: #d43f3a; | ||
| 23 | +$bg_danger: #d9534f; | ||
| 24 | +$bg_light_danger: #f2dede; | ||
| 25 | +$color_danger: #a94442; | ||
| 26 | + | ||
| 27 | +/* | ||
| 28 | + * Primary colors (blue) | ||
| 29 | + */ | ||
| 30 | +$border_primary: #358ebd; | ||
| 31 | +$bg_primary: #429bca; | ||
| 32 | +$bg_light_primary: #d9edf7; | ||
| 33 | +$color_primary: #31708f; | ||
| 34 | + | ||
| 35 | + | ||
| 11 | /** | 36 | /** |
| 12 | * Commit Diff Colors | 37 | * Commit Diff Colors |
| 13 | */ | 38 | */ |