@@ -15,19 +15,23 @@ $_sizes: (
15
15
' xx-large' : $size-xx-large
16
16
);
17
17
18
+ /// Column sizes
19
+ /// @type array
20
+ /// @private
21
+ $_columnSizes : 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 12 ;
22
+
18
23
// All SLDS size classes like `slds-size--medium` and `slds-size--medium-1-of-12` in one string.
19
24
// This is faster for style calculation than `[class*="slds-size_"]`.
20
25
/// @private
21
26
@function all- sizes () {
22
27
$prefixes : ' slds-size_' , ' slds-size--' ;
23
- $columnSizes : 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 12 ;
24
28
25
29
$result : ' ' ;
26
30
@each $prefix in $prefixes {
27
31
@each $size in map-keys ($_sizes ) {
28
32
$result : " #{$result } , .#{$prefix }#{$size } " ;
29
33
}
30
- @each $columnSize in $columnSizes {
34
+ @each $columnSize in $_columnSizes {
31
35
@for $i from 1 through $columnSize {
32
36
$result : " #{$result } , .#{$prefix }#{$i } -of-#{$columnSize } " ;
33
37
}
@@ -37,18 +41,28 @@ $_sizes: (
37
41
@return str-slice ($result , 3 ); // Remove initial ", "
38
42
}
39
43
40
- // All SLDS classes like `slds-small-size_medium` in one string.
44
+ // All SLDS classes like `slds-small-size_medium` and `slds-small-size_1-of-12` in one string.
41
45
// Note that the first size is only a breakpoint size, and the second is all possible sizes.
42
46
// This is faster for style calculation than `[class*="slds-#{$breakpointSize}-size_"]`
43
47
/// @private
44
- @function all- responsive- sizes ($breakpointSize , $prefix ) {
48
+ @function all- responsive- sizes ($breakpointSize , $prefix , $withColumnSizes ) {
45
49
$infixes : ' -size_' , ' -size--' ;
46
50
47
51
$result : ' ' ;
52
+
48
53
@each $infix in $infixes {
54
+ // e.g. `slds-small-size_medium`
49
55
@each $size in map-keys ($_sizes ) {
50
56
$result : " #{$result } , .#{$prefix }#{$breakpointSize }#{$infix }#{$size } " ;
51
57
}
58
+ // e.g. `slds-small-size_1_of_12`
59
+ @if ($withColumnSizes ) {
60
+ @each $columnSize in $_columnSizes {
61
+ @for $i from 1 through $columnSize {
62
+ $result : " #{$result } , .#{$prefix }#{$breakpointSize }#{$infix }#{$i } -of-#{$columnSize } " ;
63
+ }
64
+ }
65
+ }
52
66
}
53
67
@return str-slice ($result , 3 ); // Remove initial ", "
54
68
}
@@ -101,7 +115,7 @@ $_sizes: (
101
115
@media (min-width : #{pem ($breakpoint )} ) {
102
116
103
117
// Fixes issue when sizing is used with slds-col
104
- #{all-responsive-sizes ($size , ' slds-' )} {
118
+ #{all-responsive-sizes ($size , ' slds-' , true )} {
105
119
flex : none ;
106
120
}
107
121
@@ -133,7 +147,7 @@ $_sizes: (
133
147
@media (max-width : #{pem ($breakpoint )} ) {
134
148
135
149
// Fixes issue when sizing is used with slds-col
136
- #{all-responsive-sizes ($size , ' slds-max-' )} {
150
+ #{all-responsive-sizes ($size , ' slds-max-' , false )} {
137
151
flex : none ;
138
152
}
139
153
0 commit comments