@clayui/css 3.60.2 → 3.62.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 (51) hide show
  1. package/CHANGELOG.md +54 -0
  2. package/lib/css/atlas.css +1577 -361
  3. package/lib/css/atlas.css.map +1 -1
  4. package/lib/css/base.css +1049 -198
  5. package/lib/css/base.css.map +1 -1
  6. package/lib/css/cadmin.css +1240 -273
  7. package/lib/css/cadmin.css.map +1 -1
  8. package/lib/images/icons/icons.svg +1 -1
  9. package/package.json +1 -1
  10. package/src/scss/_license-text.scss +1 -1
  11. package/src/scss/atlas/variables/_globals.scss +10 -30
  12. package/src/scss/atlas/variables/_sidebar.scss +3 -0
  13. package/src/scss/cadmin/components/_forms.scss +10 -0
  14. package/src/scss/cadmin/components/_input-groups.scss +9 -0
  15. package/src/scss/cadmin/components/_side-navigation.scss +3 -0
  16. package/src/scss/cadmin/components/_type.scss +5 -4
  17. package/src/scss/cadmin/variables/_forms.scss +31 -19
  18. package/src/scss/cadmin/variables/_globals.scss +10 -30
  19. package/src/scss/cadmin/variables/_sidebar.scss +3 -0
  20. package/src/scss/cadmin/variables/_type.scss +14 -0
  21. package/src/scss/components/_forms.scss +10 -0
  22. package/src/scss/components/_input-groups.scss +9 -0
  23. package/src/scss/components/_side-navigation.scss +2 -0
  24. package/src/scss/components/_type.scss +5 -4
  25. package/src/scss/functions/_global-functions.scss +137 -41
  26. package/src/scss/mixins/_alerts.scss +26 -0
  27. package/src/scss/mixins/_badges.scss +7 -6
  28. package/src/scss/mixins/_border-radius.scss +37 -57
  29. package/src/scss/mixins/_box-shadow.scss +4 -7
  30. package/src/scss/mixins/_breakpoints.scss +44 -4
  31. package/src/scss/mixins/_buttons.scss +18 -21
  32. package/src/scss/mixins/_cards.scss +10 -2
  33. package/src/scss/mixins/_close.scss +7 -6
  34. package/src/scss/mixins/_dropdown-menu.scss +7 -6
  35. package/src/scss/mixins/_forms.scss +28 -1
  36. package/src/scss/mixins/_gradients.scss +15 -9
  37. package/src/scss/mixins/_grid.scss +7 -6
  38. package/src/scss/mixins/_input-groups.scss +0 -6
  39. package/src/scss/mixins/_labels.scss +12 -7
  40. package/src/scss/mixins/_links.scss +7 -6
  41. package/src/scss/mixins/_list-group.scss +101 -20
  42. package/src/scss/mixins/_menubar.scss +96 -21
  43. package/src/scss/mixins/_navbar.scss +95 -132
  44. package/src/scss/mixins/_panels.scss +7 -6
  45. package/src/scss/mixins/_scale-component.scss +10 -2
  46. package/src/scss/mixins/_sidebar.scss +18 -0
  47. package/src/scss/mixins/_tbar.scss +10 -36
  48. package/src/scss/mixins/_timelines.scss +20 -4
  49. package/src/scss/variables/_forms.scss +31 -19
  50. package/src/scss/variables/_globals.scss +7 -21
  51. package/src/scss/variables/_type.scss +14 -0
@@ -106,6 +106,28 @@
106
106
  @return null;
107
107
  }
108
108
 
