kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'improve-issue-box' into 'master'

Browse source 
Improve issue box colors
This commit is contained in:
Dmitriy Zaporozhets 2014-05-16 11:43:36 +00:00
commit 8fa47d0058
2 changed files with 40 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/assets/stylesheets/generic/issue_box.scss
View file

@ -15,39 +15,39 @@
@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.05));
&.issue-box-closed {
border-color: #DA4E49;
border-color: $border_danger;
.state {
background-color: #f2dede;
border-color: #ebccd1;
color: #a94442;
background-color: $bg_light_danger;
border-color: $border_danger;
color: $color_danger;
.state-label {
background: #DA4E49;
background-color: $bg_danger;
color: #FFF;
}
}
}
&.issue-box-merged {
border-color: #31708f;
border-color: $border_primary;
.state {
background-color: #d9edf7;
border-color: #bce8f1;
color: #31708f;
background-color: $bg_light_primary;
border-color: $border_primary;
color: $color_primary;
.state-label {
background: #31708f;
background-color: $bg_primary;
color: #FFF;
}
}
}
&.issue-box-open {
border-color: #4A4;
border-color: $border_success;
.state {
background-color: #dff0d8;
border-color: #d6e9c6;
color: #3c763d;
background-color: $bg_light_success;
border-color: $border_success;
color: $color_success;
.state-label {
background: #4A4;
background-color: $bg_success;
color: #FFF;
}
}

25
app/assets/stylesheets/main/variables.scss
View file

@ -8,6 +8,31 @@ $bg_style_color: #2299BB;
$list-group-active-bg: $bg_style_color;
$hover: #D9EDF7;
/*
* Success colors (green)
*/
$border_success: #4cae4c;
$bg_success: #5cb85c;
$bg_light_success: #dff0d8;
$color_success: #3c763d;
/*
* Danger colors (red)
*/
$border_danger: #d43f3a;
$bg_danger: #d9534f;
$bg_light_danger: #f2dede;
$color_danger: #a94442;
/*
* Primary colors (blue)
*/
$border_primary: #358ebd;
$bg_primary: #429bca;
$bg_light_primary: #d9edf7;
$color_primary: #31708f;
/**
* Commit Diff Colors
*/