summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-06-07 19:57:18 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-06-07 19:57:18 +0000
commit27aa2e544b9f97b701888bd17d517c5f2b697f91 (patch)
treec8a75cb13e0147bf6fbede119347751047a05e9c
parent881d980afac9797d6ec92262bb459f1b93d0d03c (diff)
parentcb2a00fd6a31866f31201ea79d180547ecb58f4d (diff)
downloadgitlab-ce-27aa2e544b9f97b701888bd17d517c5f2b697f91.tar.gz
Merge branch 'ce-6213-fix-appearance-forms' into 'master'
CE Port of EE Resolve "Admin area > Appearance forms" See merge request gitlab-org/gitlab-ce!19551
-rw-r--r--app/assets/stylesheets/bootstrap_migration.scss4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index 79f580546c3..0c5b6171223 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -261,3 +261,7 @@ pre code {
color: $white-light;
}
}
+
+input[type=color].form-control {
+ height: $input-height;
+}