diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-30 08:35:25 -0600 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-02-07 08:56:07 -0600 |
| commit | cd9afb93cf7ce6858b7819cf95093be1f6b4a7be (patch) | |
| tree | 8f252dcea5fac44c5346cd3623238222a30a5805 | |
| parent | 38cb0347b2ae8dc3d8bd61dd81f5f10af688562b (diff) | |
| download | gitlab-ce-26059-segoe-ui-vertical.tar.gz | |
Align Segoe UI label text26059-segoe-ui-vertical
4 files changed, 11 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss index 21d9b4c54ea..762b95a657c 100644 --- a/app/assets/stylesheets/pages/labels.scss +++ b/app/assets/stylesheets/pages/labels.scss @@ -259,3 +259,8 @@ } } } + +.label-link { + display: inline-block; + vertical-align: text-top; +} diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml index f3be343daae..085b2fc2814 100644 --- a/app/views/projects/issues/_issue.html.haml +++ b/app/views/projects/issues/_issue.html.haml @@ -50,7 +50,7 @@ - if issue.labels.any? - issue.labels.each do |label| - = link_to_label(label, subject: issue.project) + = link_to_label(label, subject: issue.project, css_class: 'label-link') - if issue.tasks? %span.task-status diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 513f0818169..4dbb97b3228 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -64,7 +64,7 @@ - if merge_request.labels.any? - merge_request.labels.each do |label| - = link_to_label(label, subject: merge_request.project, type: :merge_request) + = link_to_label(label, subject: merge_request.project, type: :merge_request, css_class: 'label-link') - if merge_request.tasks? diff --git a/changelogs/unreleased/26059-segoe-ui-vertical.yml b/changelogs/unreleased/26059-segoe-ui-vertical.yml new file mode 100644 index 00000000000..fc3f1af5b61 --- /dev/null +++ b/changelogs/unreleased/26059-segoe-ui-vertical.yml @@ -0,0 +1,4 @@ +--- +title: Align Segoe UI label text +merge_request: +author: |