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
cba0321f
Commit
cba0321f
authored
May 26, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated design
parent
519c758f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
9 deletions
+29
-9
app/assets/javascripts/issuable.js.coffee
app/assets/javascripts/issuable.js.coffee
+4
-6
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+17
-0
app/views/shared/_labels_row.html.haml
app/views/shared/_labels_row.html.haml
+8
-3
No files found.
app/assets/javascripts/issuable.js.coffee
View file @
cba0321f
...
@@ -11,13 +11,11 @@ issuable_created = false
...
@@ -11,13 +11,11 @@ issuable_created = false
initTemplates
:
->
initTemplates
:
->
Issuable
.
labelRow
=
_
.
template
(
Issuable
.
labelRow
=
_
.
template
(
'<% _.each(labels, function(label){ %>
'<% _.each(labels, function(label){ %>
<span class="label-row">
<span class="label-row btn-group" role="group" aria-label="<%= _.escape(label.title) %>" style="color: <%= label.text_color %>;">
<a href="#">
<a href="#" class="btn btn-transparent has-tooltip" style="background-color: <%= label.color %>;" title="<%= _.escape(label.description) %>" data-container="body">
<span class="label color-label has-tooltip" style="background-color: <%= label.color %>; color: <%= label.text_color %>" title="<%= _.escape(label.description) %>" data-container="body">
<%= _.escape(label.title) %>
<%= _.escape(label.title) %>
</span>
</a>
</a>
<button type="button" class="btn btn-
sm btn-transparent append-right-5 js-label-filter-remove
" data-label="<%= _.escape(label.title) %>">
<button type="button" class="btn btn-
transparent label-remove js-label-filter-remove" style="background-color: <%= label.color %>;
" data-label="<%= _.escape(label.title) %>">
<i class="fa fa-times"></i>
<i class="fa fa-times"></i>
</button>
</button>
</span>
</span>
...
...
app/assets/stylesheets/pages/labels.scss
View file @
cba0321f
...
@@ -169,3 +169,20 @@
...
@@ -169,3 +169,20 @@
}
}
}
}
}
}
.filtered-labels
{
.label-row
{
&
:not
(
:last-child
)
{
margin-right
:
5px
;
}
}
.label-remove
{
border-left
:
1px
solid
;
z-index
:
3
;
}
.btn
{
color
:
inherit
;
}
}
app/views/shared/_labels_row.html.haml
View file @
cba0321f
-
labels
.
each
do
|
label
|
-
labels
.
each
do
|
label
|
%span
.label-row
%span
.label-row.btn-group
{
role:
"group"
,
aria:
{
label:
escape_once
(
label
.
name
)
},
style:
"color: #{text_color_for_bg(label.color)}"
}
=
link_to_label
(
label
,
tooltip:
true
)
=
link_to
namespace_project_label_path
(
@project
.
namespace
,
@project
,
label
),
%button
.btn.btn-sm.btn-transparent.append-right-5.js-label-filter-remove
{
type:
"button"
,
data:
{
label:
label
.
title
}
}
class:
"btn btn-transparent has-tooltip"
,
style:
"background-color:
#{
label
.
color
}
;"
,
title:
escape_once
(
label
.
description
),
data:
{
container:
"body"
}
do
=
escape_once
label
.
name
%button
.btn.btn-transparent.label-remove.js-label-filter-remove
{
type:
"button"
,
style:
"background-color: #{label.color};"
,
data:
{
label:
label
.
title
}
}
=
icon
(
"times"
)
=
icon
(
"times"
)
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