109
+ /// A function that returns the direct parent selector (e.g., clay-parent('#wrapper .container .row')) will return `.row`.
110
+ /// @param {String} $selector - The full selector
111
+
112
+ @function clay-parent($selector) {
113
+ $selector-list: simple-selectors(clay-str-replace('#{$selector}', ' ', ''));
114
+
115
+ @return nth($selector-list, length($selector-list));
116
+ }
117
+
118
+ /// A function that inserts a CSS selector at a specific place (e.g., clay-insert-at('.container', '#content ', '#wrapper .container .row')) will return `#wrapper #content .container .row`.
119
+ /// @param {String} $location - The string to target
120
+ /// @param {String} $insert - The string to insert before the location
121
+ /// @param {String} $selector - The full selector
122
+
123
+ @function clay-insert-before($location, $insert, $selector: &) {
124
+ @return clay-str-replace(
125
+ '#{$selector}',
126
+ '#{$location}',
127
+ '#{$insert}#{$location}'
128
+ );
129
+ }
130
+
109
131
  /// A helper function for displaying warning messages for required variables.
110
132
  /// @param {Any} $var - The variable to check
111
133
  /// @param {String} $msg['This value is required!'] - The error message to display
@@ -181,13 +203,14 @@
181
203
  /// @param {Bool} $custom-gradient[false] - Pass in `true` as the second parameter to this function if using a custom gradient.
182
204
 
