Automatic merge of gitlab-org/gitlab-ce master

ebfa279c · GitLab Bot · d93553c6 · e69d9db5 · ebfa279c
Commit ebfa279c authored Feb 04, 2019 by GitLab Bot
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

app/assets/stylesheets/framework/common.scss app/assets/stylesheets/framework/common.scss +4 -1

No files found.
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -394,9 +394,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 **/