Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRegis <boudinot.regis@yahoo.com>2017-05-02 00:09:16 +0300
committerRegis <boudinot.regis@yahoo.com>2017-05-02 00:09:16 +0300
commitf23264406d600655a4fd0a07ec6bdef902c9d613 (patch)
tree226960ca37bc4acccd3bf31c9fd607174f0d212b /app/assets/stylesheets/pages/issues.scss
parent4c9e68cb90740ce7967dd748e44c3792e21cf87c (diff)
parent8100f9686dcd729f42d14e86cb9b36b403e036ac (diff)
resolve conflict
Diffstat (limited to 'app/assets/stylesheets/pages/issues.scss')
-rw-r--r--app/assets/stylesheets/pages/issues.scss13
1 files changed, 9 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index 13112916615..f109a01cfa0 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -110,11 +110,16 @@ ul.related-merge-requests > li {
}
}
-.merge-request-ci-status {
+.merge-request-ci-status,
+.related-merge-requests {
+ .ci-status-link {
+ display: block;
+ margin-top: 3px;
+ margin-right: 5px;
+ }
+
svg {
- margin-right: 4px;
- position: relative;
- top: 1px;
+ display: block;
}
}