183
205
  @function clay-enable-gradients($gradient, $custom-gradient: false) {
184
- $enable: setter(
206
+ $enable: if(
207
+ variable-exists(enable-gradients),
208
+ $enable-gradients,
185
209
  if(
186
- variable-exists(enable-gradients),
187
- $enable-gradients,
188
- $cadmin-enable-gradients
189
- ),
190
- false
210
+ variable-exists(cadmin-enable-gradients),
211
+ $cadmin-enable-gradients,
212
+ false
213
+ )
191
214
  );
192
215
 
193
216
  @if ($enable and $gradient) {
@@ -209,13 +232,10 @@
209
232
  /// @param {Number} $radius - The border radius.
210
233
 
211
234
  @function clay-enable-rounded($radius, $enable: null) {
212
- $enable: setter(
213
- if(
214
- variable-exists(enable-rounded),
215
- $enable-rounded,
216
- $cadmin-enable-rounded
217
- ),
218
- true
235
+ $enable: if(
236
+ variable-exists(enable-rounded),
237
+ $enable-rounded,
238
+ if(variable-exists(cadmin-enable-rounded), $cadmin-enable-rounded, true)
219
239
  );
220
240
 
221
241
  @if ($enable) {
@@ -234,13 +254,10 @@
234
254
  $length: length($shadows);
235
255
  $separator: list-separator($shadows);
236
256
 
237
- $enable: setter(
238
- if(
239
- variable-exists(enable-shadows),
240
- $enable-shadows,
241
- $cadmin-enable-shadows
242
- ),
243
- true
257
+ $enable: if(
258
+ variable-exists(enable-shadows),
259
+ $enable-shadows,
260
+ if(variable-exists(cadmin-enable-shadows), $cadmin-enable-shadows, true)
244
261
  );
245
262
 
246
263
  @if ($length == 2 and $separator == 'comma') {
@@ -262,13 +279,14 @@
262
279
  /// @param {List} $transitions - The transitions.
263
280
 
264
281
  @function clay-enable-transitions($transitions) {
265
- $enable: setter(
282
+ $enable: if(
283
+ variable-exists(enable-transitions),
284
+ $enable-transitions,
266
285
  if(
267
- variable-exists(enable-transitions),
268
- $enable-transitions,
269
- $cadmin-enable-transitions
270
- ),
271
- true
286
+ variable-exists(cadmin-enable-transitions),
287
+ $cadmin-enable-transitions,
288
+ true
289
+ )
272
290
  );
273
291
 
274
292
  @if ($enable) {
@@ -366,7 +384,17 @@
366
384
  if(
367
385
  variable-exists(grid-breakpoints),
368
386
  $grid-breakpoints,
369
- $cadmin-grid-breakpoints
387
+ if(
388
+ variable-exists(cadmin-grid-breakpoints),
389
+ $cadmin-grid-breakpoints,
390
+ (
391
+ xs: 0,
392
+ sm: 576px,
393
+ md: 768px,
394
+ lg: 992px,
395
+ xl: 1280px,
396
+ )
397
+ )
370
398
  )
371
399
  );
372
400
 
@@ -396,7 +424,17 @@
396
424
  if(
397
425
  variable-exists(grid-breakpoints),
398
426
  $grid-breakpoints,
399
- $cadmin-grid-breakpoints
427
+ if(
428
+ variable-exists(cadmin-grid-breakpoints),
429
+ $cadmin-grid-breakpoints,
430
+ (
431
+ xs: 0,
432
+ sm: 576px,
433
+ md: 768px,
434
+ lg: 992px,
435
+ xl: 1280px,
436
+ )
437
+ )
400
438
  )
401
439
  );
402
440
 
@@ -422,7 +460,17 @@
422
460
  if(
423
461
  variable-exists(grid-breakpoints),
424
462
  $grid-breakpoints,
425
- $cadmin-grid-breakpoints
463
+ if(
464
+ variable-exists(cadmin-grid-breakpoints),
465
+ $cadmin-grid-breakpoints,
466
+ (
467
+ xs: 0,
468
+ sm: 576px,
469
+ md: 768px,
470
+ lg: 992px,
471
+ xl: 1280px,
472
+ )
473
+ )
426
474
  )
427
475
  );
428
476
 
@@ -445,7 +493,17 @@
445
493
  if(
446
494
  variable-exists(grid-breakpoints),
447
495
  $grid-breakpoints,
448
- $cadmin-grid-breakpoints
496
+ if(
497
+ variable-exists(cadmin-grid-breakpoints),
498
+ $cadmin-grid-breakpoints,
499
+ (
500
+ xs: 0,
501
+ sm: 576px,
502
+ md: 768px,
503
+ lg: 992px,
504
+ xl: 1280px,
505
+ )
506
+ )
449
507
  )
450
508
  );
451
509
  $next: breakpoint-next($name, $breakpoints);
@@ -466,7 +524,17 @@
466
524
  if(
467
525
  variable-exists(grid-breakpoints),
468
526
  $grid-breakpoints,
469
- $cadmin-grid-breakpoints
527
+ if(
528
+ variable-exists(cadmin-grid-breakpoints),
529
+ $cadmin-grid-breakpoints,
530
+ (
531
+ xs: 0,
532
+ sm: 576px,
533
+ md: 768px,
534
+ lg: 992px,
535
+ xl: 1280px,
536
+ )
537
+ )
470
538
  )
471
539
  );
472
540
 
@@ -501,7 +569,11 @@
501
569
  if(
502
570
  variable-exists(yiq-text-dark),
503
571
  $yiq-text-dark,
504
- $cadmin-yiq-text-dark
572
+ if(
573
+ variable-exists(cadmin-yiq-text-dark),
574
+ $cadmin-yiq-text-dark,
575
+ #000
576
+ )
505
577
  )
506
578
  );
507
579
 
@@ -510,7 +582,11 @@
510
582
  if(
511
583
  variable-exists(yiq-text-light),
512
584
  $yiq-text-light,
513
- $cadmin-yiq-text-light
585
+ if(
586
+ variable-exists(cadmin-yiq-text-light),
587
+ $cadmin-yiq-text-light,
588
+ #fff
589
+ )
514
590
  )
515
591
  );
516
592
 
@@ -519,7 +595,11 @@
519
595
  if(
520
596
  variable-exists(yiq-contrasted-threshold),
521
597
  $yiq-contrasted-threshold,
522
- $cadmin-yiq-contrasted-threshold
598
+ if(
599
+ variable-exists(cadmin-yiq-contrasted-threshold),
600
+ $cadmin-yiq-contrasted-threshold,
601
+ 150
602
+ )
523
603
  )
524
604
  );
525
605
 
@@ -547,7 +627,7 @@
547
627
  $colors: if(
548
628
  variable-exists(theme-colors),
549
629
  $theme-colors,
550
- $cadmin-theme-colors
630
+ if(variable-exists(cadmin-theme-colors), $cadmin-theme-colors, ())
551
631
  );
552
632
  }
