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
5ec8e800
Commit
5ec8e800
authored
Jan 25, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
ecc7f260
2b8f1943
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+1
-0
app/views/users/show.html.haml
app/views/users/show.html.haml
+2
-2
changelogs/unreleased/update-spriteicon-from-icon-on-profile.yml
...ogs/unreleased/update-spriteicon-from-icon-on-profile.yml
+5
-0
No files found.
app/assets/stylesheets/framework/common.scss
View file @
5ec8e800
...
...
@@ -385,6 +385,7 @@ img.emoji {
.flex
{
display
:
flex
;
}
.center
{
text-align
:
center
;
}
.vertical-align-middle
{
vertical-align
:
middle
;
}
.vertical-align-sub
{
vertical-align
:
sub
;
}
.flex-align-self-center
{
align-self
:
center
;
}
.flex-grow
{
flex-grow
:
1
;
}
.flex-no-shrink
{
flex-shrink
:
0
;
}
...
...
app/views/users/show.html.haml
View file @
5ec8e800
...
...
@@ -74,11 +74,11 @@
=
link_to
@user
.
short_website_url
,
@user
.
full_website_url
,
class:
'text-link'
,
target:
'_blank'
,
rel:
'me noopener noreferrer nofollow'
-
unless
@user
.
location
.
blank?
.profile-link-holder.middle-dot-divider
=
icon
(
'map-marker
'
)
=
sprite_icon
(
'location'
,
size:
16
,
css_class:
'vertical-align-sub
'
)
=
@user
.
location
-
unless
@user
.
organization
.
blank?
.profile-link-holder.middle-dot-divider
=
icon
(
'briefcase
'
)
=
sprite_icon
(
'work'
,
size:
16
,
css_class:
'vertical-align-sub
'
)
=
@user
.
organization
-
if
@user
.
bio
.
present?
...
...
changelogs/unreleased/update-spriteicon-from-icon-on-profile.yml
0 → 100644
View file @
5ec8e800
---
title
:
Update to GitLab SVG icon from Font Awesome in profile for location and work
merge_request
:
24671
author
:
Yoginth
type
:
changed
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