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
fde951b8
Commit
fde951b8
authored
Aug 10, 2017
by
winh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make label actions dropdown style consistent
parent
6f0f65be
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
+13
-2
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+9
-0
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+2
-0
app/views/shared/_label.html.haml
app/views/shared/_label.html.haml
+2
-2
No files found.
app/assets/stylesheets/framework/dropdowns.scss
View file @
fde951b8
...
@@ -791,4 +791,13 @@
...
@@ -791,4 +791,13 @@
#{
$selector
}
.dropdown-menu-align-right
{
#{
$selector
}
.dropdown-menu-align-right
{
margin-top
:
2px
;
margin-top
:
2px
;
}
}
.open
{
#{
$selector
}
.dropdown-menu
,
#{
$selector
}
.dropdown-menu-nav
{
@media
(
max-width
:
$screen-xs-max
)
{
max-width
:
100%
;
}
}
}
}
}
app/assets/stylesheets/pages/labels.scss
View file @
fde951b8
...
@@ -116,6 +116,8 @@
...
@@ -116,6 +116,8 @@
}
}
.manage-labels-list
{
.manage-labels-list
{
@include
new-style-dropdown
;
>
li
:not
(
.empty-message
)
:not
(
.is-not-draggable
)
{
>
li
:not
(
.empty-message
)
:not
(
.is-not-draggable
)
{
background-color
:
$white-light
;
background-color
:
$white-light
;
cursor
:
move
;
cursor
:
move
;
...
...
app/views/shared/_label.html.haml
View file @
fde951b8
...
@@ -14,10 +14,10 @@
...
@@ -14,10 +14,10 @@
%ul
%ul
%li
%li
=
link_to_label
(
label
,
subject:
subject
,
type: :merge_request
)
do
=
link_to_label
(
label
,
subject:
subject
,
type: :merge_request
)
do
v
iew merge requests
V
iew merge requests
%li
%li
=
link_to_label
(
label
,
subject:
subject
)
do
=
link_to_label
(
label
,
subject:
subject
)
do
v
iew open issues
V
iew open issues
-
if
current_user
-
if
current_user
%li
.label-subscription
%li
.label-subscription
-
if
can_subscribe_to_label_in_different_levels?
(
label
)
-
if
can_subscribe_to_label_in_different_levels?
(
label
)
...
...
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