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
Tatuya Kamada
gitlab-ce
Commits
06092b75
Commit
06092b75
authored
Feb 07, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '26059-segoe-ui-vertical' into 'master'
Align Segoe UI label text See merge request !8884
parents
4bd1b550
cd9afb93
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
2 deletions
+11
-2
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+5
-0
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue.html.haml
+1
-1
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+1
-1
changelogs/unreleased/26059-segoe-ui-vertical.yml
changelogs/unreleased/26059-segoe-ui-vertical.yml
+4
-0
No files found.
app/assets/stylesheets/pages/labels.scss
View file @
06092b75
...
...
@@ -259,3 +259,8 @@
}
}
}
.label-link
{
display
:
inline-block
;
vertical-align
:
text-top
;
}
app/views/projects/issues/_issue.html.haml
View file @
06092b75
...
...
@@ -50,7 +50,7 @@
-
if
issue
.
labels
.
any?
-
issue
.
labels
.
each
do
|
label
|
=
link_to_label
(
label
,
subject:
issue
.
project
)
=
link_to_label
(
label
,
subject:
issue
.
project
,
css_class:
'label-link'
)
-
if
issue
.
tasks?
%span
.task-status
...
...
app/views/projects/merge_requests/_merge_request.html.haml
View file @
06092b75
...
...
@@ -64,7 +64,7 @@
-
if
merge_request
.
labels
.
any?
-
merge_request
.
labels
.
each
do
|
label
|
=
link_to_label
(
label
,
subject:
merge_request
.
project
,
type: :merge_request
)
=
link_to_label
(
label
,
subject:
merge_request
.
project
,
type: :merge_request
,
css_class:
'label-link'
)
-
if
merge_request
.
tasks?
...
...
changelogs/unreleased/26059-segoe-ui-vertical.yml
0 → 100644
View file @
06092b75
---
title
:
Align Segoe UI label text
merge_request
:
author
:
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