553
633
 
@@ -572,21 +652,33 @@
572
652
  $level: 0,
573
653
  $color-interval: null
574
654
  ) {
575
- $black: setter(if(variable-exists('black'), $black, $cadmin-black), #000);
655
+ $black: if(
656
+ variable-exists('black'),
657
+ $black,
658
+ if(variable-exists(cadmin-black), $cadmin-black, #000)
659
+ );
576
660
 
577
- $white: setter(if(variable-exists('white'), $white, $cadmin-white), #fff);
661
+ $white: if(
662
+ variable-exists('white'),
663
+ $white,
664
+ if(variable-exists(cadmin-white), $cadmin-white, #fff)
665
+ );
578
666
 
579
667
  $color: theme-color($color-name);
580
668
  $color-base: if($level > 0, $black, $white);
581
669
  $level: abs($level);
582
670
 
583
671
  $color-interval: setter(
672
+ $color-interval,
584
673
  if(
585
674
  variable-exists(theme-color-interval),
586
675
  $theme-color-interval,
587
- $cadmin-theme-color-interval
588
- ),
589
- $color-interval
676
+ if(
677
+ variable-exists(cadmin-theme-color-interval),
678
+ $cadmin-theme-color-interval,
679
+ 8%
680
+ )
681
+ )
590
682
  );
591
683
 
592
684
  @return clay-mix($color-base, $color, $level * $color-interval);
@@ -805,7 +897,11 @@
805
897
  $escaped: if(
806
898
  variable-exists(escaped-characters),
807
899
  $escaped-characters,
808
- $cadmin-escaped-characters
900
+ if(
901
+ variable-exists(cadmin-escaped-characters),
902
+ $cadmin-escaped-characters,
903
+ (('<', '%3c'), ('>', '%3e'), ('#', '%23'))
904
+ )
809
905
  );
810
906
  }
811
907
 
@@ -80,6 +80,18 @@
80
80
  /// component-subtitle: (
81
81
  /// // .alert .component-subtitle
82
82
  /// ),
83
+ /// custom-selectors: (
84
+ /// // add custom selectors here, see examples below
85
+ /// btn-primary: (
86
+ /// // .alert .btn-primary
87
+ /// ),
88
+ /// btn-secondary: (
89
+ /// // .alert .btn-secondary
90
+ /// ),
91
+ /// '#custom-alert-btn': (
92
+ /// // .alert #custom-alert-btn
93
+ /// ),
94
+ /// ),
83
95
  /// )
84
96
 
85
97
  @mixin clay-alert-variant($map) {
@@ -236,6 +248,20 @@
236
248
  .component-subtitle {
237
249
  @include clay-text-typography($component-subtitle);
238
250
  }
251
+
252
+ @each $key, $properties in map-get($map, custom-selectors) {
253
+ @if ($key) {
254
+ $selector: if(
255
+ starts-with($key, '.') or starts-with($key, '#'),
256
+ $key,
257
+ str-insert($key, '.', 1)
258
+ );
259
+
260
+ #{$selector} {
261
+ @include clay-button-variant($properties);
262
+ }
263
+ }
264
+ }
239
265
  }
240
266
  }
241
267
  }
