Commit 71244a79 authored by Phil Hughes's avatar Phil Hughes

Merge branch '59838-blocks' into 'master'

Fixes style-lint issues for blocks.scss

Closes #59838

See merge request gitlab-org/gitlab-ce!28251
parents 64fc7daf ed449164
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
} }
} }
.oneline {
line-height: 35px;
}
.row-content-block { .row-content-block {
margin-top: 0; margin-top: 0;
background-color: $gray-light; background-color: $gray-light;
...@@ -77,10 +81,6 @@ ...@@ -77,10 +81,6 @@
color: $gl-text-color; color: $gl-text-color;
} }
.oneline {
line-height: 35px;
}
> p:last-child { > p:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
...@@ -108,10 +108,6 @@ ...@@ -108,10 +108,6 @@
padding: 11px 0; padding: 11px 0;
margin-bottom: 11px; margin-bottom: 11px;
.oneline {
line-height: 35px;
}
&.no-bottom-space { &.no-bottom-space {
border-bottom: 0; border-bottom: 0;
margin-bottom: 0; margin-bottom: 0;
...@@ -160,8 +156,6 @@ ...@@ -160,8 +156,6 @@
} }
.cover-desc { .cover-desc {
color: $gl-text-color;
&.username:last-child { &.username:last-child {
padding-bottom: $gl-padding; padding-bottom: $gl-padding;
} }
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
.cover-title .cover-title
John Smith John Smith
.cover-desc .cover-desc.cgray
= lorem = lorem
.cover-controls .cover-controls
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
= emoji_icon(@user.status.emoji) = emoji_icon(@user.status.emoji)
= markdown_field(@user.status, :message) = markdown_field(@user.status, :message)
.cover-desc.member-date .cover-desc.member-date.cgray
%p %p
%span.middle-dot-divider %span.middle-dot-divider
@#{@user.username} @#{@user.username}
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
%span.middle-dot-divider %span.middle-dot-divider
= s_('Member since %{date}') % { date: @user.created_at.to_date.to_s(:long) } = s_('Member since %{date}') % { date: @user.created_at.to_date.to_s(:long) }
.cover-desc .cover-desc.cgray
- unless @user.public_email.blank? - unless @user.public_email.blank?
.profile-link-holder.middle-dot-divider .profile-link-holder.middle-dot-divider
= link_to @user.public_email, "mailto:#{@user.public_email}", class: 'text-link' = link_to @user.public_email, "mailto:#{@user.public_email}", class: 'text-link'
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
= @user.organization = @user.organization
- if @user.bio.present? - if @user.bio.present?
.cover-desc .cover-desc.cgray
%p.profile-user-bio %p.profile-user-bio
= @user.bio = @user.bio
......
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