Commit f399b96f authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'fix-spacing-labels' into 'master'

Fix spacing before toggle subscribe button on labels

See merge request gitlab-org/gitlab!52459
parents e760a705 fde2f9ef
...@@ -43,10 +43,10 @@ ...@@ -43,10 +43,10 @@
- if current_user - if current_user
%li.inline.label-subscription %li.inline.label-subscription
- if label.can_subscribe_to_label_in_different_levels? - if label.can_subscribe_to_label_in_different_levels?
%button.js-unsubscribe-button.label-subscribe-button.btn.btn-default{ class: ('hidden' if status.unsubscribed?), data: { url: toggle_subscription_path, toggle: 'tooltip' }, title: tooltip_title } %button.js-unsubscribe-button.gl-button.label-subscribe-button.btn.btn-default.gl-ml-3{ class: ('hidden' if status.unsubscribed?), data: { url: toggle_subscription_path, toggle: 'tooltip' }, title: tooltip_title }
%span= _('Unsubscribe') %span= _('Unsubscribe')
.dropdown.dropdown-group-label{ class: ('hidden' unless status.unsubscribed?) } .dropdown.dropdown-group-label{ class: ('hidden' unless status.unsubscribed?) }
%button.gl-button.label-subscribe-button.btn.btn-default{ data: { toggle: 'dropdown' } } %button.gl-button.label-subscribe-button.btn.btn-default.gl-ml-3{ data: { toggle: 'dropdown' } }
%span %span
= _('Subscribe') = _('Subscribe')
= sprite_icon('chevron-down') = sprite_icon('chevron-down')
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
%button.js-subscribe-button.js-group-level.label-subscribe-button.btn.btn-default{ class: ('hidden' unless status.unsubscribed?), data: { status: status, url: toggle_subscription_group_label_path(label.group, label) } } %button.js-subscribe-button.js-group-level.label-subscribe-button.btn.btn-default{ class: ('hidden' unless status.unsubscribed?), data: { status: status, url: toggle_subscription_group_label_path(label.group, label) } }
%span= _('Subscribe at group level') %span= _('Subscribe at group level')
- else - else
%button.gl-button.js-subscribe-button.label-subscribe-button.btn.btn-default{ data: { status: status, url: toggle_subscription_path, toggle: 'tooltip' }, title: tooltip_title } %button.gl-button.js-subscribe-button.label-subscribe-button.btn.btn-default.gl-ml-3{ data: { status: status, url: toggle_subscription_path, toggle: 'tooltip' }, title: tooltip_title }
%span= label_subscription_toggle_button_text(label, @project) %span= label_subscription_toggle_button_text(label, @project)
= render 'shared/delete_label_modal', label: label = render 'shared/delete_label_modal', label: label
---
title: Fix spacing before toggle subscribe button on labels
merge_request: 52459
author: Yogi (@yo)
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment