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
Jérome Perrin
gitlab-ce
Commits
505e883f
Commit
505e883f
authored
May 05, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed labels layout on labels milestone tab
parent
8d059643
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
9 deletions
+7
-9
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+1
-1
app/views/shared/milestones/_labels_tab.html.haml
app/views/shared/milestones/_labels_tab.html.haml
+6
-8
No files found.
app/assets/stylesheets/pages/labels.scss
View file @
505e883f
...
@@ -116,7 +116,7 @@
...
@@ -116,7 +116,7 @@
}
}
.manage-labels-list
{
.manage-labels-list
{
>
li
:not
(
.empty-message
)
{
>
li
:not
(
.empty-message
)
:not
(
.is-not-draggable
)
{
background-color
:
$white-light
;
background-color
:
$white-light
;
cursor
:
move
;
cursor
:
move
;
cursor
:
-
webkit-grab
;
cursor
:
-
webkit-grab
;
...
...
app/views/shared/milestones/_labels_tab.html.haml
View file @
505e883f
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
-
labels
.
each
do
|
label
|
-
labels
.
each
do
|
label
|
-
options
=
{
milestone_title:
@milestone
.
title
,
label_name:
label
.
title
}
-
options
=
{
milestone_title:
@milestone
.
title
,
label_name:
label
.
title
}
%li
%li
.is-not-draggable
%span
.label-row
%span
.label-row
%span
.label-name
%span
.label-name
=
link_to
milestones_label_path
(
options
)
do
=
link_to
milestones_label_path
(
options
)
do
...
@@ -10,10 +10,8 @@
...
@@ -10,10 +10,8 @@
%span
.prepend-description-left
%span
.prepend-description-left
=
markdown_field
(
label
,
:description
)
=
markdown_field
(
label
,
:description
)
.pull-info-right
.pull-right.hidden-xs.hidden-sm.hidden-md
%span
.append-right-20
=
link_to
milestones_label_path
(
options
.
merge
(
state:
'opened'
)),
class:
'btn btn-transparent btn-action'
do
=
link_to
milestones_label_path
(
options
.
merge
(
state:
'opened'
))
do
-
pluralize
milestone_issues_by_label_count
(
@milestone
,
label
,
state: :opened
),
'open issue'
-
pluralize
milestone_issues_by_label_count
(
@milestone
,
label
,
state: :opened
),
'open issue'
=
link_to
milestones_label_path
(
options
.
merge
(
state:
'closed'
)),
class:
'btn btn-transparent btn-action'
do
%span
.append-right-20
-
pluralize
milestone_issues_by_label_count
(
@milestone
,
label
,
state: :closed
),
'closed issue'
=
link_to
milestones_label_path
(
options
.
merge
(
state:
'closed'
))
do
-
pluralize
milestone_issues_by_label_count
(
@milestone
,
label
,
state: :closed
),
'closed issue'
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