mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-10 07:37:27 +02:00
Code Issues Releases Wiki Activity

Use the same font on the button as on the field itself

Browse Source
This commit is contained in:
Martijn Cuppens
2020-10-28 15:03:41 +01:00
parent b2be299f63
commit b1c7d1d3a3
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scss/_reboot.scss
View File

@@ -575,7 +575,15 @@ legend {
padding: 0; 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. // 2. Correct the inability to style clickable types in iOS and Safari.
::-webkit-file-upload-button { ::-webkit-file-upload-button {

2
scss/forms/_form-control.scss
View File

@@ -72,7 +72,6 @@
margin: (-$input-padding-y) (-$input-padding-x); margin: (-$input-padding-y) (-$input-padding-x);
margin-inline-end: $input-padding-x; margin-inline-end: $input-padding-x;
-moz-margin-end: subtract($input-padding-x, 5px); // stylelint-disable-line property-no-vendor-prefix -moz-margin-end: subtract($input-padding-x, 5px); // stylelint-disable-line property-no-vendor-prefix
line-height: inherit;
color: $form-file-button-color; color: $form-file-button-color;
@include gradient-bg($form-file-button-bg); @include gradient-bg($form-file-button-bg);
pointer-events: none; pointer-events: none;
@@ -93,7 +92,6 @@
padding: $input-padding-y $input-padding-x; padding: $input-padding-y $input-padding-x;
margin: (-$input-padding-y) (-$input-padding-x); margin: (-$input-padding-y) (-$input-padding-x);
margin-inline-end: $input-padding-x; margin-inline-end: $input-padding-x;
line-height: inherit;
color: $form-file-button-color; color: $form-file-button-color;
@include gradient-bg($form-file-button-bg); @include gradient-bg($form-file-button-bg);
pointer-events: none; pointer-events: none;