summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-02-04 15:50:05 +0000
committerAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-02-04 15:50:05 +0000
commite69d9db5d08118cdea27346c314a2a79c56dc9b7 (patch)
treec797a9fa5988f002e84a9535a269cb441a02431e
parent280b6f6f8d038c4c28b32c5965e8a052adf4a052 (diff)
parent44648ae93dc89fbd6a7f2d5bbd9035ddac23634b (diff)
downloadgitlab-ce-e69d9db5d08118cdea27346c314a2a79c56dc9b7.tar.gz
Merge branch 'fe-update-common-styles' into 'master'
Replace h-13em with h-12em See merge request gitlab-org/gitlab-ce!24895
-rw-r--r--app/assets/stylesheets/framework/common.scss5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss
index 08d84f7748f..15fe331f9e4 100644
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -390,9 +390,12 @@ img.emoji {
/** COMMON SIZING CLASSES **/
.w-0 { width: 0; }
-.h-13em { height: 13em; }
+
+.h-12em { height: 12em; }
+
.mw-460 { max-width: 460px; }
.mw-6em { max-width: 6em; }
+
.min-height-0 { min-height: 0; }
/** COMMON SPACING CLASSES **/