diff options
| author | Dimitrie Hoekstra <dimitriehoekstra@gmail.com> | 2016-11-09 23:27:16 +0100 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2016-11-30 17:15:25 -0600 |
| commit | 9ce28e7913928f93ed2790c434ad888e751e0257 (patch) | |
| tree | 5879042d8a1a78ff123da44eb2a24894e7a08390 | |
| parent | 24e5a1e8db943be346b4f7f4fb49326ad0e5eb9e (diff) | |
| download | gitlab-ce-9ce28e7913928f93ed2790c434ad888e751e0257.tar.gz | |
Remove the help text under the sidebar subscribe button and style it inline
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 9 | ||||
| -rw-r--r-- | changelogs/unreleased/24281-issue-merge-request-sidebar-subscribe-button-style-improvement.yml | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 02427650219..eac83f5d83a 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -144,16 +144,11 @@ .block.light.subscription{data: {url: toggle_subscription_path(issuable)}} .sidebar-collapsed-icon = icon('rss') - .title.hide-collapsed + %span.issuable-header-text.hide-collapsed.pull-left Notifications - subscribtion_status = subscribed ? 'subscribed' : 'unsubscribed' - %button.btn.btn-block.btn-default.js-subscribe-button.issuable-subscribe-button.hide-collapsed{ type: "button" } + %button.btn.btn-default.pull-right.js-subscribe-button.issuable-subscribe-button.hide-collapsed{ type: "button" } %span= subscribed ? 'Unsubscribe' : 'Subscribe' - .subscription-status.hide-collapsed{data: {status: subscribtion_status}} - .unsubscribed{class: ( 'hidden' if subscribed )} - You're not receiving notifications from this thread. - .subscribed{class: ( 'hidden' unless subscribed )} - You're receiving notifications because you're subscribed to this thread. - project_ref = cross_project_reference(@project, issuable) .block.project-reference diff --git a/changelogs/unreleased/24281-issue-merge-request-sidebar-subscribe-button-style-improvement.yml b/changelogs/unreleased/24281-issue-merge-request-sidebar-subscribe-button-style-improvement.yml new file mode 100644 index 00000000000..2227c81bd34 --- /dev/null +++ b/changelogs/unreleased/24281-issue-merge-request-sidebar-subscribe-button-style-improvement.yml @@ -0,0 +1,4 @@ +--- +title: Remove the help text under the sidebar subscribe button and style it inline +merge_request: 7389 +author: |