diff options
author | Phil Hughes <me@iamphill.com> | 2019-06-05 07:34:06 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-06-05 07:34:06 +0000 |
commit | df549eb28c83b27500619ccb14c201a4ff87daa3 (patch) | |
tree | e26eebb4ed2ebb95ef6cfd3476058ba340c81d48 /app | |
parent | e8833507554ca240c896d38852aff71577f1776d (diff) | |
parent | 504ab29b82612d798f1d2e641ebe4f4242940c73 (diff) | |
download | gitlab-ce-df549eb28c83b27500619ccb14c201a4ff87daa3.tar.gz |
Merge branch '55253-activity-feed-ui-enhance-line-height' into 'master'
Resolve "Activity feed UI: Enhance line-height"
Closes #55253
See merge request gitlab-org/gitlab-ce!28856
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/events.scss | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 28768bdf88f..0a3bd9bf4d1 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -381,6 +381,7 @@ $breadcrumb-min-height: 48px; $home-panel-title-row-height: 64px; $home-panel-avatar-mobile-size: 24px; $gl-line-height: 16px; +$gl-line-height-20: 20px; $gl-line-height-24: 24px; $gl-line-height-14: 14px; diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss index e34628002ac..500f5816d38 100644 --- a/app/assets/stylesheets/pages/events.scss +++ b/app/assets/stylesheets/pages/events.scss @@ -8,7 +8,7 @@ border-bottom: 1px solid $white-normal; color: $gl-text-color-secondary; position: relative; - line-height: $gl-line-height; + line-height: $gl-line-height-20; .system-note-image { position: absolute; @@ -48,7 +48,7 @@ } .event-user-info { - margin-bottom: $gl-padding-8; + margin-bottom: $gl-padding-4; .author_name { a { @@ -67,7 +67,7 @@ } .event-body { - margin-top: $gl-padding-8; + margin-top: $gl-padding-4; margin-right: 174px; color: $gl-text-color; |