Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
9ce28e79
Commit
9ce28e79
authored
Nov 09, 2016
by
Dimitrie Hoekstra
Committed by
Mike Greiling
Nov 30, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove the help text under the sidebar subscribe button and style it inline
parent
24e5a1e8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+2
-7
changelogs/unreleased/24281-issue-merge-request-sidebar-subscribe-button-style-improvement.yml
...ge-request-sidebar-subscribe-button-style-improvement.yml
+4
-0
No files found.
app/views/shared/issuable/_sidebar.html.haml
View file @
9ce28e79
...
@@ -144,16 +144,11 @@
...
@@ -144,16 +144,11 @@
.block.light.subscription
{
data:
{
url:
toggle_subscription_path
(
issuable
)}}
.block.light.subscription
{
data:
{
url:
toggle_subscription_path
(
issuable
)}}
.sidebar-collapsed-icon
.sidebar-collapsed-icon
=
icon
(
'rss'
)
=
icon
(
'rss'
)
.title.hide-collapsed
%span
.issuable-header-text.hide-collapsed.pull-left
Notifications
Notifications
-
subscribtion_status
=
subscribed
?
'subscribed'
:
'unsubscribed'
-
subscribtion_status
=
subscribed
?
'subscribed'
:
'unsubscribed'
%button
.btn.btn-
block.btn-defaul
t.js-subscribe-button.issuable-subscribe-button.hide-collapsed
{
type:
"button"
}
%button
.btn.btn-
default.pull-righ
t.js-subscribe-button.issuable-subscribe-button.hide-collapsed
{
type:
"button"
}
%span
=
subscribed
?
'Unsubscribe'
:
'Subscribe'
%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
)
-
project_ref
=
cross_project_reference
(
@project
,
issuable
)
.block.project-reference
.block.project-reference
...
...
changelogs/unreleased/24281-issue-merge-request-sidebar-subscribe-button-style-improvement.yml
0 → 100644
View file @
9ce28e79
---
title
:
Remove the help text under the sidebar subscribe button and style it inline
merge_request
:
7389
author
:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment