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
a72fc8e6
Commit
a72fc8e6
authored
Apr 24, 2018
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add label actions styling
parent
6b07a352
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
21 deletions
+22
-21
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+17
-16
app/views/shared/_label.html.haml
app/views/shared/_label.html.haml
+5
-5
No files found.
app/assets/stylesheets/pages/labels.scss
View file @
a72fc8e6
...
...
@@ -135,22 +135,6 @@
}
}
.toggle-priority
{
display
:
inline-block
;
vertical-align
:
top
;
button
{
border-color
:
transparent
;
padding
:
5px
8px
;
vertical-align
:
top
;
font-size
:
14px
;
&
:hover
{
border-color
:
transparent
;
}
}
}
.filtered-labels
{
font-size
:
0
;
padding
:
12px
16px
;
...
...
@@ -311,4 +295,21 @@
position
:
relative
;
top
:
(
$grid-size
/
2
);
}
.label-action
{
color
:
$theme-gray-800
;
cursor
:
pointer
;
svg
{
fill
:
$theme-gray-800
;
}
&
:hover
{
color
:
$blue-600
;
svg
{
fill
:
$blue-600
;
}
}
}
}
\ No newline at end of file
app/views/shared/_label.html.haml
View file @
a72fc8e6
...
...
@@ -11,18 +11,18 @@
%li
.inline
.label-badge.label-badge-gray
=
label
.
model_name
.
human
.
capitalize
-
if
can?
(
current_user
,
:admin_label
,
@project
)
%li
.inline.js-toggle-priority
.toggle-priority
{
data:
{
url:
remove_priority_project_label_path
(
@project
,
label
),
%li
.inline.js-toggle-priority
{
data:
{
url:
remove_priority_project_label_path
(
@project
,
label
),
dom_id:
dom_id
(
label
),
type:
label
.
type
}
}
%button
.
add-priority.btn
.has-tooltip
{
title:
'Prioritize'
,
type:
'button'
,
:'data-placement'
=>
'top'
}
%button
.
label-action.add-priority.btn.btn-transparent
.has-tooltip
{
title:
'Prioritize'
,
type:
'button'
,
:'data-placement'
=>
'top'
}
=
icon
(
'star-o'
)
%button
.
remove-priority.btn
.has-tooltip
{
title:
'Remove priority'
,
type:
'button'
,
:'data-placement'
=>
'top'
}
%button
.
label-action.remove-priority.btn.btn-transparent
.has-tooltip
{
title:
'Remove priority'
,
type:
'button'
,
:'data-placement'
=>
'top'
}
=
icon
(
'star'
)
%li
.inline
=
link_to
edit_label_path
(
label
)
do
=
link_to
edit_label_path
(
label
)
,
class:
'btn btn-transparent label-action'
do
=
icon
(
'pencil'
)
%li
.inline
.dropdown
%button
{
type:
'button'
,
class:
'btn btn-transparent js-label-options-dropdown'
,
data:
{
toggle:
'dropdown'
}
}
%button
{
type:
'button'
,
class:
'btn btn-transparent js-label-options-dropdown
label-action
'
,
data:
{
toggle:
'dropdown'
}
}
=
custom_icon
(
'ellipsis_v'
)
.dropdown-menu.dropdown-menu-align-right
%ul
...
...
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