Removed references to subscribe-button CSS class
These were being blocked by adblocks Closes #15043
This commit is contained in:
parent
4087bd16e8
commit
02cfff4623
|
@ -2,7 +2,7 @@ class @Subscription
|
|||
constructor: (container) ->
|
||||
$container = $(container)
|
||||
@url = $container.attr('data-url')
|
||||
@subscribe_button = $container.find('.subscribe-button')
|
||||
@subscribe_button = $container.find('.issuable-subscribe-button')
|
||||
@subscription_status = $container.find('.subscription-status')
|
||||
@subscribe_button.unbind('click').click(@toggleSubscription)
|
||||
|
||||
|
|
|
@ -173,12 +173,6 @@
|
|||
}
|
||||
}
|
||||
|
||||
.subscribe-button {
|
||||
span {
|
||||
margin-top: 0;
|
||||
}
|
||||
}
|
||||
|
||||
&.right-sidebar-collapsed {
|
||||
/* Extra small devices (phones, less than 768px) */
|
||||
display: none;
|
||||
|
|
|
@ -106,7 +106,7 @@
|
|||
padding: 6px;
|
||||
color: $gl-text-color;
|
||||
|
||||
&.subscribe-button {
|
||||
&.label-subscribe-button {
|
||||
padding-left: 0;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
.label-subscription{data: {url: toggle_subscription_namespace_project_label_path(@project.namespace, @project, label)}}
|
||||
.subscription-status{data: {status: label_subscription_status(label)}}
|
||||
|
||||
%a.subscribe-button.btn.action-buttons{data: {toggle: "tooltip"}}
|
||||
%a.label-subscribe-button.btn.action-buttons{data: {toggle: "tooltip"}}
|
||||
%span= label_subscription_toggle_button_text(label)
|
||||
|
||||
- if can? current_user, :admin_label, @project
|
||||
|
|
|
@ -128,7 +128,7 @@
|
|||
.title.hide-collapsed
|
||||
Notifications
|
||||
- subscribtion_status = subscribed ? 'subscribed' : 'unsubscribed'
|
||||
%button.btn.btn-block.btn-gray.subscribe-button.hide-collapsed{:type => 'button'}
|
||||
%button.btn.btn-block.btn-gray.issuable-subscribe-button.hide-collapsed{:type => 'button'}
|
||||
%span= subscribed ? 'Unsubscribe' : 'Subscribe'
|
||||
.subscription-status.hide-collapsed{data: {status: subscribtion_status}}
|
||||
.unsubscribed{class: ( 'hidden' if subscribed )}
|
||||
|
@ -152,4 +152,4 @@
|
|||
new LabelsSelect();
|
||||
new IssuableContext('#{current_user.to_json(only: [:username, :id, :name])}');
|
||||
new Subscription('.subscription')
|
||||
new Sidebar();
|
||||
new Sidebar();
|
||||
|
|
|
@ -20,11 +20,11 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
|
|||
end
|
||||
|
||||
step 'I should see that I am subscribed' do
|
||||
expect(find('.subscribe-button span')).to have_content 'Unsubscribe'
|
||||
expect(find('.issuable-subscribe-button span')).to have_content 'Unsubscribe'
|
||||
end
|
||||
|
||||
step 'I should see that I am unsubscribed' do
|
||||
expect(find('.subscribe-button span')).to have_content 'Subscribe'
|
||||
expect(find('.issuable-subscribe-button span')).to have_content 'Subscribe'
|
||||
end
|
||||
|
||||
step 'I click link "Closed"' do
|
||||
|
|
|
@ -29,6 +29,6 @@ class Spinach::Features::Labels < Spinach::FeatureSteps
|
|||
private
|
||||
|
||||
def subscribe_button
|
||||
first('.subscribe-button span')
|
||||
first('.label-subscribe-button span')
|
||||
end
|
||||
end
|
||||
|
|
|
@ -77,11 +77,11 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
|
|||
end
|
||||
|
||||
step 'I should see that I am subscribed' do
|
||||
expect(find('.subscribe-button span')).to have_content 'Unsubscribe'
|
||||
expect(find('.issuable-subscribe-button span')).to have_content 'Unsubscribe'
|
||||
end
|
||||
|
||||
step 'I should see that I am unsubscribed' do
|
||||
expect(find('.subscribe-button span')).to have_content 'Subscribe'
|
||||
expect(find('.issuable-subscribe-button span')).to have_content 'Subscribe'
|
||||
end
|
||||
|
||||
step 'I click button "Unsubscribe"' do
|
||||
|
|
Loading…
Reference in New Issue