summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-02-22 17:06:40 +0000
committerJacob Schatz <jschatz1@gmail.com>2016-02-22 17:06:40 +0000
commit96ce80d5789e396c0071b48a79bd3f98a1d66ea4 (patch)
treec6ec9264d99cc6e20c2b94c41c3cf9275ac7b09f
parent6fb523d2bfb145044a6cddb82339b1da6ab1d49a (diff)
parent416b49d3f0afeaeec75e48190e5e22eea38cb5a6 (diff)
downloadgitlab-ce-96ce80d5789e396c0071b48a79bd3f98a1d66ea4.tar.gz
Merge branch 'status-indicator-size' into 'master'
Changed the size of status indicators ![Screen_Shot_2016-02-22_at_12.53.25](/uploads/229593bf76a78a2ce658c565d805716a/Screen_Shot_2016-02-22_at_12.53.25.png) ![Screen_Shot_2016-02-22_at_12.53.36](/uploads/d328809a3288943a47bed2cf13611a03/Screen_Shot_2016-02-22_at_12.53.36.png) Closes #12763 See merge request !2913
-rw-r--r--app/assets/stylesheets/framework/issue_box.scss9
1 files changed, 3 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/issue_box.scss b/app/assets/stylesheets/framework/issue_box.scss
index 08dcb563dce..5d7fd36be16 100644
--- a/app/assets/stylesheets/framework/issue_box.scss
+++ b/app/assets/stylesheets/framework/issue_box.scss
@@ -6,31 +6,28 @@
.status-box {
@include border-radius(3px);
-
display: block;
float: left;
padding: 0 $gl-btn-padding;
- font-weight: normal;
+ margin-top: 5px;
margin-right: 10px;
+ color: #FFF;
font-size: $gl-font-size;
+ line-height: 25px;
&.status-box-closed {
background-color: $gl-danger;
- color: #FFF;
}
&.status-box-merged {
background-color: $gl-primary;
- color: #FFF;
}
&.status-box-open {
background-color: $green-light;
- color: #FFF;
}
&.status-box-expired {
background: #cea61b;
- color: #FFF;
}
}