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
b8bc25d9
Commit
b8bc25d9
authored
Jun 05, 2018
by
Annabel Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'jivl-fix-labels-page' into 'master'"
This reverts merge request !19383
parent
6ed5cd1c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
9 deletions
+1
-9
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+0
-8
app/views/projects/labels/index.html.haml
app/views/projects/labels/index.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/labels.scss
View file @
b8bc25d9
...
@@ -196,10 +196,6 @@
...
@@ -196,10 +196,6 @@
.prioritized-labels
{
.prioritized-labels
{
margin-bottom
:
30px
;
margin-bottom
:
30px
;
h5
{
font-size
:
$gl-font-size
;
}
.add-priority
{
.add-priority
{
display
:
none
;
display
:
none
;
color
:
$gray-light
;
color
:
$gray-light
;
...
@@ -214,10 +210,6 @@
...
@@ -214,10 +210,6 @@
}
}
.other-labels
{
.other-labels
{
h5
{
font-size
:
$gl-font-size
;
}
.remove-priority
{
.remove-priority
{
display
:
none
;
display
:
none
;
}
}
...
...
app/views/projects/labels/index.html.haml
View file @
b8bc25d9
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
-# Only show it in the first page
-# Only show it in the first page
-
hide
=
@available_labels
.
empty?
||
(
params
[
:page
].
present?
&&
params
[
:page
]
!=
'1'
)
-
hide
=
@available_labels
.
empty?
||
(
params
[
:page
].
present?
&&
params
[
:page
]
!=
'1'
)
.prioritized-labels
{
class:
(
'hide'
if
hide
)
}
.prioritized-labels
{
class:
(
'hide'
if
hide
)
}
%h5
.prepend-top-10
Prioritized Labels
%h5
Prioritized Labels
%ul
.content-list.manage-labels-list.js-prioritized-labels
{
"data-url"
=>
set_priorities_project_labels_path
(
@project
)
}
%ul
.content-list.manage-labels-list.js-prioritized-labels
{
"data-url"
=>
set_priorities_project_labels_path
(
@project
)
}
#js-priority-labels-empty-state
{
class:
"#{'hidden' unless @prioritized_labels.empty?}"
}
#js-priority-labels-empty-state
{
class:
"#{'hidden' unless @prioritized_labels.empty?}"
}
=
render
'shared/empty_states/priority_labels'
=
render
'shared/empty_states/priority_labels'
...
...
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