@@ -149,13 +149,14 @@
149
149
  $c-inner: map-merge(
150
150
  (
151
151
  enabled:
152
- setter(
152
+ if(
153
+ variable-exists(enable-c-inner),
154
+ $enable-c-inner,
153
155
  if(
154
- variable-exists(enable-c-inner),
155
- $enable-c-inner,
156
- $cadmin-enable-c-inner
157
- ),
158
- true
156
+ variable-exists(cadmin-enable-c-inner),
157
+ $cadmin-enable-c-inner,
158
+ true
159
+ )
159
160
  ),
160
161
  ),
161
162
  $c-inner
@@ -3,17 +3,18 @@
3
3
  if(
4
4
  variable-exists(border-radius),
5
5
  $border-radius,
6
- $cadmin-border-radius
6
+ if(
7
+ variable-exists(cadmin-border-radius),
8
+ $cadmin-border-radius,
9
+ 0.25rem
10
+ )
7
11
  ),
8
12
  $fallback-border-radius: false
9
13
  ) {
10
- $enable: setter(
11
- if(
12
- variable-exists(enable-rounded),
13
- $enable-rounded,
14
- $cadmin-enable-rounded
15
- ),
16
- true
14
+ $enable: if(
15
+ variable-exists(enable-rounded),
16
+ $enable-rounded,
17
+ if(variable-exists(cadmin-enable-rounded), $cadmin-enable-rounded, true)
17
18
  );
18
19
 
19
20
  @if ($enable) {
@@ -24,13 +25,10 @@
24
25
  }
25
26
 
26
27
  @mixin border-top-radius($radius) {
27
- $enable: setter(
28
- if(
29
- variable-exists(enable-rounded),
30
- $enable-rounded,
31
- $cadmin-enable-rounded
32
- ),
33
- true
28
+ $enable: if(
29
+ variable-exists(enable-rounded),
30
+ $enable-rounded,
31
+ if(variable-exists(cadmin-enable-rounded), $cadmin-enable-rounded, true)
34
32
  );
35
33
 
36
34
  @if ($enable) {
@@ -40,13 +38,10 @@
40
38
  }
41
39
 
42
40
  @mixin border-right-radius($radius) {
43
- $enable: setter(
44
- if(
45
- variable-exists(enable-rounded),
46
- $enable-rounded,
47
- $cadmin-enable-rounded
48
- ),
49
- true
41
+ $enable: if(
42
+ variable-exists(enable-rounded),
43
+ $enable-rounded,
44
+ if(variable-exists(cadmin-enable-rounded), $cadmin-enable-rounded, true)
50
45
  );
51
46
 
52
47
  @if ($enable) {
@@ -56,13 +51,10 @@
56
51
  }
57
52
 
58
53
  @mixin border-bottom-radius($radius) {
59
- $enable: setter(
60
- if(
61
- variable-exists(enable-rounded),
62
- $enable-rounded,
63
- $cadmin-enable-rounded
64
- ),
65
- true
54
+ $enable: if(
55
+ variable-exists(enable-rounded),
56
+ $enable-rounded,
57
+ if(variable-exists(cadmin-enable-rounded), $cadmin-enable-rounded, true)
66
58
  );
67
59
 
68
60
  @if ($enable) {
@@ -72,13 +64,10 @@
72
64
  }
73
65
 
74
66
  @mixin border-left-radius($radius) {
75
- $enable: setter(
76
- if(
77
- variable-exists(enable-rounded),
78
- $enable-rounded,
79
- $cadmin-enable-rounded
80
- ),
81
- true
67
+ $enable: if(
68
+ variable-exists(enable-rounded),
69
+ $enable-rounded,
70
+ if(variable-exists(cadmin-enable-rounded), $cadmin-enable-rounded, true)
82
71
  );
83
72
 
84
73
  @if ($enable) {
@@ -88,13 +77,10 @@
88
77
  }
89
78
 
90
79
  @mixin border-top-left-radius($radius) {
91
- $enable: setter(
92
- if(
93
- variable-exists(enable-rounded),
94
- $enable-rounded,
95
- $cadmin-enable-rounded
96
- ),
97
- true
80
+ $enable: if(
81
+ variable-exists(enable-rounded),
82
+ $enable-rounded,
83
+ if(variable-exists(cadmin-enable-rounded), $cadmin-enable-rounded, true)
98
84
  );
99
85
 
100
86
  @if ($enable) {
@@ -118,13 +104,10 @@
118
104
  }
119
105
 
120
106
  @mixin border-bottom-right-radius($radius) {
121
- $enable: setter(
122
- if(
123
- variable-exists(enable-rounded),
124
- $enable-rounded,
125
- $cadmin-enable-rounded
126
- ),
127
- true
107
+ $enable: if(
108
+ variable-exists(enable-rounded),
109
+ $enable-rounded,
110
+ if(variable-exists(cadmin-enable-rounded), $cadmin-enable-rounded, true)
128
111
  );
129
112
 
130
113
  @if ($enable) {
@@ -133,13 +116,10 @@
133
116
  }
134
117
 
135
118
  @mixin border-bottom-left-radius($radius) {
136
- $enable: setter(
137
- if(
138
- variable-exists(enable-rounded),
139
- $enable-rounded,
140
- $cadmin-enable-rounded
141
- ),
142
- true
119
+ $enable: if(
120
+ variable-exists(enable-rounded),
121
+ $enable-rounded,
122
+ if(variable-exists(cadmin-enable-rounded), $cadmin-enable-rounded, true)
143
123
  );
144
124
 
145
125
  @if ($enable) {
@@ -6,13 +6,10 @@
6
6
  /// @param {Arglist} $shadow
7
7
 
8
8
  @mixin box-shadow($shadow...) {
9
- $enable: setter(
10
- if(
11
- variable-exists(enable-shadows),
12
- $enable-shadows,
13
- $cadmin-enable-shadows
14
- ),
15
- true
9
+ $enable: if(
10
+ variable-exists(enable-shadows),
11
+ $enable-shadows,
12
+ if(variable-exists(cadmin-enable-shadows), $cadmin-enable-shadows, true)
16
13
  );
17
14
 
18
15
  @if ($enable) {
@@ -12,7 +12,17 @@
12
12
  if(
13
13
  variable-exists(grid-breakpoints),
14
14
  $grid-breakpoints,
15
- $cadmin-grid-breakpoints
15
+ if(
16
+ variable-exists(cadmin-grid-breakpoints),
17
+ $cadmin-grid-breakpoints,
18
+ (
19
+ xs: 0,
20
+ sm: 576px,
21
+ md: 768px,
22
+ lg: 992px,
23
+ xl: 1280px,
24
+ )
25
+ )
16
26
  )
17
27
  );
18
28
 
@@ -37,7 +47,17 @@
37
47
  if(
38
48
  variable-exists(grid-breakpoints),
39
49
  $grid-breakpoints,
40
- $cadmin-grid-breakpoints
50
+ if(
51
+ variable-exists(cadmin-grid-breakpoints),
52
+ $cadmin-grid-breakpoints,
53
+ (
54
+ xs: 0,
55
+ sm: 576px,
56
+ md: 768px,
57
+ lg: 992px,
58
+ xl: 1280px,
59
+ )
60
+ )
41
61
  )
42
62
  );
43
63
 
@@ -63,7 +83,17 @@
63
83
  if(
64
84
  variable-exists(grid-breakpoints),
65
85
  $grid-breakpoints,
66
- $cadmin-grid-breakpoints
86
+ if(
87
+ variable-exists(cadmin-grid-breakpoints),
88
+ $cadmin-grid-breakpoints,
89
+ (
90
+ xs: 0,
91
+ sm: 576px,
92
+ md: 768px,
93
+ lg: 992px,
94
+ xl: 1280px,
95
+ )
96
+ )
67
97
  )
68
98
  );
69
99
 
@@ -95,7 +125,17 @@
95
125
  if(
96
126
  variable-exists(grid-breakpoints),
97
127
  $grid-breakpoints,
98
- $cadmin-grid-breakpoints
128
+ if(
129
+ variable-exists(cadmin-grid-breakpoints),
130
+ $cadmin-grid-breakpoints,
131
+ (
132
+ xs: 0,
133
+ sm: 576px,
134
+ md: 768px,
135
+ lg: 992px,
136
+ xl: 1280px,
137
+ )
138
+ )
99
139
  )
100
140
  );
101
141
 
@@ -553,13 +553,15 @@
553
553
  $mobile-c-inner: map-merge(
554
554
  (
555
555
  enabled:
556
- setter(
557
- if(
558
- variable-exists(enable-c-inner),
559
- $enable-c-inner,
560
- $cadmin-enable-c-inner
561
- ),
562
- true
556
+ if(
557
+ variable-exists(enable-c-inner),
558
+ $enable-c-inner,
559
+ $cadmin-enable-c-inner
560
+ if(
561
+ variable-exists(cadmin-enable-c-inner),
562
+ $cadmin-enable-c-inner,
563
+ true
564
+ )
563
565
  ),
564
566
  margin-bottom: math-sign(map-get($mobile, padding-bottom)),
565
567
  margin-left: math-sign(map-get($mobile, padding-left)),
@@ -569,28 +571,23 @@
569
571
  $mobile-c-inner
570
572
  );
571
573
 
572
- $unset: setter(
573
- if(
574
- variable-exists(clay-unset-placeholder),
575
- $clay-unset-placeholder,
576
- $cadmin-clay-unset-placeholder
577
- ),
574
+ $loading-animation: setter(
575
+ map-get($map, loading-animation),
578
576
  clay-unset-placeholder
579
577
  );
580
578
 
581
- $loading-animation: setter(map-get($map, loading-animation), $unset);
582
-
583
579
  $c-inner: setter(map-get($map, c-inner), ());
584
580
  $c-inner: map-merge(
585
581
  (
586
582
  enabled:
587
- setter(
583
+ if(
584
+ variable-exists(enable-c-inner),
585
+ $enable-c-inner,
588
586
  if(
589
- variable-exists(enable-c-inner),
590
- $enable-c-inner,
591
- $cadmin-enable-c-inner
592
- ),
593
- true
587
+ variable-exists(cadmin-enable-c-inner),
588
+ $cadmin-enable-c-inner,
589
+ true
590
+ )
594
591
  ),
595
592
  margin-bottom: math-sign(map-get($map, padding-bottom)),
596
593
  margin-left: math-sign(map-get($map, padding-left)),
@@ -1059,7 +1059,11 @@
1059
1059
  if(
1060
1060
  variable-exists(card-border-color),
1061
1061
  $card-border-color,
1062
- $cadmin-card-border-color
1062
+ if(
1063
+ variable-exists(cadmin-card-border-color),
1064
+ $cadmin-card-border-color,
1065
+ null
1066
+ )
1063
1067
  )
1064
1068
  ),
1065
1069
  border-style:
@@ -1144,7 +1148,11 @@
1144
1148
  if(
1145
1149
  variable-exists(link-cursor),
1146
1150
  $link-cursor,
1147
- $cadmin-link-cursor
1151
+ if(
1152
+ variable-exists(cadmin-link-cursor),
1153
+ $cadmin-link-cursor,
1154
+ null
1155
+ )
1148
1156
  )
1149
1157
  ),
1150
1158
  )
@@ -330,13 +330,14 @@
330
330
  $c-inner: map-merge(
331
331
  (
332
332
  enabled:
333
- setter(
333
+ if(
334
+ variable-exists(enable-c-inner),
335
+ $enable-c-inner,
334
336
  if(
335
- variable-exists(enable-c-inner),
336
- $enable-c-inner,
337
- $cadmin-enable-c-inner
338
- ),
339
- true
337
+ variable-exists(cadmin-enable-c-inner),
338
+ $cadmin-enable-c-inner,
339
+ true
340
+ )
340
341
  ),
341
342
  margin-bottom: math-sign(map-get($map, padding-bottom)),
342
343
  margin-left: math-sign(map-get($map, padding-left)),