summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Gray <annabel.m.gray@gmail.com>2018-06-02 00:04:06 +0000
committerAnnabel Gray <annabel.m.gray@gmail.com>2018-06-02 00:04:06 +0000
commitfe0ebf76c49e2512b211c5d43152275c536f7e3a (patch)
treed09efceb6b26a09c739e615258e9f54497f0bfe3
parentf8bd8f4f062e518ab855a83f38965df51ec3b073 (diff)
parenteb1324dbb7f6cda34d902cd5ead2841bc3c674c9 (diff)
downloadgitlab-ce-fe0ebf76c49e2512b211c5d43152275c536f7e3a.tar.gz
Merge branch 'ClemMakesApps-master-patch-71268' into 'master'docs-article-cloud-foundry
Fix bootstrap 4 file inputs Closes #46701 See merge request gitlab-org/gitlab-ce!19333
-rw-r--r--app/assets/stylesheets/bootstrap_migration.scss6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index d8e57834f9e..e24f8b1d4e8 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -36,6 +36,12 @@ html [type="button"],
cursor: pointer;
}
+input[type="file"] {
+ // Bootstrap 4 file input height is taller by default
+ // which makes them look ugly
+ line-height: 1;
+}
+
b,
strong {
font-weight: bold;