summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-13 09:23:23 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-13 09:23:23 +0000
commit777771db280d512a8eded5e170f1ea3a2356729f (patch)
tree53df583fb1027565c590e30293458cd5cf57ba21 /app/assets
parent2d865213cba628b5baefc7181bf7cf3a8897f0fd (diff)
parente74e03fa66d9cfc05ab70a5fef42bdb8f297ed1b (diff)
downloadgitlab-ce-777771db280d512a8eded5e170f1ea3a2356729f.tar.gz
Merge branch 'referenced-merge-requests' into 'master'
merge request close message moved and merge request now refered by `!`. Fixes #4161 ![Screen_Shot_2016-01-12_at_8.38.57_AM](/uploads/9390ce0ebd1d14bfc83130ff4913a823/Screen_Shot_2016-01-12_at_8.38.57_AM.png) See merge request !2387
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/framework/lists.scss6
-rw-r--r--app/assets/stylesheets/framework/variables.scss1
-rw-r--r--app/assets/stylesheets/pages/issues.scss5
3 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss
index 1c74e525a60..bbdb1c038c5 100644
--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -74,7 +74,7 @@
/** light list with border-bottom between li **/
-ul.bordered-list {
+ul.bordered-list, ul.unstyled-list {
@include basic-list;
&.top-list {
@@ -88,6 +88,10 @@ ul.bordered-list {
}
}
+ul.unstyled-list > li {
+ border-bottom: none;
+}
+
ul.task-list {
li.task-list-item {
list-style-type: none;
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index af75123b0af..d0ff3248ce1 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -24,6 +24,7 @@ $gl-gray: #5a5a5a;
$gl-padding: 16px;
$gl-padding-top:10px;
$gl-avatar-size: 46px;
+$secondary-text: #7f8fa4;
/*
* Color schema
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index a02a3a72e79..1e1af662850 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -144,3 +144,8 @@ form.edit-issue {
.issue-form .select2-container {
width: 250px !important;
}
+
+.issue-closed-by-widget {
+ color: $secondary-text;
+ margin-left: 52px;
+} \ No newline at end of file