diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-03 20:01:35 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-03 20:01:35 +0100 |
| commit | e5c865eebf95d58ed33ef3d86f7582aa2db9bb09 (patch) | |
| tree | e686a1bc92c68a962f6906fa5dc455fa796cc4af /app | |
| parent | e41a0c60f448057f69c2952f15d88f9d8191c2fe (diff) | |
| download | gitlab-ce-e5c865eebf95d58ed33ef3d86f7582aa2db9bb09.tar.gz | |
Fix specsui/issuable-form
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 11 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issues.scss | 11 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 11 | ||||
| -rw-r--r-- | app/views/shared/issuable/_context.html.haml | 2 |
4 files changed, 12 insertions, 23 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 51d8e5b4657..b5f449ff695 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -90,6 +90,17 @@ } } +.issuable-show-labels { + a { + margin-right: 5px; + margin-bottom: 5px; + display: inline-block; + .color-label { + padding: 6px 10px; + } + } +} + .cross-project-reference { text-align: center; width: 100%; diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index 41c069f0ad3..f5548c5b88b 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -56,17 +56,6 @@ } } -.issue-show-labels { - a { - margin-right: 5px; - margin-bottom: 5px; - display: inline-block; - .color-label { - padding: 6px 10px; - } - } -} - form.edit-issue { margin: 0; } diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 017a86bcd9a..af6c6830fab 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -183,17 +183,6 @@ display: none; } -.merge-request-show-labels { - a { - margin-right: 5px; - margin-bottom: 5px; - display: inline-block; - .color-label { - padding: 6px 10px; - } - } -} - .merge-request-form .select2-container { width: 250px !important; } diff --git a/app/views/shared/issuable/_context.html.haml b/app/views/shared/issuable/_context.html.haml index 521364ac858..f44b439a843 100644 --- a/app/views/shared/issuable/_context.html.haml +++ b/app/views/shared/issuable/_context.html.haml @@ -33,7 +33,7 @@ %div.prepend-top-default.clearfix .issuable-context-title %label Labels - .merge-request-show-labels + .issuable-show-labels - issuable.labels.each do |label| = link_to_label(label) |