@clayui/css 3.65.2 → 3.70.1

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 (33) hide show
  1. package/lib/css/atlas.css +64 -49
  2. package/lib/css/atlas.css.map +1 -1
  3. package/lib/css/base.css +31 -15
  4. package/lib/css/base.css.map +1 -1
  5. package/lib/css/cadmin.css +81 -56
  6. package/lib/css/cadmin.css.map +1 -1
  7. package/lib/images/icons/icons.svg +1 -1
  8. package/package.json +2 -2
  9. package/src/scss/_license-text.scss +1 -1
  10. package/src/scss/atlas/variables/_buttons.scss +26 -26
  11. package/src/scss/atlas/variables/_custom-forms.scss +2 -2
  12. package/src/scss/atlas/variables/_dropdowns.scss +2 -2
  13. package/src/scss/atlas/variables/_forms.scss +6 -2
  14. package/src/scss/atlas/variables/_menubar.scss +26 -20
  15. package/src/scss/atlas/variables/_utilities.scss +1 -1
  16. package/src/scss/cadmin/components/_buttons.scss +14 -22
  17. package/src/scss/cadmin/components/_dropdowns.scss +22 -14
  18. package/src/scss/cadmin/variables/_buttons.scss +6 -0
  19. package/src/scss/cadmin/variables/_dropdowns.scss +10 -10
  20. package/src/scss/cadmin/variables/_forms.scss +7 -3
  21. package/src/scss/cadmin/variables/_menubar.scss +26 -28
  22. package/src/scss/cadmin/variables/_modals.scss +3 -2
  23. package/src/scss/cadmin/variables/_popovers.scss +3 -2
  24. package/src/scss/components/_buttons.scss +14 -22
  25. package/src/scss/components/_dropdowns.scss +20 -12
  26. package/src/scss/mixins/_buttons.scss +16 -0
  27. package/src/scss/mixins/_globals.scss +1 -1
  28. package/src/scss/mixins/_utilities.scss +1 -1
  29. package/src/scss/variables/_dropdowns.scss +4 -4
  30. package/src/scss/variables/_forms.scss +3 -1
  31. package/src/scss/variables/_menubar.scss +8 -8
  32. package/src/scss/variables/_modals.scss +3 -2
  33. package/src/scss/variables/_popovers.scss +3 -1
@@ -248,18 +248,22 @@
248
248
  .dropdown-subheader,
249
249
  .dropdown-caption,
250
250
  .dropdown-item {
251
- padding-left: $cadmin-dropdown-item-padding-x +
252
- $cadmin-dropdown-item-indicator-size +
253
- $cadmin-dropdown-item-indicator-spacer-x;
251
+ padding-left: calc(
252
+ #{$cadmin-dropdown-item-padding-x} + #{$cadmin-dropdown-item-indicator-size} +
253
+ #{$cadmin-dropdown-item-indicator-spacer-x}
254
+ );
254
255
  }
255
256
 
