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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
dc35d3c7
Commit
dc35d3c7
authored
Jan 13, 2022
by
Kev
Committed by
Enrique Alcántara
Jan 13, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use normal font weight and border for 'Subscribe' buttons
Changelog: fixed
parent
d1efd8d3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
20 deletions
+19
-20
app/assets/javascripts/labels/index.js
app/assets/javascripts/labels/index.js
+1
-1
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+2
-3
app/views/shared/_label.html.haml
app/views/shared/_label.html.haml
+16
-16
No files found.
app/assets/javascripts/labels/index.js
View file @
dc35d3c7
...
...
@@ -26,7 +26,7 @@ export function initLabels() {
if
(
$
(
'
.prioritized-labels
'
).
length
)
{
new
LabelManager
();
// eslint-disable-line no-new
}
$
(
'
.label-subscription
'
).
each
((
i
,
el
)
=>
{
$
(
'
.
js-
label-subscription
'
).
each
((
i
,
el
)
=>
{
const
$el
=
$
(
el
);
if
(
$el
.
find
(
'
.dropdown-group-label
'
).
length
)
{
...
...
app/assets/stylesheets/pages/labels.scss
View file @
dc35d3c7
...
...
@@ -107,9 +107,8 @@
display
:
none
;
}
.label-subscribe-button
{
width
:
105px
;
font-weight
:
200
;
.label-subscription
{
width
:
109px
;
}
.labels-container
{
...
...
app/views/shared/_label.html.haml
View file @
dc35d3c7
...
...
@@ -10,18 +10,18 @@
=
render
"shared/label_row"
,
label:
label
,
force_priority:
force_priority
%ul
.label-actions-list
-
if
can?
(
current_user
,
:admin_label
,
@project
)
%li
.
inline.js-toggle-priority
{
data:
{
url:
remove_priority_project_label_path
(
@project
,
label
),
%li
.
gl-display-inline-block.js-toggle-priority.gl-ml-3
{
data:
{
url:
remove_priority_project_label_path
(
@project
,
label
),
dom_id:
dom_id
(
label
),
type:
label
.
type
}
}
%button
.add-priority.btn.gl-button.btn-default-tertiary.btn-sm.has-tooltip
.gl-ml-3
{
title:
_
(
'Prioritize'
),
type:
'button'
,
data:
{
placement:
'bottom'
},
aria_label:
_
(
'Prioritize label'
)
}
%button
.add-priority.btn.gl-button.btn-default-tertiary.btn-sm.has-tooltip
{
title:
_
(
'Prioritize'
),
type:
'button'
,
data:
{
placement:
'bottom'
},
aria_label:
_
(
'Prioritize label'
)
}
=
sprite_icon
(
'star-o'
)
%button
.remove-priority.btn.gl-button.btn-default-tertiary.btn-sm.has-tooltip
.gl-ml-3
{
title:
_
(
'Remove priority'
),
type:
'button'
,
data:
{
placement:
'bottom'
},
aria_label:
_
(
'Deprioritize label'
)
}
%button
.remove-priority.btn.gl-button.btn-default-tertiary.btn-sm.has-tooltip
{
title:
_
(
'Remove priority'
),
type:
'button'
,
data:
{
placement:
'bottom'
},
aria_label:
_
(
'Deprioritize label'
)
}
=
sprite_icon
(
'star'
)
-
if
can?
(
current_user
,
:admin_label
,
label
)
%li
.
inline
%li
.
gl-display-inline-block
=
link_to
label
.
edit_path
,
class:
'btn gl-button btn-default-tertiary btn-sm edit has-tooltip'
,
title:
_
(
'Edit'
),
data:
{
placement:
'bottom'
},
aria_label:
_
(
'Edit'
)
do
=
sprite_icon
(
'pencil'
)
-
if
can?
(
current_user
,
:admin_label
,
label
)
%li
.
inline
%li
.
gl-display-inline-block
.dropdown
%button
{
type:
'button'
,
class:
'btn gl-button btn-default-tertiary btn-sm js-label-options-dropdown'
,
data:
{
toggle:
'dropdown'
},
aria_label:
_
(
'Label actions dropdown'
)
}
=
sprite_icon
(
'ellipsis_v'
)
...
...
@@ -41,23 +41,23 @@
%button
.text-danger.js-delete-label-modal-button
{
type:
'button'
,
data:
{
label_name:
label
.
name
,
subject_name:
label
.
subject_name
,
destroy_path:
label
.
destroy_path
}
}
=
_
(
'Delete'
)
-
if
current_user
%li
.
inline.label-subscription
%li
.
gl-display-inline-block.label-subscription.js-label-subscription.gl-ml-3
-
if
label
.
can_subscribe_to_label_in_different_levels?
%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'
)
%button
.js-unsubscribe-button.gl-button.
btn.btn-default.gl-w-full
{
class:
(
'hidden'
if
status
.
unsubscribed?
),
data:
{
url:
toggle_subscription_path
,
toggle:
'tooltip'
},
title:
tooltip_title
}
%span
.gl-button-text
=
_
(
'Unsubscribe'
)
.dropdown.dropdown-group-label
{
class:
(
'hidden'
unless
status
.
unsubscribed?
)
}
%button
.gl-button.
label-subscribe-button.btn.btn-default.gl-ml-3
{
data:
{
toggle:
'dropdown'
}
}
%span
%button
.gl-button.
btn.btn-default.gl-w-full
{
data:
{
toggle:
'dropdown'
}
}
%span
.gl-button-text
=
_
(
'Subscribe'
)
=
sprite_icon
(
'chevron-down'
)
.dropdown-menu.dropdown-open-left
%ul
%li
%button
.js-subscribe-button
.label-subscribe-button.gl-button.btn.btn-default
{
class:
(
'hidden'
unless
status
.
unsubscribed?
),
data:
{
status:
status
,
url:
toggle_subscription_project_label_path
(
@project
,
label
)
}
}
%span
=
_
(
'Subscribe at project level'
)
%button
.js-subscribe-button
{
class:
(
'hidden'
unless
status
.
unsubscribed?
),
data:
{
status:
status
,
url:
toggle_subscription_project_label_path
(
@project
,
label
)
}
}
%span
.gl-button-text
=
_
(
'Subscribe at project level'
)
%li
%button
.js-subscribe-button.js-group-level
.label-subscribe-button.gl-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'
)
%button
.js-subscribe-button.js-group-level
{
class:
(
'hidden'
unless
status
.
unsubscribed?
),
data:
{
status:
status
,
url:
toggle_subscription_group_label_path
(
label
.
group
,
label
)
}
}
%span
.gl-button-text
=
_
(
'Subscribe at group level'
)
-
else
%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
)
%button
.gl-button.js-subscribe-button.
btn.btn-default.gl-w-full
{
data:
{
status:
status
,
url:
toggle_subscription_path
,
toggle:
'tooltip'
},
title:
tooltip_title
}
%span
.gl-button-text
=
label_subscription_toggle_button_text
(
label
,
@project
)
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