diff options
| author | Yoginth <me@yoginth.com> | 2019-01-25 16:03:51 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-01-25 16:03:51 +0000 |
| commit | 1ca726aaf79d07f199e2bdcc73a67276109e7140 (patch) | |
| tree | 9ba832603831811a4dc982a263c6d5e4acd60cd3 | |
| parent | bc67c712a51973c5705017f3a06a71a8a6443015 (diff) | |
| download | gitlab-ce-1ca726aaf79d07f199e2bdcc73a67276109e7140.tar.gz | |
Update to GitLab SVG icon from Font Awesome in profile for location and work
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 1 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/update-spriteicon-from-icon-on-profile.yml | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 18df4a5f37d..0fb9bde1785 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -381,6 +381,7 @@ img.emoji { .inline { display: inline-block; } .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; } diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 8da63a29ca6..211e3eafac6 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -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? diff --git a/changelogs/unreleased/update-spriteicon-from-icon-on-profile.yml b/changelogs/unreleased/update-spriteicon-from-icon-on-profile.yml new file mode 100644 index 00000000000..32259bfacd4 --- /dev/null +++ b/changelogs/unreleased/update-spriteicon-from-icon-on-profile.yml @@ -0,0 +1,5 @@ +--- +title: Update to GitLab SVG icon from Font Awesome in profile for location and work +merge_request: 24671 +author: Yoginth +type: changed |