diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-02-05 15:00:17 -0700 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-02-05 15:00:17 -0700 |
| commit | cf9b932f78be297ee91de048e634cfa83d91ef83 (patch) | |
| tree | 5eb4f43e256849ec842dc76b7bd8e623ad901338 | |
| parent | f610a0cc17d1f9cd607810d5aabd7bf097f645d0 (diff) | |
| download | gitlab-ce-39550-group-labels-redesign.tar.gz | |
Use sprite_icon and variables39550-group-labels-redesign
| -rw-r--r-- | app/assets/stylesheets/framework/modal.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 | ||||
| -rw-r--r-- | app/views/shared/_label.html.haml | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss index 1b785341246..a6b1bf9b099 100644 --- a/app/assets/stylesheets/framework/modal.scss +++ b/app/assets/stylesheets/framework/modal.scss @@ -6,8 +6,8 @@ margin-top: 0; .color-label { - font-size: 14px; - padding: 6px 10px; + font-size: $gl-font-size; + padding: $gl-vert-padding $label-padding-modal; } } } diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index f76c6866463..85004326656 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -558,6 +558,7 @@ $jq-ui-default-color: #777; * Label */ $label-padding: 7px; +$label-padding-modal: 10px; $label-gray-bg: #f8fafc; $label-inverse-bg: #333; $label-remove-border: rgba(0, 0, 0, .1); diff --git a/app/views/shared/_label.html.haml b/app/views/shared/_label.html.haml index 9e140cd3f13..c0eebdfaddd 100644 --- a/app/views/shared/_label.html.haml +++ b/app/views/shared/_label.html.haml @@ -50,7 +50,7 @@ - if label.is_a?(ProjectLabel) && label.project.group && can?(current_user, :admin_label, label.project.group) = link_to promote_project_label_path(label.project, label), title: "Promote to Group Label", class: 'btn btn-transparent btn-action', data: {confirm: "You are about to promote #{label.title} to a group level. This will make this milestone available to all projects inside #{label.project.group.name}. The existing project label will be merged into the group level. This action cannot be reversed.", toggle: "tooltip"}, method: :post do %span.sr-only Promote to Group - = icon('level-up') + = sprite_icon('level-up') - if can?(current_user, :admin_label, label) = link_to edit_label_path(label), title: "Edit", class: 'btn btn-transparent btn-action', data: {toggle: "tooltip"} do %span.sr-only Edit |