256
257
  @if ($cadmin-enable-c-inner) {
257
258
  .dropdown-item {
258
259
  .c-inner {
259
- margin-left: math-sign(
260
- $cadmin-dropdown-item-padding-x +
261
- $cadmin-dropdown-item-indicator-size +
262
- $cadmin-dropdown-item-indicator-spacer-x
260
+ margin-left: calc(
261
+ (
262
+ #{$cadmin-dropdown-item-padding-x} +
263
+ #{$cadmin-dropdown-item-indicator-size} +
264
+ #{$cadmin-dropdown-item-indicator-spacer-x}
265
+ ) *
266
+ -1
263
267
  );
264
268
  }
265
269
  }
@@ -291,16 +295,20 @@
291
295
  }
292
296
 
293
297
  .dropdown-item {
294
- padding-right: $cadmin-dropdown-item-padding-x +
295
- $cadmin-dropdown-item-indicator-size +
296
- $cadmin-dropdown-item-indicator-spacer-x;
298
+ padding-right: calc(
299
+ #{$cadmin-dropdown-item-padding-x} + #{$cadmin-dropdown-item-indicator-size} +
300
+ #{$cadmin-dropdown-item-indicator-spacer-x}
301
+ );
297
302
 
298
303
  @if ($cadmin-enable-c-inner) {
299
304
  .c-inner {
300
- margin-right: math-sign(
301
- $cadmin-dropdown-item-padding-x +
302
- $cadmin-dropdown-item-indicator-size +
303
- $cadmin-dropdown-item-indicator-spacer-x
305
+ margin-right: calc(
306
+ (
307
+ #{$cadmin-dropdown-item-padding-x} +
308
+ #{$cadmin-dropdown-item-indicator-size} +
309
+ #{$cadmin-dropdown-item-indicator-spacer-x}
310
+ ) *
311
+ -1
304
312
  );
305
313
  }
306
314
  }
@@ -94,6 +94,9 @@ $cadmin-btn: map-deep-merge(
94
94
  ),
95
95
  inline-item: (
96
96
  font-size: $cadmin-btn-inline-item-font-size,
97
+ lexicon-icon: (
98
+ margin-top: 0,
99
+ ),
97
100
  ),
98
101
  btn-section: (
99
102
  display: block,
@@ -228,6 +231,9 @@ $cadmin-btn-monospaced: map-deep-merge(
228
231
  height: $cadmin-btn-monospaced-size-mobile,
229
232
  width: $cadmin-btn-monospaced-size-mobile,
230
233
  ),
234
+ lexicon-icon: (
235
+ margin-top: 0,
236
+ ),
231
237
  c-inner: (
232
238
  align-items: center,
233
239
  display: flex,
@@ -73,8 +73,8 @@ $cadmin-dropdown-menu: map-deep-merge(
73
73
 
74
74
  // .dropdown-item
75
75
 
76
- $cadmin-dropdown-item-padding-x: 20px !default; // 20px
77
- $cadmin-dropdown-item-padding-y: 8px !default; // 8px
76
+ $cadmin-dropdown-item-padding-x: 16px !default;
77
+ $cadmin-dropdown-item-padding-y: 8px !default;
78
78
 
79
79
  $cadmin-dropdown-item-disabled-cursor: $cadmin-disabled-cursor !default;
80
80
 
@@ -163,20 +163,20 @@ $cadmin-dropdown-item-base: map-deep-merge(
163
163
  line-height: $cadmin-dropdown-font-size * $cadmin-line-height-base,
164
164
  ),
165
165
  '&.autofit-row': (
166
- padding-left: 1rem,
167
- padding-right: 1rem,
166
+ padding-left: calc(#{$cadmin-dropdown-item-padding-x} - 4px),
167
+ padding-right: calc(#{$cadmin-dropdown-item-padding-x} - 4px),
168
168
  autofit-col: (
169
- padding-left: 0.25rem,
170
- padding-right: 0.25rem,
169
+ padding-left: 4px,
170
+ padding-right: 4px,
171
171
  ),
172
172
  ),
173
173
  autofit-row: (
174
- margin-left: 0.25rem,
175
- margin-right: 0.25rem,
174
+ margin-left: -4px,
175
+ margin-right: -4px,
176
176
  width: auto,
177
177
  autofit-col: (
178
- padding-left: 0.25rem,
179
- padding-right: 0.25rem,
178
+ padding-left: 4px,
179
+ padding-right: 4px,
180
180
  ),
181
181
  ),
182
182
  ),
@@ -118,12 +118,15 @@ $cadmin-input-plaintext-color: $cadmin-body-color !default;
118
118
 
119
119
  // Deprecated
120
120
 
121
- $cadmin-input-height-border: $cadmin-input-border-bottom-width +
122
- $cadmin-input-border-top-width !default;
121
+ $cadmin-input-height-border: calc(
122
+ #{$cadmin-input-border-bottom-width} + #{$cadmin-input-border-top-width}
123
+ ) !default;
123
124
 
124
125
  // Deprecated
125
126
 
126
- $cadmin-input-height-inner: $cadmin-input-height - $cadmin-input-height-border !default;
127
+ $cadmin-input-height-inner: calc(
128
+ #{$cadmin-input-height} - #{$cadmin-input-border-bottom-width} - #{$cadmin-input-border-top-width}
129
+ ) !default;
127
130
 
128
131
  // Deprecated
129
132
 
@@ -194,6 +197,7 @@ $cadmin-input-label: map-deep-merge(
194
197
  font-weight: $cadmin-input-label-font-weight,
195
198
  margin-bottom: $cadmin-input-label-margin-bottom,
196
199
  max-width: 100%,
200
+ position: static,
197
201
  word-wrap: break-word,
198
202
  mobile: (
199
203
  font-size: $cadmin-input-label-font-size-mobile,
@@ -73,11 +73,11 @@ $cadmin-menubar-vertical-transparent-md: map-deep-merge(
73
73
  box-shadow 0.15s ease-in-out},
74
74
  color: $cadmin-gray-600,
75
75
  hover: (
76
- background-color: rgba($cadmin-gray-900, 0.03),
76
+ background-color: rgba($cadmin-primary, 0.04),
77
77
  color: $cadmin-gray-900,
78
78
  ),
79
79
  focus: (
80
- background-color: rgba($cadmin-gray-900, 0.03),
80
+ background-color: rgba($cadmin-primary, 0.04),
81
81
  box-shadow:
82
82
  clay-enable-shadows(
83
83
  $cadmin-component-focus-inset-box-shadow
@@ -89,8 +89,8 @@ $cadmin-menubar-vertical-transparent-md: map-deep-merge(
89
89
  color: rgba($cadmin-black, 0.9),
90
90
  ),
91
91
  active-class: (
92
- background-color: $cadmin-primary-l3,
93
- color: $cadmin-primary,
92
+ background-color: rgba($cadmin-primary, 0.06),
93
+ color: $cadmin-gray-900,
94
94
  font-weight: $cadmin-font-weight-semi-bold,
95
95
  ),
96
96
  disabled: (
@@ -98,7 +98,7 @@ $cadmin-menubar-vertical-transparent-md: map-deep-merge(
98
98
  color: rgba($cadmin-black, 0.3),
99
99
  ),
100
100
  show: (
101
- background-color: $cadmin-c-unset,
101
+ background-color: c-unset,
102
102
  color: $cadmin-gray-900,
103
103
  font-weight: $cadmin-font-weight-semi-bold,
104
104
  ),
@@ -107,16 +107,15 @@ $cadmin-menubar-vertical-transparent-md: map-deep-merge(
107
107
  border-radius: clay-enable-rounded(0),
108
108
  color: $cadmin-gray-900,
109
109
  hover: (
110
- background-color: $cadmin-gray-100,
111
- color: clay-darken($cadmin-gray-900, 5%),
110
+ background-color: rgba($cadmin-primary, 0.04),
111
+ color: $cadmin-gray-900,
112
112
  ),
113
113
  focus: (
114
- background-color:
115
- clay-lighten($cadmin-component-active-bg, 44.9),
114
+ background-color: rgba($cadmin-primary, 0.04),
116
115
  ),
117
116
  active-class: (
118
- background-color: $cadmin-primary-l3,
119
- color: $cadmin-primary,
117
+ background-color: rgba($cadmin-primary, 0.06),
118
+ color: $cadmin-gray-900,
120
119
  font-weight: $cadmin-font-weight-semi-bold,
121
120
  ),
122
121
  disabled: (
@@ -124,9 +123,9 @@ $cadmin-menubar-vertical-transparent-md: map-deep-merge(
124
123
  color: $cadmin-gray-600,
125
124
  ),
126
125
  show: (
127
- background-color: $cadmin-c-unset,
128
- color: $cadmin-c-unset,
129
- font-weight: $cadmin-c-unset,
126
+ background-color: c-unset,
127
+ color: c-unset,
128
+ font-weight: c-unset,
130
129
  ),
131
130
  ),
132
131
  collapse-mobile: (
@@ -286,11 +285,11 @@ $cadmin-menubar-vertical-transparent-lg: map-deep-merge(
286
285
  box-shadow 0.15s ease-in-out},
287
286
  color: $cadmin-gray-600,
288
287
  hover: (
289
- background-color: rgba($cadmin-gray-900, 0.03),
288
+ background-color: rgba($cadmin-primary, 0.04),
290
289
  color: $cadmin-gray-900,
291
290
  ),
292
291
  focus: (
293
- background-color: rgba($cadmin-gray-900, 0.03),
292
+ background-color: rgba($cadmin-primary, 0.04),
294
293
  box-shadow:
295
294
  clay-enable-shadows(
296
295
  $cadmin-component-focus-inset-box-shadow
@@ -302,8 +301,8 @@ $cadmin-menubar-vertical-transparent-lg: map-deep-merge(
302
301
  color: rgba($cadmin-black, 0.9),
303
302
  ),
304
303
  active-class: (
305
- background-color: $cadmin-primary-l3,
306
- color: $cadmin-primary,
304
+ background-color: rgba($cadmin-primary, 0.06),
305
+ color: $cadmin-gray-900,
307
306
  font-weight: $cadmin-font-weight-semi-bold,
308
307
  ),
309
308
  disabled: (
@@ -311,7 +310,7 @@ $cadmin-menubar-vertical-transparent-lg: map-deep-merge(
311
310
  color: rgba($cadmin-black, 0.3),
312
311
  ),
313
312
  show: (
314
- background-color: $cadmin-c-unset,
313
+ background-color: c-unset,
315
314
  color: $cadmin-gray-900,
316
315
  font-weight: $cadmin-font-weight-semi-bold,
317
316
  ),
@@ -320,16 +319,15 @@ $cadmin-menubar-vertical-transparent-lg: map-deep-merge(
320
319
  border-radius: clay-enable-rounded(0),
321
320
  color: $cadmin-gray-900,
322
321
  hover: (
323
- background-color: $cadmin-gray-100,
324
- color: clay-darken($cadmin-gray-900, 5%),
322
+ background-color: rgba($cadmin-primary, 0.04),
323
+ color: $cadmin-gray-900,
325
324
  ),
326
325
  focus: (
327
- background-color:
328
- clay-lighten($cadmin-component-active-bg, 44.9),
326
+ background-color: rgba($cadmin-primary, 0.04),
329
327
  ),
330
328
  active-class: (
331
- background-color: $cadmin-primary-l3,
332
- color: $cadmin-primary,
329
+ background-color: rgba($cadmin-primary, 0.06),
330
+ color: $cadmin-gray-900,
333
331
  font-weight: $cadmin-font-weight-semi-bold,
334
332
  ),
335
333
  disabled: (
@@ -337,9 +335,9 @@ $cadmin-menubar-vertical-transparent-lg: map-deep-merge(
337
335
  color: $cadmin-gray-600,
338
336
  ),
339
337
  show: (
340
- background-color: $cadmin-c-unset,
341
- color: $cadmin-c-unset,
342
- font-weight: $cadmin-c-unset,
338
+ background-color: c-unset,
339
+ color: c-unset,
340
+ font-weight: c-unset,
343
341
  ),
344
342
  ),
345
343
  collapse-mobile: (
@@ -19,8 +19,9 @@ $cadmin-modal-content-border-color: transparent !default;
19
19
  $cadmin-modal-content-border-width: $cadmin-border-width !default;
20
20
 
21
21
  $cadmin-modal-content-border-radius: $cadmin-border-radius-lg !default;
22
- $cadmin-modal-content-inner-border-radius: $cadmin-modal-content-border-radius -
23
- $cadmin-modal-content-border-width !default;
22
+ $cadmin-modal-content-inner-border-radius: calc(
23
+ #{$cadmin-modal-content-border-radius} - #{$cadmin-modal-content-border-width}
24
+ ) !default;
24
25
 
25
26
  $cadmin-modal-content-box-shadow-xs: 0 0 3px 1px rgba(0, 0, 0, 0.2) !default;
26
27
  $cadmin-modal-content-box-shadow-sm-up: 0 8px 16px rgba($cadmin-black, 0.5) !default;
@@ -3,8 +3,9 @@ $cadmin-popover-border-color: transparent !default;
3
3
  $cadmin-popover-border-width: $cadmin-border-width !default;
4
4
 
5
5
  $cadmin-popover-border-radius: $cadmin-border-radius !default; // 4px
6
- $cadmin-popover-inner-border-radius: $cadmin-popover-border-radius -
7
- $cadmin-popover-border-width !default;
6
+ $cadmin-popover-inner-border-radius: calc(
7
+ #{$cadmin-popover-border-radius} - #{$cadmin-popover-border-width}
8
+ ) !default;
8
9
 
9
10
  $cadmin-popover-box-shadow: 0 1px 15px -2px rgba(0, 0, 0, 0.2) !default;
10
11
  $cadmin-popover-font-size: $cadmin-font-size-sm !default;
@@ -119,7 +119,11 @@ input[type='button'] {
119
119
  starts-with($color, '#') or
120
120
  starts-with($color, '%'),
121
121
  $color,
122
- str-insert($color, '.btn-', 1)
122
+ if(
123
+ starts-with($color, 'btn'),
124
+ str-insert($color, '.', 1),
125
+ str-insert($color, '.btn-', 1)
126
+ )
123
127
  );
124
128
 
125
129
  @if (starts-with($color, '%') or map-get($value, extend)) {
@@ -127,17 +131,9 @@ input[type='button'] {
127
131
  @include clay-button-variant($value);
128
132
  }
129
133
  } @else {
130
- $placeholder: if(
131
- starts-with($color, '.') or starts-with($color, '#'),
132
- '%#{str-slice($color, 2)}',
133
- '%btn-#{$color}'
134
- );
134
+ $placeholder: '%#{str-slice($selector, 2)}';
135
135
 
136
- $placeholder-focus: if(
137
- starts-with($color, '.') or starts-with($color, '#'),
138
- '%#{str-slice($color, 2)}-focus',
139
- '%btn-#{$color}-focus'
140
- );
136
+ $placeholder-focus: '%#{str-slice($selector, 2)}-focus';
141
137
 
142
138
  #{$placeholder} {
143
139
  @include clay-button-variant($value);
@@ -161,7 +157,11 @@ input[type='button'] {
161
157
  starts-with($color, '#') or
162
158
  starts-with($color, '%'),
163
159
  $color,
164
- str-insert($color, '.btn-outline-', 1)
160
+ if(
161
+ starts-with($color, 'btn'),
162
+ str-insert($color, '.', 1),
163
+ str-insert($color, '.btn-outline-', 1)
164
+ )
165
165
  );
166
166
 
167
167
  @if (starts-with($color, '%') or map-get($value, extend)) {
@@ -169,17 +169,9 @@ input[type='button'] {
169
169
  @include clay-button-variant($value);
170
170
  }
171
171
  } @else {
172
- $placeholder: if(
173
- starts-with($color, '.') or starts-with($color, '#'),
174
- '%#{str-slice($color, 2)}',
175
- '%btn-outline-#{$color}'
176
- );
172
+ $placeholder: '%#{str-slice($selector, 2)}';
177
173
 
178
- $placeholder-focus: if(
179
- starts-with($color, '.') or starts-with($color, '#'),
180
- '%#{str-slice($color, 2)}-focus',
181
- '%btn-outline-#{$color}-focus'
182
- );
174
+ $placeholder-focus: '%#{str-slice($selector, 2)}-focus';
183
175
 
184
176
  #{$placeholder} {
185
177
  @include clay-button-variant($value);
@@ -238,17 +238,21 @@
238
238
  .dropdown-subheader,
239
239
  .dropdown-caption,
240
240
  .dropdown-item {
241
- padding-left: $dropdown-item-padding-x + $dropdown-item-indicator-size +
242
- $dropdown-item-indicator-spacer-x;
241
+ padding-left: calc(
242
+ #{$dropdown-item-padding-x} + #{$dropdown-item-indicator-size} + #{$dropdown-item-indicator-spacer-x}
243
+ );
243
244
  }
244
245
 
245
246
  @if ($enable-c-inner) {
246
247
  .dropdown-item {
247
248
  .c-inner {
248
- margin-left: math-sign(
249
- $dropdown-item-padding-x +
250
- $dropdown-item-indicator-size +
251
- $dropdown-item-indicator-spacer-x
249
+ margin-left: calc(
250
+ (
251
+ #{$dropdown-item-padding-x} +
252
+ #{$dropdown-item-indicator-size} +
253
+ #{$dropdown-item-indicator-spacer-x}
254
+ ) *
255
+ -1
252
256
  );
253
257
  }
254
258
  }
@@ -279,15 +283,19 @@
279
283
  }
280
284
 
281
285
  .dropdown-item {
282
- padding-right: $dropdown-item-padding-x + $dropdown-item-indicator-size +
283
- $dropdown-item-indicator-spacer-x;
286
+ padding-right: calc(
287
+ #{$dropdown-item-padding-x} + #{$dropdown-item-indicator-size} + #{$dropdown-item-indicator-spacer-x}
288
+ );
284
289
 
285
290
  @if ($enable-c-inner) {
286
291
  .c-inner {
287
- margin-right: math-sign(
288
- $dropdown-item-padding-x +
289
- $dropdown-item-indicator-size +
290
- $dropdown-item-indicator-spacer-x
292
+ margin-right: calc(
293
+ (
294
+ #{$dropdown-item-padding-x} +
295
+ #{$dropdown-item-indicator-size} +
296
+ #{$dropdown-item-indicator-spacer-x}
297
+ ) *
298
+ -1
291
299
  );
292
300
  }
293
301
  }
@@ -656,6 +656,22 @@
656
656
  @include clay-css(map-deep-get($map, focus, after));
657
657
  }
658
658
 
659
+ &:hover {
660
+ @include clay-css(map-deep-get($map, focus, hover));
661
+
662
+ &::before {
663
+ @include clay-css(
664
+ map-deep-get($map, focus, hover, before)
665
+ );
666
+ }
667
+
668
+ &::after {
669
+ @include clay-css(
670
+ map-deep-get($map, focus, hover, after)
671
+ );
672
+ }
673
+ }
674
+
659
675
  .inline-item {
660
676
  @include clay-css(map-get($focus, inline-item));
661
677
  }
@@ -241,7 +241,7 @@
241
241
 
242
242
  @if ($enabled) {
243
243
  @each $key, $value in $map {
244
- @if ($value == clay-unset) {
244
+ @if ($value == clay-unset or $value == c-unset) {
245
245
  $value: null;
246
246
  }
247
247
 
@@ -30,7 +30,7 @@
30
30
  }
31
31
 
32
32
  // * SPDX-SnippetBegin
33
- // * SPDX-License-Identifier: APLv2
33
+ // * SPDX-License-Identifier: Apache-2.0
34
34
  // * SPDX-SnippetCopyrightText: © 2018 A11Y Project <https://a11yproject.com/posts/how-to-hide-content/>
35
35
  // *
36
36
 
@@ -217,16 +217,16 @@ $dropdown-item-base: map-deep-merge(
217
217
  line-height: calc(#{$dropdown-font-size} * #{$line-height-base}),
218
218
  ),
219
219
  '&.autofit-row': (
220
- padding-left: 1rem,
221
- padding-right: 1rem,
220
+ padding-left: calc(#{$dropdown-item-padding-x} - 0.25rem),
221
+ padding-right: calc(#{$dropdown-item-padding-x} - 0.25rem),
222
222
  autofit-col: (
223
223
  padding-left: 0.25rem,
224
224
  padding-right: 0.25rem,
225
225
  ),
226
226
  ),
227
227
  autofit-row: (
228
- margin-left: 0.25rem,
229
- margin-right: 0.25rem,
228
+ margin-left: -0.25rem,
229
+ margin-right: -0.25rem,
230
230
  width: auto,
231
231
  autofit-col: (
232
232
  padding-left: 0.25rem,
@@ -116,7 +116,9 @@ $input-plaintext-color: $body-color !default;
116
116
 
117
117
  /// @deprecated with no replacement
118
118
 
119
- $input-height-border: $input-border-top-width + $input-border-bottom-width !default;
119
+ $input-height-border: calc(
120
+ #{$input-border-top-width} + #{$input-border-bottom-width}
121
+ ) !default;
120
122
 
121
123
  /// @deprecated with no replacement
122
124
 
@@ -74,7 +74,7 @@ $menubar-vertical-transparent-md: map-deep-merge(
74
74
  color: rgba($black, 0.9),
75
75
  ),
76
76
  show: (
77
- color: $c-unset,
77
+ color: c-unset,
78
78
  ),
79
79
  disabled: (
80
80
  color: rgba($black, 0.3),
@@ -99,9 +99,9 @@ $menubar-vertical-transparent-md: map-deep-merge(
99
99
  color: $gray-600,
100
100
  ),
101
101
  show: (
102
- background-color: $c-unset,
103
- color: $c-unset,
104
- font-weight: $c-unset,
102
+ background-color: c-unset,
103
+ color: c-unset,
104
+ font-weight: c-unset,
105
105
  ),
106
106
  ),
107
107
  collapse-mobile: (
@@ -241,7 +241,7 @@ $menubar-vertical-transparent-lg: map-deep-merge(
241
241
  color: rgba($black, 0.9),
242
242
  ),
243
243
  show: (
244
- color: $c-unset,
244
+ color: c-unset,
245
245
  ),
246
246
  disabled: (
247
247
  color: rgba($black, 0.3),
@@ -266,9 +266,9 @@ $menubar-vertical-transparent-lg: map-deep-merge(
266
266
  color: $gray-600,
267
267
  ),
268
268
  show: (
269
- background-color: $c-unset,
270
- color: $c-unset,
271
- font-weight: $c-unset,
269
+ background-color: c-unset,
270
+ color: c-unset,
271
+ font-weight: c-unset,
272
272
  ),
273
273
  ),
274
274
  collapse-mobile: (
@@ -19,8 +19,9 @@ $modal-content-border-color: rgba($black, 0.2) !default;
19
19
  $modal-content-border-width: $border-width !default;
20
20
 
21
21
  $modal-content-border-radius: $border-radius-lg !default;
22
- $modal-content-inner-border-radius: $modal-content-border-radius -
23
- $modal-content-border-width !default;
22
+ $modal-content-inner-border-radius: calc(
23
+ #{$modal-content-border-radius} - #{$modal-content-border-width}
24
+ ) !default;
24
25
 
25
26
  $modal-content-box-shadow-xs: 0 0.25rem 0.5rem rgba($black, 0.5) !default;
26
27
  $modal-content-box-shadow-sm-up: 0 0.5rem 1rem rgba($black, 0.5) !default;
@@ -3,7 +3,9 @@ $popover-border-color: rgba($black, 0.2) !default;
3
3
  $popover-border-width: $border-width !default;
4
4
 
5
5
  $popover-border-radius: $border-radius-lg !default;
6
- $popover-inner-border-radius: $popover-border-radius - $popover-border-width !default;
6
+ $popover-inner-border-radius: calc(
7
+ #{$popover-border-radius} - #{$popover-border-width}
8
+ ) !default;
7
9
 
8
10
  $popover-box-shadow: 0 0.25rem 0.5rem rgba($black, 0.2) !default;
9
11
  $popover-font-size: $font-size-sm !default;