bootstrap-scss 4.5.3 → 4.6.2

Sign up to get free protection for your applications and to get access to all the features.
package/LICENSE CHANGED
@@ -1,22 +1,22 @@
1
- The MIT License (MIT)
2
-
3
- Copyright (c) 2011-2020 Twitter, Inc.
4
- Copyright (c) 2011-2020 The Bootstrap Authors
5
-
6
- Permission is hereby granted, free of charge, to any person obtaining a copy
7
- of this software and associated documentation files (the "Software"), to deal
8
- in the Software without restriction, including without limitation the rights
9
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10
- copies of the Software, and to permit persons to whom the Software is
11
- furnished to do so, subject to the following conditions:
12
-
13
- The above copyright notice and this permission notice shall be included in
14
- all copies or substantial portions of the Software.
15
-
16
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22
- THE SOFTWARE.
1
+ The MIT License (MIT)
2
+
3
+ Copyright (c) 2011-2022 Twitter, Inc.
4
+ Copyright (c) 2011-2022 The Bootstrap Authors
5
+
6
+ Permission is hereby granted, free of charge, to any person obtaining a copy
7
+ of this software and associated documentation files (the "Software"), to deal
8
+ in the Software without restriction, including without limitation the rights
9
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10
+ copies of the Software, and to permit persons to whom the Software is
11
+ furnished to do so, subject to the following conditions:
12
+
13
+ The above copyright notice and this permission notice shall be included in
14
+ all copies or substantial portions of the Software.
15
+
16
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22
+ THE SOFTWARE.
package/README.md CHANGED
@@ -1,83 +1,46 @@
1
- # Bootstrap SCSS
2
-
3
- > Bootstrap's SCSS files (only)
4
-
5
- <p align="center">
6
- <a href="https://getbootstrap.com/">
7
- <img src="https://getbootstrap.com/docs/4.5/assets/brand/bootstrap-solid.svg" alt="Bootstrap logo" width="72" height="72">
8
- </a>
9
- </p>
10
-
11
- <h3 align="center">Bootstrap</h3>
12
-
13
- <p align="center">
14
- Sleek, intuitive, and powerful front-end framework for faster and easier web development.
15
- <br>
16
- <a href="https://getbootstrap.com/docs/4.5/"><strong>Explore Bootstrap docs »</strong></a>
17
- <br>
18
- <br>
19
- <a href="https://github.com/twbs/bootstrap/issues/new?template=bug.md">Report bug</a>
20
- ·
21
- <a href="https://github.com/twbs/bootstrap/issues/new?template=feature.md&labels=feature">Request feature</a>
22
- ·
23
- <a href="https://themes.getbootstrap.com/">Themes</a>
24
- ·
25
- <a href="https://blog.getbootstrap.com/">Blog</a>
26
- </p>
27
-
28
- <br>
29
-
30
- ## Table of contents
31
-
32
- - [Quick start](#quick-start)
33
- - [Status](#status)
34
- - [What's included](#whats-included)
35
- - [Documentation](#documentation)
36
- - [Versioning](#versioning)
37
- - [Copyright and license](#copyright-and-license)
38
-
39
- ## Quick start
40
-
41
- Several quick start options are available:
42
-
43
- - Install with [npm](https://www.npmjs.com/): `npm install bootstrap-scss@4.5.3`
44
- - Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap-scss@4.5.3`
45
-
46
- Read the [Getting started page](https://getbootstrap.com/docs/4.5/getting-started/introduction/) for information on the framework contents, templates and examples, and more.
47
-
48
- ## Status
49
-
50
- [![npm version](https://img.shields.io/npm/v/bootstrap-scss.svg)](https://www.npmjs.com/package/bootstrap-scss)
51
-
52
- ## What's included
53
-
54
- Within this package you'll find the following directories and files, logically grouping common assets and providing only SCSS variations. You'll see something like this:
55
-
56
- ```
57
- bootstrap-scss/
58
- ├── bootstrap.scss
59
- ├── bootstrap-grid.scss
60
- ├── bootstrap-reboot.scss
61
- ├── mixins/
62
- │ └─ ...
63
- └── utilities/
64
- └─ ...
65
- └── vendor/
66
- └─ ...
67
- ```
68
-
69
- ## Documentation
70
-
71
- [Bootstrap's official documentation](https://getbootstrap.com/) powered by [Algolia's DocSearch](https://community.algolia.com/docsearch/).
72
-
73
- ## Versioning
74
-
75
- For simplicity, this project will use the same version numbers as Bootstrap.
76
-
77
- ## Changelog
78
-
79
- https://blog.getbootstrap.com/2020/10/13/bootstrap-4-5-3/
80
-
81
- ## Copyright and license
82
-
83
- Code and documentation copyright 2011-2020 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors) and [Twitter, Inc.](https://twitter.com) Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/master/LICENSE).
1
+ # Bootstrap SCSS [![npm version](https://img.shields.io/npm/v/bootstrap-scss.svg)](https://www.npmjs.com/package/bootstrap-scss)
2
+
3
+ > Bootstrap's SCSS files (only)
4
+
5
+ ## Table of contents
6
+
7
+ - [Quick start](#quick-start)
8
+ - [What's included](#whats-included)
9
+ - [Versioning](#versioning)
10
+ - [License](#license)
11
+
12
+ ## Quick start
13
+
14
+ Several quick start options are available:
15
+
16
+ - Install with [npm](https://www.npmjs.com/): `npm install bootstrap-scss@4.6.2`
17
+ - Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap-scss@4.6.2`
18
+
19
+ Read the [Getting started page](https://getbootstrap.com/docs/4.6/getting-started/introduction/) for information on the
20
+ framework contents, templates and examples, and more.
21
+
22
+ ## What's included
23
+
24
+ Within this package you'll find the following directories and files, logically grouping common assets and providing only
25
+ SCSS variations. You'll see something like this:
26
+
27
+ ```
28
+ bootstrap-scss/
29
+ ├── bootstrap.scss
30
+ ├── bootstrap-grid.scss
31
+ ├── bootstrap-reboot.scss
32
+ ├── mixins/
33
+ │ └─ ...
34
+ └── utilities/
35
+ └─ ...
36
+ └── vendor/
37
+ └─ ...
38
+ ```
39
+
40
+ ## Versioning
41
+
42
+ For simplicity, this project will use the same version numbers as Bootstrap.
43
+
44
+ ## License
45
+
46
+ Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/main/LICENSE).
package/_breadcrumb.scss CHANGED
@@ -10,14 +10,12 @@
10
10
  }
11
11
 
12
12
  .breadcrumb-item {
13
- display: flex;
14
-
15
13
  // The separator between breadcrumbs (by default, a forward-slash: "/")
16
14
  + .breadcrumb-item {
17
15
  padding-left: $breadcrumb-item-padding;
18
16
 
19
17
  &::before {
20
- display: inline-block; // Suppress underlining of the separator in modern browsers
18
+ float: left; // Suppress inline spacings and underlining of the separator
21
19
  padding-right: $breadcrumb-item-padding;
22
20
  color: $breadcrumb-divider-color;
23
21
  content: escape-svg($breadcrumb-divider);
package/_card.scss CHANGED
@@ -58,7 +58,7 @@
58
58
  }
59
59
 
60
60
  .card-subtitle {
61
- margin-top: -$card-spacer-y / 2;
61
+ margin-top: -$card-spacer-y * .5;
62
62
  margin-bottom: 0;
63
63
  }
64
64
 
@@ -109,15 +109,15 @@
109
109
  //
110
110
 
111
111
  .card-header-tabs {
112
- margin-right: -$card-spacer-x / 2;
112
+ margin-right: -$card-spacer-x * .5;
113
113
  margin-bottom: -$card-spacer-y;
114
- margin-left: -$card-spacer-x / 2;
114
+ margin-left: -$card-spacer-x * .5;
115
115
  border-bottom: 0;
116
116
  }
117
117
 
118
118
  .card-header-pills {
119
- margin-right: -$card-spacer-x / 2;
120
- margin-left: -$card-spacer-x / 2;
119
+ margin-right: -$card-spacer-x * .5;
120
+ margin-left: -$card-spacer-x * .5;
121
121
  }
122
122
 
123
123
  // Card image
package/_carousel.scss CHANGED
@@ -95,8 +95,11 @@
95
95
  align-items: center; // 2. vertically center contents
96
96
  justify-content: center; // 3. horizontally center contents
97
97
  width: $carousel-control-width;
98
+ padding: 0;
98
99
  color: $carousel-control-color;
99
100
  text-align: center;
101
+ background: none;
102
+ border: 0;
100
103
  opacity: $carousel-control-opacity;
101
104
  @include transition($carousel-control-transition);
102
105
 
@@ -127,7 +130,7 @@
127
130
  display: inline-block;
128
131
  width: $carousel-control-icon-width;
129
132
  height: $carousel-control-icon-width;
130
- background: no-repeat 50% / 100% 100%;
133
+ background: 50% / 100% 100% no-repeat;
131
134
  }
132
135
  .carousel-control-prev-icon {
133
136
  background-image: escape-svg($carousel-control-prev-icon-bg);
@@ -186,9 +189,9 @@
186
189
 
187
190
  .carousel-caption {
188
191
  position: absolute;
189
- right: (100% - $carousel-caption-width) / 2;
192
+ right: (100% - $carousel-caption-width) * .5;
190
193
  bottom: 20px;
191
- left: (100% - $carousel-caption-width) / 2;
194
+ left: (100% - $carousel-caption-width) * .5;
192
195
  z-index: 10;
193
196
  padding-top: 20px;
194
197
  padding-bottom: 20px;
@@ -13,7 +13,7 @@
13
13
  display: block;
14
14
  min-height: $font-size-base * $line-height-base;
15
15
  padding-left: $custom-control-gutter + $custom-control-indicator-size;
16
- color-adjust: exact; // Keep themed appearance for print
16
+ print-color-adjust: exact; // Keep themed appearance for print
17
17
  }
18
18
 
19
19
  .custom-control-inline {
@@ -26,7 +26,7 @@
26
26
  left: 0;
27
27
  z-index: -1; // Put the input behind the label so it doesn't overlay text
28
28
  width: $custom-control-indicator-size;
29
- height: ($font-size-base * $line-height-base + $custom-control-indicator-size) / 2;
29
+ height: ($font-size-base * $line-height-base + $custom-control-indicator-size) * .5;
30
30
  opacity: 0;
31
31
 
32
32
  &:checked ~ .custom-control-label::before {
@@ -83,7 +83,7 @@
83
83
  // Background-color and (when enabled) gradient
84
84
  &::before {
85
85
  position: absolute;
86
- top: ($font-size-base * $line-height-base - $custom-control-indicator-size) / 2;
86
+ top: ($font-size-base * $line-height-base - $custom-control-indicator-size) * .5;
87
87
  left: -($custom-control-gutter + $custom-control-indicator-size);
88
88
  display: block;
89
89
  width: $custom-control-indicator-size;
@@ -91,20 +91,20 @@
91
91
  pointer-events: none;
92
92
  content: "";
93
93
  background-color: $custom-control-indicator-bg;
94
- border: $custom-control-indicator-border-color solid $custom-control-indicator-border-width;
94
+ border: $custom-control-indicator-border-width solid $custom-control-indicator-border-color;
95
95
  @include box-shadow($custom-control-indicator-box-shadow);
96
96
  }
97
97
 
98
98
  // Foreground (icon)
99
99
  &::after {
100
100
  position: absolute;
101
- top: ($font-size-base * $line-height-base - $custom-control-indicator-size) / 2;
101
+ top: ($font-size-base * $line-height-base - $custom-control-indicator-size) * .5;
102
102
  left: -($custom-control-gutter + $custom-control-indicator-size);
103
103
  display: block;
104
104
  width: $custom-control-indicator-size;
105
105
  height: $custom-control-indicator-size;
106
106
  content: "";
107
- background: no-repeat 50% / #{$custom-control-indicator-bg-size};
107
+ background: 50% / #{$custom-control-indicator-bg-size} no-repeat;
108
108
  }
109
109
  }
110
110
 
@@ -186,7 +186,7 @@
186
186
  }
187
187
 
188
188
  &::after {
189
- top: add(($font-size-base * $line-height-base - $custom-control-indicator-size) / 2, $custom-control-indicator-border-width * 2);
189
+ top: add(($font-size-base * $line-height-base - $custom-control-indicator-size) * .5, $custom-control-indicator-border-width * 2);
190
190
  left: add(-($custom-switch-width + $custom-control-gutter), $custom-control-indicator-border-width * 2);
191
191
  width: $custom-switch-indicator-size;
192
192
  height: $custom-switch-indicator-size;
@@ -315,6 +315,7 @@
315
315
  width: 100%;
316
316
  height: $custom-file-height;
317
317
  margin: 0;
318
+ overflow: hidden;
318
319
  opacity: 0;
319
320
 
320
321
  &:focus ~ .custom-file-label {
@@ -347,6 +348,7 @@
347
348
  z-index: 1;
348
349
  height: $custom-file-height;
349
350
  padding: $custom-file-padding-y $custom-file-padding-x;
351
+ overflow: hidden;
350
352
  font-family: $custom-file-font-family;
351
353
  font-weight: $custom-file-font-weight;
352
354
  line-height: $custom-file-line-height;
@@ -388,7 +390,7 @@
388
390
  appearance: none;
389
391
 
390
392
  &:focus {
391
- outline: none;
393
+ outline: 0;
392
394
 
393
395
  // Pseudo-elements must be split across multiple rulesets to have an effect.
394
396
  // No box-shadow() mixin for focus accessibility.
@@ -404,7 +406,7 @@
404
406
  &::-webkit-slider-thumb {
405
407
  width: $custom-range-thumb-width;
406
408
  height: $custom-range-thumb-height;
407
- margin-top: ($custom-range-track-height - $custom-range-thumb-height) / 2; // Webkit specific
409
+ margin-top: ($custom-range-track-height - $custom-range-thumb-height) * .5; // Webkit specific
408
410
  @include gradient-bg($custom-range-thumb-bg);
409
411
  border: $custom-range-thumb-border;
410
412
  @include border-radius($custom-range-thumb-border-radius);
@@ -479,7 +481,7 @@
479
481
  cursor: $custom-range-track-cursor;
480
482
  background-color: transparent;
481
483
  border-color: transparent;
482
- border-width: $custom-range-thumb-height / 2;
484
+ border-width: $custom-range-thumb-height * .5;
483
485
  @include box-shadow($custom-range-track-box-shadow);
484
486
  }
485
487
 
package/_dropdown.scss CHANGED
@@ -100,7 +100,7 @@
100
100
  }
101
101
  }
102
102
 
103
- // When enabled Popper.js, reset basic dropdown position
103
+ // When Popper is enabled, reset the basic dropdown position
104
104
  // stylelint-disable-next-line no-duplicate-selectors
105
105
  .dropdown-menu {
106
106
  &[x-placement^="top"],
package/_forms.scss CHANGED
@@ -30,12 +30,6 @@
30
30
  border: 0;
31
31
  }
32
32
 
33
- // Remove select outline from select box in FF
34
- &:-moz-focusring {
35
- color: transparent;
36
- text-shadow: 0 0 0 $input-color;
37
- }
38
-
39
33
  // Customize the `:focus` state to imitate native WebKit styles.
40
34
  @include form-control-focus($ignore-warning: true);
41
35
 
@@ -69,6 +63,12 @@ input[type="month"] {
69
63
  }
70
64
 
71
65
  select.form-control {
66
+ // Remove select outline from select box in FF
67
+ &:-moz-focusring {
68
+ color: transparent;
69
+ text-shadow: 0 0 0 $input-color;
70
+ }
71
+
72
72
  &:focus::-ms-value {
73
73
  // Suppress the nested default white text on blue background highlight given to
74
74
  // the selected option text when the (still closed) <select> receives focus
@@ -199,13 +199,13 @@ textarea.form-control {
199
199
  .form-row {
200
200
  display: flex;
201
201
  flex-wrap: wrap;
202
- margin-right: -$form-grid-gutter-width / 2;
203
- margin-left: -$form-grid-gutter-width / 2;
202
+ margin-right: -$form-grid-gutter-width * .5;
203
+ margin-left: -$form-grid-gutter-width * .5;
204
204
 
205
205
  > .col,
206
206
  > [class*="col-"] {
207
- padding-right: $form-grid-gutter-width / 2;
208
- padding-left: $form-grid-gutter-width / 2;
207
+ padding-right: $form-grid-gutter-width * .5;
208
+ padding-left: $form-grid-gutter-width * .5;
209
209
  }
210
210
  }
211
211
 
package/_functions.scss CHANGED
@@ -75,7 +75,7 @@
75
75
  $g: green($color);
76
76
  $b: blue($color);
77
77
 
78
- $yiq: (($r * 299) + ($g * 587) + ($b * 114)) / 1000;
78
+ $yiq: (($r * 299) + ($g * 587) + ($b * 114)) * .001;
79
79
 
80
80
  @if ($yiq >= $yiq-contrasted-threshold) {
81
81
  @return $dark;
@@ -140,5 +140,51 @@
140
140
  @return $value1 - $value2;
141
141
  }
142
142
 
143
+ @if type-of($value2) != number {
144
+ $value2: unquote("(") + $value2 + unquote(")");
145
+ }
146
+
143
147
  @return if($return-calc == true, calc(#{$value1} - #{$value2}), $value1 + unquote(" - ") + $value2);
144
148
  }
149
+
150
+ @function divide($dividend, $divisor, $precision: 10) {
151
+ $sign: if($dividend > 0 and $divisor > 0 or $dividend < 0 and $divisor < 0, 1, -1);
152
+ $dividend: abs($dividend);
153
+ $divisor: abs($divisor);
154
+ @if $dividend == 0 {
155
+ @return 0;
156
+ }
157
+ @if $divisor == 0 {
158
+ @error "Cannot divide by 0";
159
+ }
160
+ $remainder: $dividend;
161
+ $result: 0;
162
+ $factor: 10;
163
+ @while ($remainder > 0 and $precision >= 0) {
164
+ $quotient: 0;
165
+ @while ($remainder >= $divisor) {
166
+ $remainder: $remainder - $divisor;
167
+ $quotient: $quotient + 1;
168
+ }
169
+ $result: $result * 10 + $quotient;
170
+ $factor: $factor * .1;
171
+ $remainder: $remainder * 10;
172
+ $precision: $precision - 1;
173
+ @if ($precision < 0 and $remainder >= $divisor * 5) {
174
+ $result: $result + 1;
175
+ }
176
+ }
177
+ $result: $result * $factor * $sign;
178
+ $dividend-unit: unit($dividend);
179
+ $divisor-unit: unit($divisor);
180
+ $unit-map: (
181
+ "px": 1px,
182
+ "rem": 1rem,
183
+ "em": 1em,
184
+ "%": 1%
185
+ );
186
+ @if ($dividend-unit != $divisor-unit and map-has-key($unit-map, $dividend-unit)) {
187
+ $result: $result * map-get($unit-map, $dividend-unit);
188
+ }
189
+ @return $result;
190
+ }
package/_images.scss CHANGED
@@ -32,7 +32,7 @@
32
32
  }
33
33
 
34
34
  .figure-img {
35
- margin-bottom: $spacer / 2;
35
+ margin-bottom: $spacer * .5;
36
36
  line-height: 1;
37
37
  }
38
38
 
package/_input-group.scss CHANGED
@@ -42,7 +42,6 @@
42
42
 
43
43
  > .form-control,
44
44
  > .custom-select {
45
- &:not(:last-child) { @include border-right-radius(0); }
46
45
  &:not(:first-child) { @include border-left-radius(0); }
47
46
  }
48
47
 
@@ -56,6 +55,24 @@
56
55
  &:not(:last-child) .custom-file-label::after { @include border-right-radius(0); }
57
56
  &:not(:first-child) .custom-file-label { @include border-left-radius(0); }
58
57
  }
58
+
59
+ &:not(.has-validation) {
60
+ > .form-control:not(:last-child),
61
+ > .custom-select:not(:last-child),
62
+ > .custom-file:not(:last-child) .custom-file-label,
63
+ > .custom-file:not(:last-child) .custom-file-label::after {
64
+ @include border-right-radius(0);
65
+ }
66
+ }
67
+
68
+ &.has-validation {
69
+ > .form-control:nth-last-child(n + 3),
70
+ > .custom-select:nth-last-child(n + 3),
71
+ > .custom-file:nth-last-child(n + 3) .custom-file-label,
72
+ > .custom-file:nth-last-child(n + 3) .custom-file-label::after {
73
+ @include border-right-radius(0);
74
+ }
75
+ }
59
76
  }
60
77
 
61
78
 
@@ -175,8 +192,10 @@
175
192
 
176
193
  .input-group > .input-group-prepend > .btn,
177
194
  .input-group > .input-group-prepend > .input-group-text,
178
- .input-group > .input-group-append:not(:last-child) > .btn,
179
- .input-group > .input-group-append:not(:last-child) > .input-group-text,
195
+ .input-group:not(.has-validation) > .input-group-append:not(:last-child) > .btn,
196
+ .input-group:not(.has-validation) > .input-group-append:not(:last-child) > .input-group-text,
197
+ .input-group.has-validation > .input-group-append:nth-last-child(n + 3) > .btn,
198
+ .input-group.has-validation > .input-group-append:nth-last-child(n + 3) > .input-group-text,
180
199
  .input-group > .input-group-append:last-child > .btn:not(:last-child):not(.dropdown-toggle),
181
200
  .input-group > .input-group-append:last-child > .input-group-text:not(:last-child) {
182
201
  @include border-right-radius(0);
package/_jumbotron.scss CHANGED
@@ -1,5 +1,5 @@
1
1
  .jumbotron {
2
- padding: $jumbotron-padding ($jumbotron-padding / 2);
2
+ padding: $jumbotron-padding ($jumbotron-padding * .5);
3
3
  margin-bottom: $jumbotron-padding;
4
4
  color: $jumbotron-color;
5
5
  background-color: $jumbotron-bg;
package/_modal.scss CHANGED
@@ -175,7 +175,7 @@
175
175
  flex-wrap: wrap;
176
176
  align-items: center; // vertically center
177
177
  justify-content: flex-end; // Right align buttons with flex property because text-align doesn't work on flex items
178
- padding: $modal-inner-padding - $modal-footer-margin-between / 2;
178
+ padding: $modal-inner-padding - $modal-footer-margin-between * .5;
179
179
  border-top: $modal-footer-border-width solid $modal-footer-border-color;
180
180
  @include border-bottom-radius($modal-content-inner-border-radius);
181
181
 
@@ -183,7 +183,7 @@
183
183
  // This solution is far from ideal because of the universal selector usage,
184
184
  // but is needed to fix https://github.com/twbs/bootstrap/issues/24800
185
185
  > * {
186
- margin: $modal-footer-margin-between / 2;
186
+ margin: $modal-footer-margin-between * .5;
187
187
  }
188
188
  }
189
189
 
package/_nav.scss CHANGED
@@ -35,15 +35,15 @@
35
35
  .nav-tabs {
36
36
  border-bottom: $nav-tabs-border-width solid $nav-tabs-border-color;
37
37
 
38
- .nav-item {
39
- margin-bottom: -$nav-tabs-border-width;
40
- }
41
-
42
38
  .nav-link {
39
+ margin-bottom: -$nav-tabs-border-width;
40
+ background-color: transparent;
43
41
  border: $nav-tabs-border-width solid transparent;
44
42
  @include border-top-radius($nav-tabs-border-radius);
45
43
 
46
44
  @include hover-focus() {
45
+ // Prevents active .nav-link tab overlapping focus outline of previous/next .nav-link
46
+ isolation: isolate;
47
47
  border-color: $nav-tabs-link-hover-border-color;
48
48
  }
49
49
 
@@ -76,6 +76,8 @@
76
76
 
77
77
  .nav-pills {
78
78
  .nav-link {
79
+ background: none;
80
+ border: 0;
79
81
  @include border-radius($nav-pills-border-radius);
80
82
  }
81
83
 
package/_navbar.scss CHANGED
@@ -136,8 +136,12 @@
136
136
  height: 1.5em;
137
137
  vertical-align: middle;
138
138
  content: "";
139
- background: no-repeat center center;
140
- background-size: 100% 100%;
139
+ background: 50% / 100% 100% no-repeat;
140
+ }
141
+
142
+ .navbar-nav-scroll {
143
+ max-height: $navbar-nav-scroll-max-height;
144
+ overflow-y: auto;
141
145
  }
142
146
 
143
147
  // Generate series of `.navbar-expand-*` responsive classes for configuring
@@ -199,6 +203,10 @@
199
203
  }
200
204
  }
201
205
 
206
+ .navbar-nav-scroll {
207
+ overflow: visible;
208
+ }
209
+
202
210
  .navbar-collapse {
203
211
  display: flex !important; // stylelint-disable-line declaration-no-important
204
212
 
package/_pagination.scss CHANGED
@@ -66,9 +66,9 @@
66
66
  //
67
67
 
68
68
  .pagination-lg {
69
- @include pagination-size($pagination-padding-y-lg, $pagination-padding-x-lg, $font-size-lg, $line-height-lg, $border-radius-lg);
69
+ @include pagination-size($pagination-padding-y-lg, $pagination-padding-x-lg, $font-size-lg, $line-height-lg, $pagination-border-radius-lg);
70
70
  }
71
71
 
72
72
  .pagination-sm {
73
- @include pagination-size($pagination-padding-y-sm, $pagination-padding-x-sm, $font-size-sm, $line-height-sm, $border-radius-sm);
73
+ @include pagination-size($pagination-padding-y-sm, $pagination-padding-x-sm, $font-size-sm, $line-height-sm, $pagination-border-radius-sm);
74
74
  }