bootstrap 5.0.0.alpha2 → 5.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (96) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +1 -0
  3. data/README.md +7 -4
  4. data/assets/javascripts/bootstrap-global-this-define.js +6 -0
  5. data/assets/javascripts/bootstrap-global-this-undefine.js +2 -0
  6. data/assets/javascripts/bootstrap-sprockets.js +10 -7
  7. data/assets/javascripts/bootstrap.js +2554 -2564
  8. data/assets/javascripts/bootstrap.min.js +3 -3
  9. data/assets/javascripts/bootstrap/alert.js +119 -115
  10. data/assets/javascripts/bootstrap/base-component.js +63 -0
  11. data/assets/javascripts/bootstrap/button.js +67 -69
  12. data/assets/javascripts/bootstrap/carousel.js +340 -331
  13. data/assets/javascripts/bootstrap/collapse.js +214 -209
  14. data/assets/javascripts/bootstrap/dom/data.js +35 -48
  15. data/assets/javascripts/bootstrap/dom/event-handler.js +105 -98
  16. data/assets/javascripts/bootstrap/dom/manipulator.js +26 -34
  17. data/assets/javascripts/bootstrap/dom/selector-engine.js +28 -41
  18. data/assets/javascripts/bootstrap/dropdown.js +392 -325
  19. data/assets/javascripts/bootstrap/modal.js +492 -434
  20. data/assets/javascripts/bootstrap/offcanvas.js +671 -0
  21. data/assets/javascripts/bootstrap/popover.js +114 -132
  22. data/assets/javascripts/bootstrap/scrollspy.js +172 -180
  23. data/assets/javascripts/bootstrap/tab.js +168 -144
  24. data/assets/javascripts/bootstrap/toast.js +141 -150
  25. data/assets/javascripts/bootstrap/tooltip.js +466 -452
  26. data/assets/stylesheets/_bootstrap-grid.scss +9 -9
  27. data/assets/stylesheets/_bootstrap-reboot.scss +3 -3
  28. data/assets/stylesheets/_bootstrap.scss +5 -3
  29. data/assets/stylesheets/bootstrap/_accordion.scss +118 -0
  30. data/assets/stylesheets/bootstrap/_alert.scss +10 -3
  31. data/assets/stylesheets/bootstrap/_breadcrumb.scss +2 -4
  32. data/assets/stylesheets/bootstrap/_button-group.scss +5 -7
  33. data/assets/stylesheets/bootstrap/_buttons.scss +2 -15
  34. data/assets/stylesheets/bootstrap/_card.scss +2 -29
  35. data/assets/stylesheets/bootstrap/_carousel.scss +35 -18
  36. data/assets/stylesheets/bootstrap/_close.scss +2 -3
  37. data/assets/stylesheets/bootstrap/_dropdown.scss +33 -29
  38. data/assets/stylesheets/bootstrap/_forms.scss +1 -1
  39. data/assets/stylesheets/bootstrap/_functions.scss +11 -12
  40. data/assets/stylesheets/bootstrap/_list-group.scss +23 -6
  41. data/assets/stylesheets/bootstrap/_mixins.scss +1 -0
  42. data/assets/stylesheets/bootstrap/_modal.scss +2 -9
  43. data/assets/stylesheets/bootstrap/_nav.scss +12 -0
  44. data/assets/stylesheets/bootstrap/_navbar.scss +15 -2
  45. data/assets/stylesheets/bootstrap/_offcanvas.scss +77 -0
  46. data/assets/stylesheets/bootstrap/_pagination.scss +3 -3
  47. data/assets/stylesheets/bootstrap/_popover.scss +10 -22
  48. data/assets/stylesheets/bootstrap/_progress.scss +4 -1
  49. data/assets/stylesheets/bootstrap/_reboot.scss +48 -44
  50. data/assets/stylesheets/bootstrap/_root.scss +5 -5
  51. data/assets/stylesheets/bootstrap/_spinners.scss +18 -5
  52. data/assets/stylesheets/bootstrap/_tables.scss +15 -16
  53. data/assets/stylesheets/bootstrap/_toasts.scss +15 -12
  54. data/assets/stylesheets/bootstrap/_tooltip.scss +12 -12
  55. data/assets/stylesheets/bootstrap/_transitions.scss +2 -0
  56. data/assets/stylesheets/bootstrap/_utilities.scss +133 -70
  57. data/assets/stylesheets/bootstrap/_variables.scss +363 -207
  58. data/assets/stylesheets/bootstrap/bootstrap-utilities.scss +5 -5
  59. data/assets/stylesheets/bootstrap/forms/_floating-labels.scss +61 -0
  60. data/assets/stylesheets/bootstrap/forms/_form-check.scss +21 -11
  61. data/assets/stylesheets/bootstrap/forms/_form-control.scss +112 -9
  62. data/assets/stylesheets/bootstrap/forms/_form-range.scss +1 -46
  63. data/assets/stylesheets/bootstrap/forms/_form-select.scss +1 -16
  64. data/assets/stylesheets/bootstrap/forms/_input-group.scss +21 -40
  65. data/assets/stylesheets/bootstrap/forms/_validation.scss +1 -1
  66. data/assets/stylesheets/bootstrap/helpers/_colored-links.scss +2 -2
  67. data/assets/stylesheets/bootstrap/helpers/_ratio.scss +2 -2
  68. data/assets/stylesheets/bootstrap/helpers/_visually-hidden.scss +1 -1
  69. data/assets/stylesheets/bootstrap/mixins/_alert.scss +3 -1
  70. data/assets/stylesheets/bootstrap/mixins/_border-radius.scss +8 -6
  71. data/assets/stylesheets/bootstrap/mixins/_buttons.scss +10 -5
  72. data/assets/stylesheets/bootstrap/mixins/_caret.scss +8 -6
  73. data/assets/stylesheets/bootstrap/mixins/_color-scheme.scss +7 -0
  74. data/assets/stylesheets/bootstrap/mixins/_container.scss +2 -4
  75. data/assets/stylesheets/bootstrap/mixins/_forms.scss +26 -22
  76. data/assets/stylesheets/bootstrap/mixins/_gradients.scss +5 -1
  77. data/assets/stylesheets/bootstrap/mixins/_grid.scss +18 -13
  78. data/assets/stylesheets/bootstrap/mixins/_list-group.scss +3 -1
  79. data/assets/stylesheets/bootstrap/mixins/_pagination.scss +5 -3
  80. data/assets/stylesheets/bootstrap/mixins/_table-variants.scss +7 -7
  81. data/assets/stylesheets/bootstrap/mixins/_utilities.scss +19 -0
  82. data/assets/stylesheets/bootstrap/mixins/_visually-hidden.scss +3 -2
  83. data/assets/stylesheets/bootstrap/utilities/_api.scss +1 -1
  84. data/bootstrap.gemspec +1 -3
  85. data/lib/bootstrap/version.rb +2 -2
  86. data/tasks/updater/js.rb +20 -5
  87. data/tasks/updater/network.rb +7 -1
  88. data/test/dummy_rails/app/assets/javascripts/application.js +4 -3
  89. data/test/dummy_rails/app/views/layouts/application.html.erb +3 -1
  90. data/test/dummy_rails/app/views/pages/root.html +89 -0
  91. data/test/dummy_rails/config/application.rb +0 -3
  92. data/test/gemfiles/rails_6_1.gemfile +7 -0
  93. metadata +20 -40
  94. data/assets/javascripts/bootstrap/dom/polyfill.js +0 -110
  95. data/assets/stylesheets/bootstrap/forms/_form-file.scss +0 -91
  96. data/test/dummy_rails/app/views/pages/root.html.slim +0 -58
