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
0daee834
Commit
0daee834
authored
Sep 14, 2018
by
Martin Wortschack
Committed by
Annabel Dunstone Gray
Sep 14, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Username alignment issue on MR page"
parent
197beefc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+2
-1
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+1
-1
changelogs/unreleased/51412-username-alignment-issue-on-mr-page.yml
.../unreleased/51412-username-alignment-issue-on-mr-page.yml
+5
-0
No files found.
app/assets/stylesheets/pages/issuable.scss
View file @
0daee834
...
...
@@ -703,7 +703,8 @@
text-overflow
:
ellipsis
;
.user-status-emoji
{
margin
:
0
$gl-padding-8
0
$gl-padding-4
;
margin-left
:
$gl-padding-4
;
margin-right
:
0
;
}
}
...
...
app/helpers/issuables_helper.rb
View file @
0daee834
...
...
@@ -191,7 +191,7 @@ module IssuablesHelper
output
<<
content_tag
(
:span
,
(
issuable_first_contribution_icon
if
issuable
.
first_contribution?
),
class:
'has-tooltip'
,
title:
_
(
'1st contribution!'
))
output
<<
content_tag
(
:span
,
(
issuable
.
task_status
if
issuable
.
tasks?
),
id:
"task_status"
,
class:
"d-none d-sm-none d-md-inline-block"
)
output
<<
content_tag
(
:span
,
(
issuable
.
task_status
if
issuable
.
tasks?
),
id:
"task_status"
,
class:
"d-none d-sm-none d-md-inline-block
prepend-left-8
"
)
output
<<
content_tag
(
:span
,
(
issuable
.
task_status_short
if
issuable
.
tasks?
),
id:
"task_status_short"
,
class:
"d-md-none"
)
output
.
join
.
html_safe
...
...
changelogs/unreleased/51412-username-alignment-issue-on-mr-page.yml
0 → 100644
View file @
0daee834
---
title
:
Add margin between username and subsequent text in issuable header
merge_request
:
21697
author
:
type
:
other
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