Commit 386ebe4a authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'jl-improve-profile-status-emoji-alignment' into 'master'

Improve profile status emoji alignment

See merge request gitlab-org/gitlab!54078
parents 30edb799 1a1cb292
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
%span.gl-font-base.gl-text-gray-500.gl-vertical-align-middle= s_("UserProfile|(Busy)") %span.gl-font-base.gl-text-gray-500.gl-vertical-align-middle= s_("UserProfile|(Busy)")
- if show_status_emoji?(@user.status) - if show_status_emoji?(@user.status)
.cover-status .cover-status.gl-display-inline-flex.gl-align-items-center
= emoji_icon(@user.status.emoji) = emoji_icon(@user.status.emoji, class: 'gl-mr-2')
= markdown_field(@user.status, :message) = markdown_field(@user.status, :message)
= render "users/profile_basic_info" = render "users/profile_basic_info"
.cover-desc.cgray.mb-1.mb-sm-2 .cover-desc.cgray.mb-1.mb-sm-2
......
---
title: Improve profile status emoji alignment
merge_request: 54078
author:
type: other
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