diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-16 12:24:19 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-16 12:24:19 +0000 |
| commit | 71244a7962ea642536138f98d49379ab5c0111a3 (patch) | |
| tree | 9b7ffd7fb89371fdf9d0d3f7b53592de207f6b10 | |
| parent | 64fc7daf12423fb91c6d41f1883605f9b5df786e (diff) | |
| parent | ed44916488a68b2bb37e5fb0080ee1e5e7003ef1 (diff) | |
| download | gitlab-ce-71244a7962ea642536138f98d49379ab5c0111a3.tar.gz | |
Merge branch '59838-blocks' into 'master'
Fixes style-lint issues for blocks.scss
Closes #59838
See merge request gitlab-org/gitlab-ce!28251
| -rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 14 | ||||
| -rw-r--r-- | app/views/help/ui.html.haml | 2 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 6 |
3 files changed, 8 insertions, 14 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index e6c55252b24..3aabb66f7a6 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -22,6 +22,10 @@ } } +.oneline { + line-height: 35px; +} + .row-content-block { margin-top: 0; background-color: $gray-light; @@ -77,10 +81,6 @@ color: $gl-text-color; } - .oneline { - line-height: 35px; - } - > p:last-child { margin-bottom: 0; } @@ -108,10 +108,6 @@ padding: 11px 0; margin-bottom: 11px; - .oneline { - line-height: 35px; - } - &.no-bottom-space { border-bottom: 0; margin-bottom: 0; @@ -160,8 +156,6 @@ } .cover-desc { - color: $gl-text-color; - &.username:last-child { padding-bottom: $gl-padding; } diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index 969df69aafb..cdc894ee5a0 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -70,7 +70,7 @@ .cover-title John Smith - .cover-desc + .cover-desc.cgray = lorem .cover-controls diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 211e3eafac6..6dc61088e65 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -45,7 +45,7 @@ = emoji_icon(@user.status.emoji) = markdown_field(@user.status, :message) - .cover-desc.member-date + .cover-desc.member-date.cgray %p %span.middle-dot-divider @#{@user.username} @@ -53,7 +53,7 @@ %span.middle-dot-divider = s_('Member since %{date}') % { date: @user.created_at.to_date.to_s(:long) } - .cover-desc + .cover-desc.cgray - unless @user.public_email.blank? .profile-link-holder.middle-dot-divider = link_to @user.public_email, "mailto:#{@user.public_email}", class: 'text-link' @@ -82,7 +82,7 @@ = @user.organization - if @user.bio.present? - .cover-desc + .cover-desc.cgray %p.profile-user-bio = @user.bio |