diff options
author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-05-08 22:53:40 +0300 |
---|---|---|
committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-05-08 22:53:40 +0300 |
commit | 892717452c1fef5e31c1372f1e96d6312a2d3328 (patch) | |
tree | d77352022e4a480becd17037c5d597247a3e4ea0 /app | |
parent | c792501440c7ecc2123d654747364447f74b7491 (diff) |
UX review changes
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/pages/labels.scss | 9 | ||||
-rw-r--r-- | app/views/groups/labels/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/labels/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/_label.html.haml | 10 |
4 files changed, 14 insertions, 9 deletions
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss index b63b552415d..591a3414355 100644 --- a/app/assets/stylesheets/pages/labels.scss +++ b/app/assets/stylesheets/pages/labels.scss @@ -234,9 +234,10 @@ .label-badge { color: $theme-gray-900; - font-weight: $gl-font-weight-bold; - padding: $gl-padding-4; + font-weight: $gl-font-weight-normal; + padding: $gl-padding-4 $gl-padding-8; border-radius: $border-radius-default; + font-size: $label-font-size; } .label-badge-blue { @@ -312,4 +313,8 @@ } } } +} + +.priority-labels-empty-state .svg-content img { + max-width: 114px; }
\ No newline at end of file diff --git a/app/views/groups/labels/index.html.haml b/app/views/groups/labels/index.html.haml index 1173499f921..1fa6389de0f 100644 --- a/app/views/groups/labels/index.html.haml +++ b/app/views/groups/labels/index.html.haml @@ -25,7 +25,7 @@ .prioritized-labels{ class: ('hide' if hide) } %h5.prepend-top-0 Prioritized Labels %ul.content-list.manage-labels-list.js-prioritized-labels - #js-priority-labels-empty-state{ class: "#{'hidden' unless @prioritized_labels.empty?}" } + #js-priority-labels-empty-state.priority-labels-empty-state{ class: "#{'hidden' unless @prioritized_labels.empty?}" } = render 'shared/empty_states/priority_labels' - if @prioritized_labels.present? = render partial: 'shared/label', subject: @group, collection: @prioritized_labels, as: :label diff --git a/app/views/projects/labels/index.html.haml b/app/views/projects/labels/index.html.haml index 632355fa338..1bb90281093 100644 --- a/app/views/projects/labels/index.html.haml +++ b/app/views/projects/labels/index.html.haml @@ -25,7 +25,7 @@ .prioritized-labels{ class: ('hide' if hide) } %h5.prepend-top-0 Prioritized Labels %ul.content-list.manage-labels-list.js-prioritized-labels{ "data-url" => set_priorities_project_labels_path(@project) } - #js-priority-labels-empty-state{ class: "#{'hidden' unless @prioritized_labels.empty?}" } + #js-priority-labels-empty-state.priority-labels-empty-state{ class: "#{'hidden' unless @prioritized_labels.empty?}" } = render 'shared/empty_states/priority_labels' - if @prioritized_labels.present? = render partial: 'shared/label', subject: @project, collection: @prioritized_labels, as: :label diff --git a/app/views/shared/_label.html.haml b/app/views/shared/_label.html.haml index f325c45a53f..4d6a822ca14 100644 --- a/app/views/shared/_label.html.haml +++ b/app/views/shared/_label.html.haml @@ -15,16 +15,16 @@ %li.inline.js-toggle-priority{ data: { url: remove_priority_project_label_path(@project, label), dom_id: dom_id(label), type: label.type } } %button.label-action.add-priority.btn.btn-transparent.has-tooltip{ title: 'Prioritize', type: 'button', :'data-placement' => 'top' } - = icon('star-o') + = sprite_icon('star-o') %button.label-action.remove-priority.btn.btn-transparent.has-tooltip{ title: 'Remove priority', type: 'button', :'data-placement' => 'top' } - = icon('star') + = sprite_icon('star') %li.inline = link_to edit_label_path(label), class: 'btn btn-transparent label-action' do - = icon('pencil') + = sprite_icon('pencil') %li.inline .dropdown %button{ type: 'button', class: 'btn btn-transparent js-label-options-dropdown label-action', data: { toggle: 'dropdown' } } - = custom_icon('ellipsis_v') + = sprite_icon('ellipsis_v') .dropdown-menu.dropdown-menu-align-right %ul - if label.is_a?(ProjectLabel) && label.project.group && can?(current_user, :admin_label, label.project.group) @@ -50,7 +50,7 @@ %button.label-subscribe-button.btn.btn-default{ data: { toggle: 'dropdown' } } %span Subscribe - = icon('chevron-down') + = sprite_icon('chevron-down') .dropdown-menu.dropdown-menu-align-right %ul %li |