summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/common.scss
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-08 06:08:13 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-08 06:08:13 +0000
commitf6e985dba4d0f5b1ede95e9174d30dd6a8bedf0d (patch)
treec1fed91ae38ad6150ba323a2fc9a68f50f648bb4 /app/assets/stylesheets/framework/common.scss
parent30010b161d42bdac3ab5cd16e63cc61c2f4939f3 (diff)
downloadgitlab-ce-f6e985dba4d0f5b1ede95e9174d30dd6a8bedf0d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets/framework/common.scss')
-rw-r--r--app/assets/stylesheets/framework/common.scss1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index 4b7dda3a2ff..7f0d10ae4ac 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -573,6 +573,7 @@ img.emoji {
.gl-font-size-large { font-size: $gl-font-size-large; }
.gl-line-height-24 { line-height: $gl-line-height-24; }
+.gl-line-height-14 { line-height: $gl-line-height-14; }
.gl-font-size-12 { font-size: $gl-font-size-12; }
.gl-font-size-14 { font-size: $gl-font-size-14; }