@@ -1,18 +1,18 @@
1
1
  /*!
2
- * Bootstrap Utilities v5.0.0-alpha2 (https://getbootstrap.com/)
3
- * Copyright 2011-2020 The Bootstrap Authors
4
- * Copyright 2011-2020 Twitter, Inc.
2
+ * Bootstrap Utilities v5.0.0 (https://getbootstrap.com/)
3
+ * Copyright 2011-2021 The Bootstrap Authors
4
+ * Copyright 2011-2021 Twitter, Inc.
5
5
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
6
6
  */
7
7
 
8
8
  // Configuration
9
-
10
9
  @import "functions";
11
10
  @import "variables";
12
11
  @import "mixins";
13
12
  @import "utilities";
14
13
 
14
+ // Helpers
15
+ @import "helpers";
15
16
 
16
17
  // Utilities
17
-
18
18
  @import "utilities/api";
@@ -0,0 +1,61 @@
1
+ .form-floating {
2
+ position: relative;
3
+
4
+ > .form-control,
5
+ > .form-select {
6
+ height: $form-floating-height;
7
+ padding: $form-floating-padding-y $form-floating-padding-x;
8
+ }
9
+
10
+ > label {
11
+ position: absolute;
12
+ top: 0;
13
+ left: 0;
14
+ height: 100%; // allow textareas
15
+ padding: $form-floating-padding-y $form-floating-padding-x;
16
+ pointer-events: none;
17
+ border: $input-border-width solid transparent; // Required for aligning label's text with the input as it affects inner box model
18
+ transform-origin: 0 0;
19
+ @include transition($form-floating-transition);
20
+ }
21
+
22
+ // stylelint-disable no-duplicate-selectors
23
+ > .form-control {
24
+ &::placeholder {
25
+ color: transparent;
26
+ }
27
+
28
+ &:focus,
29
+ &:not(:placeholder-shown) {
30
+ padding-top: $form-floating-input-padding-t;
31
+ padding-bottom: $form-floating-input-padding-b;
32
+ }
33
+ // Duplicated because `:-webkit-autofill` invalidates other selectors when grouped
34
+ &:-webkit-autofill {
35
+ padding-top: $form-floating-input-padding-t;
36
+ padding-bottom: $form-floating-input-padding-b;
37
+ }
38
+ }
39
+
40
+ > .form-select {
41
+ padding-top: $form-floating-input-padding-t;
42
+ padding-bottom: $form-floating-input-padding-b;
43
+ }
44
+
45
+ > .form-control:focus,
46
+ > .form-control:not(:placeholder-shown),
47
+ > .form-select {
48
+ ~ label {
49
+ opacity: $form-floating-label-opacity;
50
+ transform: $form-floating-label-transform;
51
+ }
52
+ }
53
+ // Duplicated because `:-webkit-autofill` invalidates other selectors when grouped
54
+ > .form-control:-webkit-autofill {
55
+ ~ label {
56
+ opacity: $form-floating-label-opacity;
57
+ transform: $form-floating-label-transform;
58
+ }
59
+ }
60
+ // stylelint-enable no-duplicate-selectors
61
+ }
@@ -5,12 +5,12 @@
5
5
  .form-check {
6
6
  display: block;
7
7
  min-height: $form-check-min-height;
8
- padding-left: $form-check-padding-left;
8
+ padding-left: $form-check-padding-start;
9
9
  margin-bottom: $form-check-margin-bottom;
10
10
 
11
11
  .form-check-input {
12
12
  float: left;
13
- margin-left: $form-check-padding-left * -1;
13
+ margin-left: $form-check-padding-start * -1;
14
14
  }
15
15
  }
