Commit 51441b97 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'update-spriteicon-from-icon-on-profile' into 'master'

Update to GitLab SVG icon from Font Awesome in profile for location and work

See merge request gitlab-org/gitlab-ce!24671
parents bc67c712 1ca726aa
...@@ -381,6 +381,7 @@ img.emoji { ...@@ -381,6 +381,7 @@ img.emoji {
.inline { display: inline-block; } .inline { display: inline-block; }
.center { text-align: center; } .center { text-align: center; }
.vertical-align-middle { vertical-align: middle; } .vertical-align-middle { vertical-align: middle; }
.vertical-align-sub { vertical-align: sub; }
.flex-align-self-center { align-self: center; } .flex-align-self-center { align-self: center; }
.flex-grow { flex-grow: 1; } .flex-grow { flex-grow: 1; }
.flex-no-shrink { flex-shrink: 0; } .flex-no-shrink { flex-shrink: 0; }
......
...@@ -74,11 +74,11 @@ ...@@ -74,11 +74,11 @@
= link_to @user.short_website_url, @user.full_website_url, class: 'text-link', target: '_blank', rel: 'me noopener noreferrer nofollow' = link_to @user.short_website_url, @user.full_website_url, class: 'text-link', target: '_blank', rel: 'me noopener noreferrer nofollow'
- unless @user.location.blank? - unless @user.location.blank?
.profile-link-holder.middle-dot-divider .profile-link-holder.middle-dot-divider
= icon('map-marker') = sprite_icon('location', size: 16, css_class: 'vertical-align-sub')
= @user.location = @user.location
- unless @user.organization.blank? - unless @user.organization.blank?
.profile-link-holder.middle-dot-divider .profile-link-holder.middle-dot-divider
= icon('briefcase') = sprite_icon('work', size: 16, css_class: 'vertical-align-sub')
= @user.organization = @user.organization
- if @user.bio.present? - if @user.bio.present?
......
---
title: Update to GitLab SVG icon from Font Awesome in profile for location and work
merge_request: 24671
author: Yoginth
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment