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
5b515030
Commit
5b515030
authored
Aug 04, 2016
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix filter label tooltip HTML rendering
parent
4e457100
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
5 deletions
+13
-5
CHANGELOG
CHANGELOG
+1
-0
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+11
-0
app/views/shared/_labels_row.html.haml
app/views/shared/_labels_row.html.haml
+1
-5
No files found.
CHANGELOG
View file @
5b515030
...
@@ -10,6 +10,7 @@ v 8.11.0 (unreleased)
...
@@ -10,6 +10,7 @@ v 8.11.0 (unreleased)
- Add support for relative links starting with ./ or / to RelativeLinkFilter (winniehell)
- Add support for relative links starting with ./ or / to RelativeLinkFilter (winniehell)
- Fix CI status icon link underline (ClemMakesApps)
- Fix CI status icon link underline (ClemMakesApps)
- The Repository class is now instrumented
- The Repository class is now instrumented
- Fix filter label tooltip HTML rendering (ClemMakesApps)
- Cache the commit author in RequestStore to avoid extra lookups in PostReceive
- Cache the commit author in RequestStore to avoid extra lookups in PostReceive
- Expand commit message width in repo view (ClemMakesApps)
- Expand commit message width in repo view (ClemMakesApps)
- Cache highlighted diff lines for merge requests
- Cache highlighted diff lines for merge requests
...
...
app/assets/stylesheets/pages/labels.scss
View file @
5b515030
...
@@ -182,6 +182,17 @@
...
@@ -182,6 +182,17 @@
.btn
{
.btn
{
color
:
inherit
;
color
:
inherit
;
}
}
a
.btn
{
padding
:
0
;
.has-tooltip
{
top
:
0
;
border-top-right-radius
:
0
;
border-bottom-right-radius
:
0
;
line-height
:
1
.1
;
}
}
}
}
.label-options-toggle
{
.label-options-toggle
{
...
...
app/views/shared/_labels_row.html.haml
View file @
5b515030
-
labels
.
each
do
|
label
|
-
labels
.
each
do
|
label
|
%span
.label-row.btn-group
{
role:
"group"
,
aria:
{
label:
label
.
name
},
style:
"color: #{text_color_for_bg(label.color)}"
}
%span
.label-row.btn-group
{
role:
"group"
,
aria:
{
label:
label
.
name
},
style:
"color: #{text_color_for_bg(label.color)}"
}
=
link_to
label
.
name
,
label_filter_path
(
@project
,
label
,
type:
controller
.
controller_name
),
=
link_to_label
(
label
,
css_class:
'btn btn-transparent'
)
class:
"btn btn-transparent has-tooltip"
,
style:
"background-color:
#{
label
.
color
}
;"
,
title:
escape_once
(
label
.
description
),
data:
{
container:
"body"
}
%button
.btn.btn-transparent.label-remove.js-label-filter-remove
{
type:
"button"
,
style:
"background-color: #{label.color};"
,
data:
{
label:
label
.
title
}
}
%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