aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorMartijn Cuppens <[email protected]>2020-10-28 15:03:41 +0100
committerMartijn Cuppens <[email protected]>2020-10-28 18:29:28 +0100
commitb1c7d1d3a343da497f40dc71ac74f02cb3bedb11 (patch)
treed09b2a76c7160a3a6428e8e6a3190123c366079b /scss
parentb2be299f63d2b0d45d961d046d506a2c09435f41 (diff)
downloadbootstrap-b1c7d1d3a343da497f40dc71ac74f02cb3bedb11.tar.xz
bootstrap-b1c7d1d3a343da497f40dc71ac74f02cb3bedb11.zip
Use the same font on the button as on the field itself
Diffstat (limited to 'scss')
-rw-r--r--scss/_reboot.scss10
-rw-r--r--scss/forms/_form-control.scss2
2 files changed, 9 insertions, 3 deletions
diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index e144c9bf7..35d5bbd99 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -575,7 +575,15 @@ legend {
padding: 0;
}
-// 1. Change font properties to `inherit` in Safari.
+
+// Inherit font family and line height for file input buttons
+
+// stylelint-disable-next-line selector-pseudo-element-no-unknown
+::file-selector-button {
+ font: inherit;
+}
+
+// 1. Change font properties to `inherit`
// 2. Correct the inability to style clickable types in iOS and Safari.
::-webkit-file-upload-button {
diff --git a/scss/forms/_form-control.scss b/scss/forms/_form-control.scss
index 93c0e6042..4f0f0a031 100644
--- a/scss/forms/_form-control.scss
+++ b/scss/forms/_form-control.scss
@@ -72,7 +72,6 @@
margin: (-$input-padding-y) (-$input-padding-x);
margin-inline-end: $input-padding-x;
-moz-margin-end: subtract($input-padding-x, 5px); // stylelint-disable-line property-no-vendor-prefix
- line-height: inherit;
color: $form-file-button-color;
@include gradient-bg($form-file-button-bg);
pointer-events: none;
@@ -93,7 +92,6 @@
padding: $input-padding-y $input-padding-x;
margin: (-$input-padding-y) (-$input-padding-x);
margin-inline-end: $input-padding-x;
- line-height: inherit;
color: $form-file-button-color;
@include gradient-bg($form-file-button-bg);
pointer-events: none;