16
16
 
@@ -53,7 +53,7 @@
53
53
 
54
54
  &[type="checkbox"] {
55
55
  @if $enable-gradients {
56
- background-image: escape-svg($form-check-input-checked-bg-image), var(--bs-gradient);
56
+ background-image: escape-svg($form-check-input-checked-bg-image), var(--#{$variable-prefix}gradient);
57
57
  } @else {
58
58
  background-image: escape-svg($form-check-input-checked-bg-image);
59
59
  }
@@ -61,7 +61,7 @@
61
61
 
62
62
  &[type="radio"] {
63
63
  @if $enable-gradients {
64
- background-image: escape-svg($form-check-radio-checked-bg-image), var(--bs-gradient);
64
+ background-image: escape-svg($form-check-radio-checked-bg-image), var(--#{$variable-prefix}gradient);
65
65
  } @else {
66
66
  background-image: escape-svg($form-check-radio-checked-bg-image);
67
67
  }
@@ -73,7 +73,7 @@
73
73
  border-color: $form-check-input-indeterminate-border-color;
74
74
 
75
75
  @if $enable-gradients {
76
- background-image: escape-svg($form-check-input-indeterminate-bg-image), var(--bs-gradient);
76
+ background-image: escape-svg($form-check-input-indeterminate-bg-image), var(--#{$variable-prefix}gradient);
77
77
  } @else {
78
78
  background-image: escape-svg($form-check-input-indeterminate-bg-image);
79
79
  }
@@ -82,7 +82,7 @@
82
82
  &:disabled {
83
83
  pointer-events: none;
84
84
  filter: none;
85
- opacity: .5;
85
+ opacity: $form-check-input-disabled-opacity;
86
86
  }
87
87
 
88
88
  // Use disabled attribute in addition of :disabled pseudo-class
@@ -90,7 +90,7 @@
90
90
  &[disabled],
91
91
  &:disabled {
92
92
  ~ .form-check-label {
93
- opacity: .5;
93
+ opacity: $form-check-label-disabled-opacity;
94
94
  }
95
95
  }
96
96
  }
@@ -105,14 +105,15 @@
105
105
  //
106
106
 
107
107
  .form-switch {
108
- padding-left: $form-switch-padding-left;
108
+ padding-left: $form-switch-padding-start;
109
109
 
110
110
  .form-check-input {
111
111
  width: $form-switch-width;
112
- margin-left: $form-switch-padding-left * -1;
112
+ margin-left: $form-switch-padding-start * -1;
113
113
  background-image: escape-svg($form-switch-bg-image);
114
114
  background-position: left center;
115
115
  @include border-radius($form-switch-border-radius);
116
+ @include transition($form-switch-transition);
116
117
 
117
118
  &:focus {
118
119
  background-image: escape-svg($form-switch-focus-bg-image);
@@ -122,7 +123,7 @@
122
123
  background-position: $form-switch-checked-bg-position;
123
124
 
124
125
  @if $enable-gradients {
125
- background-image: escape-svg($form-switch-checked-bg-image), var(--bs-gradient);
126
+ background-image: escape-svg($form-switch-checked-bg-image), var(--#{$variable-prefix}gradient);
126
127
  } @else {
127
128
  background-image: escape-svg($form-switch-checked-bg-image);
128
129
  }
@@ -132,11 +133,20 @@
132
133
 
133
134
  .form-check-inline {
134
135
  display: inline-block;
135
- margin-right: $form-check-inline-margin-right;
136
+ margin-right: $form-check-inline-margin-end;
136
137
  }
137
138
 
138
139
  .btn-check {
139
140
  position: absolute;
140
141
  clip: rect(0, 0, 0, 0);
141
142
  pointer-events: none;
143
+
144
+ &[disabled],
145
+ &:disabled {
146
+ + .btn {
147
+ pointer-events: none;
148
+ filter: none;
149
+ opacity: $form-check-btn-check-disabled-opacity;
150
+ }
151
+ }
142
152
  }
@@ -1,11 +1,10 @@
1
1
  //
2
- // Textual form controls
2
+ // General form controls (plus a few specific high-level interventions)
3
3
  //
4
4
 
5
5
  .form-control {
6
6
  display: block;
7
7
  width: 100%;
8
- min-height: $input-height;
9
8
  padding: $input-padding-y $input-padding-x;
10
9
  font-family: $input-font-family;
11
10
  @include font-size($input-font-size);
@@ -23,6 +22,14 @@
23
22
  @include box-shadow($input-box-shadow);
24
23
  @include transition($input-transition);
25
24
 
25
+ &[type="file"] {
26
+ overflow: hidden; // prevent pseudo element button overlap
27
+
28
+ &:not(:disabled):not(:read-only) {
29
+ cursor: pointer;
30
+ }
31
+ }
32
+
26
33
  // Customize the `:focus` state to imitate native WebKit styles.
27
34
  &:focus {
28
35
  color: $input-focus-color;
@@ -37,6 +44,14 @@
37
44
  }
38
45
  }
39
46
 
47
+ // Add some height to date inputs on iOS
48
+ // https://github.com/twbs/bootstrap/issues/23307
49
+ // TODO: we can remove this workaround once https://bugs.webkit.org/show_bug.cgi?id=198959 is resolved
50
+ &::-webkit-date-and-time-value {
51
+ // Multiply line-height by 1em if it has no unit
52
+ height: if(unit($input-line-height) == "", $input-line-height * 1em, $input-line-height);
53
+ }
54
+
40
55
  // Placeholder
41
56
  &::placeholder {
42
57
  color: $input-placeholder-color;
@@ -50,12 +65,51 @@
50
65
  // disabled if the fieldset is disabled. Due to implementation difficulty, we
51
66
  // don't honor that edge case; we style them as disabled anyway.
52
67
  &:disabled,
53
- &[readonly] {
68
+ &:read-only {
54
69
  background-color: $input-disabled-bg;
55
70
  border-color: $input-disabled-border-color;
56
71
  // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655.
57
72
  opacity: 1;
58
73
  }
74
+
75
+ // File input buttons theming
76
+ &::file-selector-button {
77
+ padding: $input-padding-y $input-padding-x;
78
+ margin: (-$input-padding-y) (-$input-padding-x);
79
+ margin-inline-end: $input-padding-x;
80
+ color: $form-file-button-color;
81
+ @include gradient-bg($form-file-button-bg);
82
+ pointer-events: none;
83
+ border-color: inherit;
84
+ border-style: solid;
85
+ border-width: 0;
86
+ border-inline-end-width: $input-border-width;
87
+ border-radius: 0; // stylelint-disable-line property-disallowed-list
88
+ @include transition($btn-transition);
89
+ }
90
+
91
+ &:hover:not(:disabled):not(:read-only)::file-selector-button {
92
+ background-color: $form-file-button-hover-bg;
93
+ }
94
+
95
+ &::-webkit-file-upload-button {
96
+ padding: $input-padding-y $input-padding-x;
97
+ margin: (-$input-padding-y) (-$input-padding-x);
98
+ margin-inline-end: $input-padding-x;
99
+ color: $form-file-button-color;
100
+ @include gradient-bg($form-file-button-bg);
101
+ pointer-events: none;
102
+ border-color: inherit;
103
+ border-style: solid;
104
+ border-width: 0;
105
+ border-inline-end-width: $input-border-width;
106
+ border-radius: 0; // stylelint-disable-line property-disallowed-list
107
+ @include transition($btn-transition);
108
+ }
109
+
110
+ &:hover:not(:disabled):not(:read-only)::-webkit-file-upload-button {
111
+ background-color: $form-file-button-hover-bg;
112
+ }
59
113
  }
60
114
 
61
115
  // Readonly controls as plain text
@@ -93,6 +147,18 @@
93
147
  padding: $input-padding-y-sm $input-padding-x-sm;
94
148
  @include font-size($input-font-size-sm);
95
149
  @include border-radius($input-border-radius-sm);
150
+
151
+ &::file-selector-button {
152
+ padding: $input-padding-y-sm $input-padding-x-sm;
153
+ margin: (-$input-padding-y-sm) (-$input-padding-x-sm);
154
+ margin-inline-end: $input-padding-x-sm;
155
+ }
156
+
157
+ &::-webkit-file-upload-button {
158
+ padding: $input-padding-y-sm $input-padding-x-sm;
159
+ margin: (-$input-padding-y-sm) (-$input-padding-x-sm);
160
+ margin-inline-end: $input-padding-x-sm;
161
+ }
96
162
  }
97
163
 
98
164
  .form-control-lg {
@@ -100,17 +166,54 @@
100
166
  padding: $input-padding-y-lg $input-padding-x-lg;
101
167
  @include font-size($input-font-size-lg);
102
168
  @include border-radius($input-border-radius-lg);
169
+
170
+ &::file-selector-button {
171
+ padding: $input-padding-y-lg $input-padding-x-lg;
172
+ margin: (-$input-padding-y-lg) (-$input-padding-x-lg);
173
+ margin-inline-end: $input-padding-x-lg;
174
+ }
175
+
176
+ &::-webkit-file-upload-button {
177
+ padding: $input-padding-y-lg $input-padding-x-lg;
178
+ margin: (-$input-padding-y-lg) (-$input-padding-x-lg);
179
+ margin-inline-end: $input-padding-x-lg;
180
+ }
181
+ }
182
+
183
+ // Make sure textareas don't shrink too much when resized
184
+ // https://github.com/twbs/bootstrap/pull/29124
185
+ // stylelint-disable selector-no-qualifying-type
186
+ textarea {
187
+ &.form-control {
188
+ min-height: $input-height;
189
+ }
190
+
191
+ &.form-control-sm {
192
+ min-height: $input-height-sm;
193
+ }
194
+
195
+ &.form-control-lg {
196
+ min-height: $input-height-lg;
197
+ }
103
198
  }
199
+ // stylelint-enable selector-no-qualifying-type
104
200
 
105
201
  .form-control-color {
106
202
  max-width: 3rem;
203
+ height: auto; // Override fixed browser height
107
204
  padding: $input-padding-y;
108
- }
109
205
 
110
- .form-control-color::-moz-color-swatch {
111
- @include border-radius($input-border-radius);
112
- }
206
+ &:not(:disabled):not(:read-only) {
207
+ cursor: pointer;
208
+ }
209
+
210
+ &::-moz-color-swatch {
211
+ height: if(unit($input-line-height) == "", $input-line-height * 1em, $input-line-height);
212
+ @include border-radius($input-border-radius);
213
+ }
113
214
 
114
- .form-control-color::-webkit-color-swatch {
115
- @include border-radius($input-border-radius);
215
+ &::-webkit-color-swatch {
216
+ height: if(unit($input-line-height) == "", $input-line-height * 1em, $input-line-height);
217
+ @include border-radius($input-border-radius);
218
+ }
116
219
  }
@@ -12,13 +12,12 @@
12
12
  appearance: none;
13
13
 
14
14
  &:focus {
15
- outline: none;
15
+ outline: 0;
16
16
 
17
17
  // Pseudo-elements must be split across multiple rulesets to have an effect.
18
18
  // No box-shadow() mixin for focus accessibility.
19
19
  &::-webkit-slider-thumb { box-shadow: $form-range-thumb-focus-box-shadow; }
20
20
  &::-moz-range-thumb { box-shadow: $form-range-thumb-focus-box-shadow; }
21
- &::-ms-thumb { box-shadow: $form-range-thumb-focus-box-shadow; }
22
21
  }
23
22
 
24
23
  &::-moz-focus-outer {
@@ -78,46 +77,6 @@
78
77
  @include box-shadow($form-range-track-box-shadow);
79
78
  }
80
79
 
81
- &::-ms-thumb {
82
- width: $form-range-thumb-width;
83
- height: $form-range-thumb-height;
84
- margin-top: 0; // Edge specific
85
- margin-right: $form-range-thumb-focus-box-shadow-width; // Workaround that overflowed box-shadow is hidden.
86
- margin-left: $form-range-thumb-focus-box-shadow-width; // Workaround that overflowed box-shadow is hidden.
87
- @include gradient-bg($form-range-thumb-bg);
88
- border: $form-range-thumb-border;
89
- @include border-radius($form-range-thumb-border-radius);
90
- @include box-shadow($form-range-thumb-box-shadow);
91
- @include transition($form-range-thumb-transition);
92
- appearance: none;
93
-
94
- &:active {
95
- @include gradient-bg($form-range-thumb-active-bg);
96
- }
97
- }
98
-
99
- &::-ms-track {
100
- width: $form-range-track-width;
101
- height: $form-range-track-height;
102
- color: transparent;
103
- cursor: $form-range-track-cursor;
104
- background-color: transparent;
105
- border-color: transparent;
106
- border-width: $form-range-thumb-height / 2;
107
- @include box-shadow($form-range-track-box-shadow);
108
- }
109
-
110
- &::-ms-fill-lower {
111
- background-color: $form-range-track-bg;
112
- @include border-radius($form-range-track-border-radius);
113
- }
114
-
115
- &::-ms-fill-upper {
116
- margin-right: 15px; // arbitrary?
117
- background-color: $form-range-track-bg;
118
- @include border-radius($form-range-track-border-radius);
119
- }
120
-
121
80
  &:disabled {
122
81
  pointer-events: none;
123
82
 
@@ -128,9 +87,5 @@
128
87
  &::-moz-range-thumb {
129
88
  background-color: $form-range-thumb-disabled-bg;
130
89
  }
131
-
132
- &::-ms-thumb {
133
- background-color: $form-range-thumb-disabled-bg;
134
- }
135
90
  }
136
91
  }
@@ -6,14 +6,12 @@
6
6
  .form-select {
7
7
  display: block;
8
8
  width: 100%;
9
- height: $form-select-height;
10
- padding: $form-select-padding-y ($form-select-padding-x + $form-select-indicator-padding) $form-select-padding-y $form-select-padding-x;
9
+ padding: $form-select-padding-y $form-select-indicator-padding $form-select-padding-y $form-select-padding-x;
11
10
  font-family: $form-select-font-family;
12
11
  @include font-size($form-select-font-size);
13
12
  font-weight: $form-select-font-weight;
14
13
  line-height: $form-select-line-height;
15
14
  color: $form-select-color;
16
- vertical-align: middle;
17
15
  background-color: $form-select-bg;
18
16
  background-image: escape-svg($form-select-indicator);
19
17
  background-repeat: no-repeat;
@@ -33,21 +31,10 @@
33
31
  // Avoid using mixin so we can pass custom focus shadow properly
34
32
  box-shadow: $form-select-focus-box-shadow;
35
33
  }
36
-
37
- &::-ms-value {
38
- // For visual consistency with other platforms/browsers,
39
- // suppress the default white text on blue background highlight given to
40
- // the selected option text when the (still closed) <select> receives focus
41
- // in Edge.
42
- // See https://github.com/twbs/bootstrap/issues/19398.
43
- color: $input-color;
44
- background-color: $input-bg;
45
- }
46
34
  }
47
35
 
48
36
  &[multiple],
49
37
  &[size]:not([size="1"]) {
50
- height: auto;
51
38
  padding-right: $form-select-padding-x;
52
39
  background-image: none;
53
40
  }
@@ -66,7 +53,6 @@
66
53
  }
67
54
 
68
55
  .form-select-sm {
69
- height: $form-select-height-sm;
70
56
  padding-top: $form-select-padding-y-sm;
71
57
  padding-bottom: $form-select-padding-y-sm;
72
58
  padding-left: $form-select-padding-x-sm;
@@ -74,7 +60,6 @@
74
60
  }
75
61
 
76
62
  .form-select-lg {
77
- height: $form-select-height-lg;
78
63
  padding-top: $form-select-padding-y-lg;
79
64
  padding-bottom: $form-select-padding-y-lg;
80
65
  padding-left: $form-select-padding-x-lg;