Merge branch 'ClemMakesApps-master-patch-71268' into 'master'

Fix bootstrap 4 file inputs Closes #46701 See merge request gitlab-org/gitlab-ce!19333

Merge branch 'ClemMakesApps-master-patch-71268' into 'master'
fe0ebf76 · Annabel Gray · f8bd8f4f · eb1324db · fe0ebf76
Commit fe0ebf76 authored Jun 02, 2018 by Annabel Gray
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

bootstrap_migration.scss app/assets/stylesheets/bootstrap_migration.scss +6 -0

No files found.
--- 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;