提交 71244a79 编写于 作者: P 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
......@@ -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;
}
......
......@@ -70,7 +70,7 @@
.cover-title
John Smith
.cover-desc
.cover-desc.cgray
= lorem
.cover-controls
......
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册