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
89271745
Commit
89271745
authored
May 08, 2018
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UX review changes
parent
c7925014
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
9 deletions
+14
-9
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+7
-2
app/views/groups/labels/index.html.haml
app/views/groups/labels/index.html.haml
+1
-1
app/views/projects/labels/index.html.haml
app/views/projects/labels/index.html.haml
+1
-1
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 @
89271745
...
@@ -234,9 +234,10 @@
...
@@ -234,9 +234,10 @@
.label-badge
{
.label-badge
{
color
:
$theme-gray-900
;
color
:
$theme-gray-900
;
font-weight
:
$gl-font-weight-
bold
;
font-weight
:
$gl-font-weight-
normal
;
padding
:
$gl-padding-4
;
padding
:
$gl-padding-4
$gl-padding-8
;
border-radius
:
$border-radius-default
;
border-radius
:
$border-radius-default
;
font-size
:
$label-font-size
;
}
}
.label-badge-blue
{
.label-badge-blue
{
...
@@ -312,4 +313,8 @@
...
@@ -312,4 +313,8 @@
}
}
}
}
}
}
}
.priority-labels-empty-state
.svg-content
img
{
max-width
:
114px
;
}
}
\ No newline at end of file
app/views/groups/labels/index.html.haml
View file @
89271745
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
.prioritized-labels
{
class:
(
'hide'
if
hide
)
}
.prioritized-labels
{
class:
(
'hide'
if
hide
)
}
%h5
.prepend-top-0
Prioritized Labels
%h5
.prepend-top-0
Prioritized Labels
%ul
.content-list.manage-labels-list.js-prioritized-labels
%ul
.content-list.manage-labels-list.js-prioritized-labels
#js-priority-labels-empty-state
{
class:
"#{'hidden' unless @prioritized_labels.empty?}"
}
#js-priority-labels-empty-state
.priority-labels-empty-state
{
class:
"#{'hidden' unless @prioritized_labels.empty?}"
}
=
render
'shared/empty_states/priority_labels'
=
render
'shared/empty_states/priority_labels'
-
if
@prioritized_labels
.
present?
-
if
@prioritized_labels
.
present?
=
render
partial:
'shared/label'
,
subject:
@group
,
collection:
@prioritized_labels
,
as: :label
=
render
partial:
'shared/label'
,
subject:
@group
,
collection:
@prioritized_labels
,
as: :label
...
...
app/views/projects/labels/index.html.haml
View file @
89271745
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
.prioritized-labels
{
class:
(
'hide'
if
hide
)
}
.prioritized-labels
{
class:
(
'hide'
if
hide
)
}
%h5
.prepend-top-0
Prioritized Labels
%h5
.prepend-top-0
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
.priority-labels-empty-state
{
class:
"#{'hidden' unless @prioritized_labels.empty?}"
}
=
render
'shared/empty_states/priority_labels'
=
render
'shared/empty_states/priority_labels'
-
if
@prioritized_labels
.
present?
-
if
@prioritized_labels
.
present?
=
render
partial:
'shared/label'
,
subject:
@project
,
collection:
@prioritized_labels
,
as: :label
=
render
partial:
'shared/label'
,
subject:
@project
,
collection:
@prioritized_labels
,
as: :label
...
...
app/views/shared/_label.html.haml
View file @
89271745
...
@@ -15,16 +15,16 @@
...
@@ -15,16 +15,16 @@
%li
.inline.js-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
}
}
dom_id:
dom_id
(
label
),
type:
label
.
type
}
}
%button
.label-action.add-priority.btn.btn-transparent.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'
)
=
sprite_
icon
(
'star-o'
)
%button
.label-action.remove-priority.btn.btn-transparent.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'
)
=
sprite_
icon
(
'star'
)
%li
.inline
%li
.inline
=
link_to
edit_label_path
(
label
),
class:
'btn btn-transparent label-action'
do
=
link_to
edit_label_path
(
label
),
class:
'btn btn-transparent label-action'
do
=
icon
(
'pencil'
)
=
sprite_
icon
(
'pencil'
)
%li
.inline
%li
.inline
.dropdown
.dropdown
%button
{
type:
'button'
,
class:
'btn btn-transparent js-label-options-dropdown label-action'
,
data:
{
toggle:
'dropdown'
}
}
%button
{
type:
'button'
,
class:
'btn btn-transparent js-label-options-dropdown label-action'
,
data:
{
toggle:
'dropdown'
}
}
=
custom
_icon
(
'ellipsis_v'
)
=
sprite
_icon
(
'ellipsis_v'
)
.dropdown-menu.dropdown-menu-align-right
.dropdown-menu.dropdown-menu-align-right
%ul
%ul
-
if
label
.
is_a?
(
ProjectLabel
)
&&
label
.
project
.
group
&&
can?
(
current_user
,
:admin_label
,
label
.
project
.
group
)
-
if
label
.
is_a?
(
ProjectLabel
)
&&
label
.
project
.
group
&&
can?
(
current_user
,
:admin_label
,
label
.
project
.
group
)
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
%button
.label-subscribe-button.btn.btn-default
{
data:
{
toggle:
'dropdown'
}
}
%button
.label-subscribe-button.btn.btn-default
{
data:
{
toggle:
'dropdown'
}
}
%span
%span
Subscribe
Subscribe
=
icon
(
'chevron-down'
)
=
sprite_
icon
(
'chevron-down'
)
.dropdown-menu.dropdown-menu-align-right
.dropdown-menu.dropdown-menu-align-right
%ul
%ul
%li
%li
...
...
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