Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaƫl Poupard <ffoodd@users.noreply.github.com>2021-10-29 08:47:24 +0300
committerGitHub <noreply@github.com>2021-10-29 08:47:24 +0300
commit7a9a3ab50fdc07f4b994a347d05184311eadcb2a (patch)
tree1881d9512acc538e837d3173d03e437caa002245
parent2e87f9aef0dca68967199e52660b645b75dd169d (diff)
Drop prefixed version of `::file-selector-button` (#35232)
Co-authored-by: XhmikosR <xhmikosr@gmail.com>
-rw-r--r--scss/_reboot.scss10
-rw-r--r--scss/forms/_form-control.scss31
2 files changed, 2 insertions, 39 deletions
diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index 65b98f44b6..a392c70616 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -571,16 +571,10 @@ legend {
}
-// Inherit font family and line height for file input buttons
-
-::file-selector-button {
- font: inherit;
-}
-
-// 1. Change font properties to `inherit`
+// 1. Inherit font family and line height for file input buttons
// 2. Correct the inability to style clickable types in iOS and Safari.
-::-webkit-file-upload-button {
+::file-selector-button {
font: inherit; // 1
-webkit-appearance: button; // 2
}
diff --git a/scss/forms/_form-control.scss b/scss/forms/_form-control.scss
index 96423c530c..51b3baa838 100644
--- a/scss/forms/_form-control.scss
+++ b/scss/forms/_form-control.scss
@@ -91,25 +91,6 @@
&:hover:not(:disabled):not([readonly])::file-selector-button {
background-color: $form-file-button-hover-bg;
}
-
- &::-webkit-file-upload-button {
- padding: $input-padding-y $input-padding-x;
- margin: (-$input-padding-y) (-$input-padding-x);
- margin-inline-end: $input-padding-x;
- color: $form-file-button-color;
- @include gradient-bg($form-file-button-bg);
- pointer-events: none;
- border-color: inherit;
- border-style: solid;
- border-width: 0;
- border-inline-end-width: $input-border-width;
- border-radius: 0; // stylelint-disable-line property-disallowed-list
- @include transition($btn-transition);
- }
-
- &:hover:not(:disabled):not([readonly])::-webkit-file-upload-button {
- background-color: $form-file-button-hover-bg;
- }
}
// Readonly controls as plain text
@@ -153,12 +134,6 @@
margin: (-$input-padding-y-sm) (-$input-padding-x-sm);
margin-inline-end: $input-padding-x-sm;
}
-
- &::-webkit-file-upload-button {
- padding: $input-padding-y-sm $input-padding-x-sm;
- margin: (-$input-padding-y-sm) (-$input-padding-x-sm);
- margin-inline-end: $input-padding-x-sm;
- }
}
.form-control-lg {
@@ -172,12 +147,6 @@
margin: (-$input-padding-y-lg) (-$input-padding-x-lg);
margin-inline-end: $input-padding-x-lg;
}
-
- &::-webkit-file-upload-button {
- padding: $input-padding-y-lg $input-padding-x-lg;
- margin: (-$input-padding-y-lg) (-$input-padding-x-lg);
- margin-inline-end: $input-padding-x-lg;
- }
}
// Make sure textareas don't shrink too much when resized