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 /app/assets/stylesheets/framework | |
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
Diffstat (limited to 'app/assets/stylesheets/framework')
-rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 14 |
1 files changed, 4 insertions, 10 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; } |