@carbon/elements 10.52.0 → 10.54.0-rc.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.
- package/package.json +11 -11
- package/scss/grid/_inlined/_mixins.import.scss +2 -2
- package/scss/grid/_mixins.import.scss +2 -2
- package/scss/grid/modules/_breakpoint.scss +3 -3
- package/scss/grid/modules/_css-grid.scss +3 -3
- package/scss/grid/modules/_flex-grid.scss +18 -18
- package/scss/grid/modules/_mixins.scss +11 -11
- package/scss/grid/vendor/@carbon/import-once/import-once.scss +1 -1
- package/scss/grid/vendor/@carbon/layout/_key-height.import.scss +2 -2
- package/scss/grid/vendor/@carbon/layout/modules/_utilities.scss +3 -3
- package/scss/import-once/import-once.scss +1 -1
- package/scss/layout/_key-height.import.scss +2 -2
- package/scss/layout/modules/_utilities.scss +3 -3
- package/scss/type/_inlined/_reset.scss +1 -1
- package/scss/type/_inlined/_scale.scss +1 -1
- package/scss/type/_inlined/_styles.import.scss +3 -3
- package/scss/type/_inlined/_styles.scss +1 -1
- package/scss/type/_styles.import.scss +3 -3
- package/scss/type/modules/_font-family.scss +13 -11
- package/scss/type/modules/_scale.scss +2 -1
- package/scss/type/modules/_styles.scss +7 -11
- package/scss/type/vendor/@carbon/grid/12.scss +41 -0
- package/scss/type/vendor/@carbon/grid/_inlined/12.scss +41 -0
- package/scss/type/vendor/@carbon/grid/_inlined/_mixins.import.scss +431 -0
- package/scss/type/vendor/@carbon/grid/_inlined/_mixins.scss +415 -0
- package/scss/type/vendor/@carbon/grid/_inlined/_prefix.scss +12 -0
- package/scss/type/vendor/@carbon/grid/_mixins.import.scss +431 -0
- package/scss/type/vendor/@carbon/grid/_mixins.scss +415 -0
- package/scss/type/vendor/@carbon/grid/_prefix.scss +12 -0
- package/scss/type/vendor/@carbon/grid/grid.scss +10 -0
- package/scss/type/vendor/@carbon/grid/index.scss +10 -0
- package/scss/{grid/vendor/@carbon/layout → type/vendor/@carbon/grid}/modules/_breakpoint.scss +36 -2
- package/scss/type/vendor/@carbon/grid/modules/_config.scss +18 -0
- package/scss/type/vendor/@carbon/grid/modules/_css-grid.scss +347 -0
- package/scss/type/vendor/@carbon/grid/modules/_flex-grid.scss +374 -0
- package/scss/type/vendor/@carbon/grid/modules/_mixins.scss +336 -0
- package/scss/type/vendor/@carbon/grid/vendor/@carbon/import-once/import-once.scss +27 -0
- package/scss/type/vendor/@carbon/grid/vendor/@carbon/import-once/index.scss +8 -0
- package/scss/type/vendor/@carbon/{layout → grid/vendor/@carbon/layout}/_breakpoint.scss +0 -0
- package/scss/type/vendor/@carbon/{layout → grid/vendor/@carbon/layout}/_convert.import.scss +0 -0
- package/scss/type/vendor/@carbon/{layout → grid/vendor/@carbon/layout}/_convert.scss +0 -0
- package/scss/type/vendor/@carbon/{layout → grid/vendor/@carbon/layout}/_key-height.import.scss +2 -2
- package/scss/type/vendor/@carbon/{layout → grid/vendor/@carbon/layout}/_key-height.scss +0 -0
- package/scss/type/vendor/@carbon/{layout → grid/vendor/@carbon/layout}/_mini-unit.scss +0 -0
- package/scss/type/vendor/@carbon/{layout → grid/vendor/@carbon/layout}/_spacing.scss +0 -0
- package/scss/type/vendor/@carbon/{layout → grid/vendor/@carbon/layout}/_utilities.scss +0 -0
- package/scss/type/vendor/@carbon/{layout → grid/vendor/@carbon/layout}/generated/_container.scss +0 -0
- package/scss/type/vendor/@carbon/{layout → grid/vendor/@carbon/layout}/generated/_fluid-spacing.scss +0 -0
- package/scss/type/vendor/@carbon/{layout → grid/vendor/@carbon/layout}/generated/_icon-size.scss +0 -0
- package/scss/type/vendor/@carbon/{layout → grid/vendor/@carbon/layout}/generated/_layout.scss +0 -0
- package/scss/type/vendor/@carbon/{layout → grid/vendor/@carbon/layout}/generated/_size.scss +0 -0
- package/scss/type/vendor/@carbon/{layout → grid/vendor/@carbon/layout}/generated/_spacing.scss +0 -0
- package/scss/type/vendor/@carbon/{layout → grid/vendor/@carbon/layout}/index.scss +0 -0
- package/scss/type/vendor/@carbon/{layout → grid/vendor/@carbon/layout}/layout.scss +0 -0
- package/scss/type/vendor/@carbon/{layout → grid/vendor/@carbon/layout}/modules/_convert.scss +0 -0
- package/scss/type/vendor/@carbon/{layout → grid/vendor/@carbon/layout}/modules/_spacing.scss +0 -0
- package/scss/type/vendor/@carbon/{layout → grid/vendor/@carbon/layout}/modules/_utilities.scss +3 -3
- package/scss/type/vendor/@carbon/{layout → grid/vendor/@carbon/layout}/modules/generated/_fluid-spacing.scss +0 -0
- package/scss/type/vendor/@carbon/{layout → grid/vendor/@carbon/layout}/modules/generated/_spacing.scss +0 -0
- package/scss/type/vendor/@carbon/import-once/import-once.scss +1 -1
- package/scss/layout/modules/_breakpoint.scss +0 -232
- package/scss/type/vendor/@carbon/layout/modules/_breakpoint.scss +0 -232
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@carbon/elements",
|
|
3
3
|
"description": "A collection of design elements in code for the IBM Design Language",
|
|
4
|
-
"version": "10.
|
|
4
|
+
"version": "10.54.0-rc.0",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"main": "lib/index.js",
|
|
7
7
|
"module": "es/index.js",
|
|
@@ -35,21 +35,21 @@
|
|
|
35
35
|
"clean": "rimraf es lib umd && node tasks/clean.js"
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@carbon/colors": "^10.
|
|
39
|
-
"@carbon/grid": "^10.
|
|
40
|
-
"@carbon/icons": "^10.
|
|
41
|
-
"@carbon/import-once": "^10.
|
|
42
|
-
"@carbon/layout": "^10.
|
|
43
|
-
"@carbon/motion": "^10.
|
|
44
|
-
"@carbon/themes": "^10.
|
|
45
|
-
"@carbon/type": "^10.
|
|
38
|
+
"@carbon/colors": "^10.37.0",
|
|
39
|
+
"@carbon/grid": "^10.42.0",
|
|
40
|
+
"@carbon/icons": "^10.48.0-rc.0",
|
|
41
|
+
"@carbon/import-once": "^10.7.0",
|
|
42
|
+
"@carbon/layout": "^10.37.0",
|
|
43
|
+
"@carbon/motion": "^10.29.0",
|
|
44
|
+
"@carbon/themes": "^10.52.0",
|
|
45
|
+
"@carbon/type": "^10.42.0"
|
|
46
46
|
},
|
|
47
47
|
"devDependencies": {
|
|
48
|
-
"@carbon/cli": "^10.
|
|
48
|
+
"@carbon/cli": "^10.34.0",
|
|
49
49
|
"fs-extra": "^10.0.0",
|
|
50
50
|
"klaw-sync": "^6.0.0",
|
|
51
51
|
"replace-in-file": "^3.4.2",
|
|
52
52
|
"rimraf": "^3.0.0"
|
|
53
53
|
},
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "4cb0cf93101e8a4a6a67a950518793e006ed8a07"
|
|
55
55
|
}
|
|
@@ -25,8 +25,8 @@
|
|
|
25
25
|
|
|
26
26
|
@use 'sass:meta';
|
|
27
27
|
@use 'sass:math';
|
|
28
|
-
@import '../vendor/@carbon/layout/breakpoint';
|
|
29
|
-
@import 'prefix';
|
|
28
|
+
@import '../vendor/@carbon/layout/breakpoint';
|
|
29
|
+
@import 'prefix';
|
|
30
30
|
|
|
31
31
|
// -----------------------------------------------------------------------------
|
|
32
32
|
// Columns
|
|
@@ -25,8 +25,8 @@
|
|
|
25
25
|
|
|
26
26
|
@use 'sass:meta';
|
|
27
27
|
@use 'sass:math';
|
|
28
|
-
@import '../layout/breakpoint';
|
|
29
|
-
@import 'prefix';
|
|
28
|
+
@import '../layout/breakpoint';
|
|
29
|
+
@import 'prefix';
|
|
30
30
|
|
|
31
31
|
// -----------------------------------------------------------------------------
|
|
32
32
|
// Columns
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
/// @group @carbon/layout
|
|
21
21
|
@function map-deep-get($map, $keys...) {
|
|
22
22
|
@each $key in $keys {
|
|
23
|
-
$map: map
|
|
23
|
+
$map: map.get($map, $key);
|
|
24
24
|
}
|
|
25
25
|
@return $map;
|
|
26
26
|
}
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
/// @return {String} Desired value
|
|
33
33
|
/// @group @carbon/layout
|
|
34
34
|
@function key-by-index($map, $index) {
|
|
35
|
-
$keys: map
|
|
35
|
+
$keys: map.keys($map);
|
|
36
36
|
@return nth($keys, $index);
|
|
37
37
|
}
|
|
38
38
|
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
/// @return {*} Desired value
|
|
43
43
|
/// @group @carbon/layout
|
|
44
44
|
@function last-map-item($map) {
|
|
45
|
-
$total-length: length($map);
|
|
45
|
+
$total-length: list.length($map);
|
|
46
46
|
@return map-get($map, key-by-index($map, $total-length));
|
|
47
47
|
}
|
|
48
48
|
|
|
@@ -70,11 +70,11 @@
|
|
|
70
70
|
// the width of the column. Applies to IE10+ and Firefox. Chrome and Safari
|
|
71
71
|
// do not appear to require this.
|
|
72
72
|
@if meta.function-exists('div', 'math') {
|
|
73
|
-
max-width: percentage(math.div($span, $columns));
|
|
74
|
-
flex: 0 0 percentage(math.div($span, $columns));
|
|
73
|
+
max-width: math.percentage(math.div($span, $columns));
|
|
74
|
+
flex: 0 0 math.percentage(math.div($span, $columns));
|
|
75
75
|
} @else {
|
|
76
|
-
max-width: percentage(($span / $columns));
|
|
77
|
-
flex: 0 0 percentage(($span / $columns));
|
|
76
|
+
max-width: math.percentage(($span / $columns));
|
|
77
|
+
flex: 0 0 math.percentage(($span / $columns));
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
80
|
}
|
|
@@ -94,7 +94,7 @@
|
|
|
94
94
|
@if $offset == 0 {
|
|
95
95
|
margin-left: 0;
|
|
96
96
|
} @else {
|
|
97
|
-
margin-left: percentage($offset);
|
|
97
|
+
margin-left: math.percentage($offset);
|
|
98
98
|
}
|
|
99
99
|
}
|
|
100
100
|
|
|
@@ -113,7 +113,7 @@
|
|
|
113
113
|
|
|
114
114
|
@each $breakpoint in map-keys($breakpoints) {
|
|
115
115
|
$infix: breakpoint-infix($breakpoint);
|
|
116
|
-
$columns: map
|
|
116
|
+
$columns: map.get(map.get($breakpoints, $breakpoint), columns);
|
|
117
117
|
|
|
118
118
|
// Allow columns to stretch full width below their breakpoints
|
|
119
119
|
@for $i from 0 through $columns {
|
|
@@ -257,11 +257,11 @@
|
|
|
257
257
|
@include -set-largest-breakpoint();
|
|
258
258
|
|
|
259
259
|
@each $name, $value in $breakpoints {
|
|
260
|
-
$prev-breakpoint: map
|
|
261
|
-
$margin: map
|
|
260
|
+
$prev-breakpoint: map.get($breakpoints, breakpoint-prev($name));
|
|
261
|
+
$margin: map.get($value, margin);
|
|
262
262
|
|
|
263
263
|
@if $prev-breakpoint {
|
|
264
|
-
$prev-margin: map
|
|
264
|
+
$prev-margin: map.get($prev-breakpoint, margin);
|
|
265
265
|
@if $prev-margin != $margin {
|
|
266
266
|
@include breakpoint($name) {
|
|
267
267
|
padding-right: #{($grid-gutter * 0.5) + $margin};
|
|
@@ -284,7 +284,7 @@
|
|
|
284
284
|
@mixin -set-largest-breakpoint($breakpoints: $grid-breakpoints) {
|
|
285
285
|
$largest-breakpoint: last-map-item($breakpoints);
|
|
286
286
|
|
|
287
|
-
max-width: map
|
|
287
|
+
max-width: map.get($largest-breakpoint, 'width');
|
|
288
288
|
}
|
|
289
289
|
|
|
290
290
|
/// Add in the max-widths for each breakpoint to the container
|
|
@@ -294,7 +294,7 @@
|
|
|
294
294
|
@mixin -make-container-max-widths($breakpoints: $grid-breakpoints) {
|
|
295
295
|
@each $name, $value in $breakpoints {
|
|
296
296
|
@include breakpoint($name) {
|
|
297
|
-
max-width: map
|
|
297
|
+
max-width: map.get($value, width);
|
|
298
298
|
}
|
|
299
299
|
}
|
|
300
300
|
}
|
|
@@ -341,26 +341,26 @@
|
|
|
341
341
|
}
|
|
342
342
|
|
|
343
343
|
@if $flex-grid-columns == 12 {
|
|
344
|
-
$flex-12-column-grid: map
|
|
344
|
+
$flex-12-column-grid: map.merge(
|
|
345
345
|
$grid-breakpoints,
|
|
346
346
|
(
|
|
347
347
|
lg:
|
|
348
|
-
map
|
|
349
|
-
map
|
|
348
|
+
map.merge(
|
|
349
|
+
map.get($grid-breakpoints, lg),
|
|
350
350
|
(
|
|
351
351
|
columns: 12,
|
|
352
352
|
)
|
|
353
353
|
),
|
|
354
354
|
xlg:
|
|
355
|
-
map
|
|
356
|
-
map
|
|
355
|
+
map.merge(
|
|
356
|
+
map.get($grid-breakpoints, xlg),
|
|
357
357
|
(
|
|
358
358
|
columns: 12,
|
|
359
359
|
)
|
|
360
360
|
),
|
|
361
361
|
max:
|
|
362
|
-
map
|
|
363
|
-
map
|
|
362
|
+
map.merge(
|
|
363
|
+
map.get($grid-breakpoints, max),
|
|
364
364
|
(
|
|
365
365
|
columns: 12,
|
|
366
366
|
)
|
|
@@ -65,11 +65,11 @@
|
|
|
65
65
|
// the width of the column. Applies to IE10+ and Firefox. Chrome and Safari
|
|
66
66
|
// do not appear to require this.
|
|
67
67
|
@if meta.function-exists('div', 'math') {
|
|
68
|
-
max-width: percentage(math.div($span, $columns));
|
|
69
|
-
flex: 0 0 percentage(math.div($span, $columns));
|
|
68
|
+
max-width: math.percentage(math.div($span, $columns));
|
|
69
|
+
flex: 0 0 math.percentage(math.div($span, $columns));
|
|
70
70
|
} @else {
|
|
71
|
-
max-width: percentage(($span / $columns));
|
|
72
|
-
flex: 0 0 percentage(($span / $columns));
|
|
71
|
+
max-width: math.percentage(($span / $columns));
|
|
72
|
+
flex: 0 0 math.percentage(($span / $columns));
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
75
|
}
|
|
@@ -89,7 +89,7 @@
|
|
|
89
89
|
@if $offset == 0 {
|
|
90
90
|
margin-left: 0;
|
|
91
91
|
} @else {
|
|
92
|
-
margin-left: percentage($offset);
|
|
92
|
+
margin-left: math.percentage($offset);
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
95
|
|
|
@@ -108,7 +108,7 @@
|
|
|
108
108
|
|
|
109
109
|
@each $breakpoint in map-keys($breakpoints) {
|
|
110
110
|
$infix: breakpoint-infix($breakpoint);
|
|
111
|
-
$columns: map
|
|
111
|
+
$columns: map.get(map.get($breakpoints, $breakpoint), columns);
|
|
112
112
|
|
|
113
113
|
// Allow columns to stretch full width below their breakpoints
|
|
114
114
|
@for $i from 0 through $columns {
|
|
@@ -252,11 +252,11 @@
|
|
|
252
252
|
@include -set-largest-breakpoint();
|
|
253
253
|
|
|
254
254
|
@each $name, $value in $breakpoints {
|
|
255
|
-
$prev-breakpoint: map
|
|
256
|
-
$margin: map
|
|
255
|
+
$prev-breakpoint: map.get($breakpoints, breakpoint-prev($name));
|
|
256
|
+
$margin: map.get($value, margin);
|
|
257
257
|
|
|
258
258
|
@if $prev-breakpoint {
|
|
259
|
-
$prev-margin: map
|
|
259
|
+
$prev-margin: map.get($prev-breakpoint, margin);
|
|
260
260
|
@if $prev-margin != $margin {
|
|
261
261
|
@include breakpoint($name) {
|
|
262
262
|
padding-right: #{($grid-gutter * 0.5) + $margin};
|
|
@@ -279,7 +279,7 @@
|
|
|
279
279
|
@mixin -set-largest-breakpoint($breakpoints: $grid-breakpoints) {
|
|
280
280
|
$largest-breakpoint: last-map-item($breakpoints);
|
|
281
281
|
|
|
282
|
-
max-width: map
|
|
282
|
+
max-width: map.get($largest-breakpoint, 'width');
|
|
283
283
|
}
|
|
284
284
|
|
|
285
285
|
/// Add in the max-widths for each breakpoint to the container
|
|
@@ -289,7 +289,7 @@
|
|
|
289
289
|
@mixin -make-container-max-widths($breakpoints: $grid-breakpoints) {
|
|
290
290
|
@each $name, $value in $breakpoints {
|
|
291
291
|
@include breakpoint($name) {
|
|
292
|
-
max-width: map
|
|
292
|
+
max-width: map.get($value, width);
|
|
293
293
|
}
|
|
294
294
|
}
|
|
295
295
|
}
|
|
@@ -18,7 +18,7 @@ $imported-modules: () !default;
|
|
|
18
18
|
/// @content Declaration blocks to be imported
|
|
19
19
|
/// @group @carbon/import-once
|
|
20
20
|
@mixin exports($name, $warn: false) {
|
|
21
|
-
@if (index($imported-modules, $name)
|
|
21
|
+
@if not(index($imported-modules, $name)) {
|
|
22
22
|
$imported-modules: append($imported-modules, $name) !global;
|
|
23
23
|
@content;
|
|
24
24
|
} @else if $warn == true {
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
|
|
22
22
|
@use 'sass:meta';
|
|
23
23
|
@use "sass:math";
|
|
24
|
-
@import 'breakpoint';
|
|
25
|
-
@import 'utilities';
|
|
24
|
+
@import 'breakpoint';
|
|
25
|
+
@import 'utilities';
|
|
26
26
|
|
|
27
27
|
/// Get the column width for a given breakpoint
|
|
28
28
|
/// @param {String} $breakpoint
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
/// @group @carbon/layout
|
|
15
15
|
@function map-deep-get($map, $keys...) {
|
|
16
16
|
@each $key in $keys {
|
|
17
|
-
$map: map
|
|
17
|
+
$map: map.get($map, $key);
|
|
18
18
|
}
|
|
19
19
|
@return $map;
|
|
20
20
|
}
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
/// @return {String} Desired value
|
|
27
27
|
/// @group @carbon/layout
|
|
28
28
|
@function key-by-index($map, $index) {
|
|
29
|
-
$keys: map
|
|
29
|
+
$keys: map.keys($map);
|
|
30
30
|
@return nth($keys, $index);
|
|
31
31
|
}
|
|
32
32
|
|
|
@@ -36,6 +36,6 @@
|
|
|
36
36
|
/// @return {*} Desired value
|
|
37
37
|
/// @group @carbon/layout
|
|
38
38
|
@function last-map-item($map) {
|
|
39
|
-
$total-length: length($map);
|
|
39
|
+
$total-length: list.length($map);
|
|
40
40
|
@return map-get($map, carbon--key-by-index($map, $total-length));
|
|
41
41
|
}
|
|
@@ -18,7 +18,7 @@ $imported-modules: () !default;
|
|
|
18
18
|
/// @content Declaration blocks to be imported
|
|
19
19
|
/// @group @carbon/import-once
|
|
20
20
|
@mixin exports($name, $warn: false) {
|
|
21
|
-
@if (index($imported-modules, $name)
|
|
21
|
+
@if not(index($imported-modules, $name)) {
|
|
22
22
|
$imported-modules: append($imported-modules, $name) !global;
|
|
23
23
|
@content;
|
|
24
24
|
} @else if $warn == true {
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
|
|
22
22
|
@use 'sass:meta';
|
|
23
23
|
@use "sass:math";
|
|
24
|
-
@import 'breakpoint';
|
|
25
|
-
@import 'utilities';
|
|
24
|
+
@import 'breakpoint';
|
|
25
|
+
@import 'utilities';
|
|
26
26
|
|
|
27
27
|
/// Get the column width for a given breakpoint
|
|
28
28
|
/// @param {String} $breakpoint
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
/// @group @carbon/layout
|
|
15
15
|
@function map-deep-get($map, $keys...) {
|
|
16
16
|
@each $key in $keys {
|
|
17
|
-
$map: map
|
|
17
|
+
$map: map.get($map, $key);
|
|
18
18
|
}
|
|
19
19
|
@return $map;
|
|
20
20
|
}
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
/// @return {String} Desired value
|
|
27
27
|
/// @group @carbon/layout
|
|
28
28
|
@function key-by-index($map, $index) {
|
|
29
|
-
$keys: map
|
|
29
|
+
$keys: map.keys($map);
|
|
30
30
|
@return nth($keys, $index);
|
|
31
31
|
}
|
|
32
32
|
|
|
@@ -36,6 +36,6 @@
|
|
|
36
36
|
/// @return {*} Desired value
|
|
37
37
|
/// @group @carbon/layout
|
|
38
38
|
@function last-map-item($map) {
|
|
39
|
-
$total-length: length($map);
|
|
39
|
+
$total-length: list.length($map);
|
|
40
40
|
@return map-get($map, carbon--key-by-index($map, $total-length));
|
|
41
41
|
}
|
|
@@ -21,9 +21,9 @@
|
|
|
21
21
|
|
|
22
22
|
@use "sass:meta";
|
|
23
23
|
@use "sass:math";
|
|
24
|
-
@import '
|
|
25
|
-
@import 'font-family';
|
|
26
|
-
@import 'scale';
|
|
24
|
+
@import '../../layout/breakpoint';
|
|
25
|
+
@import 'font-family';
|
|
26
|
+
@import 'scale';
|
|
27
27
|
|
|
28
28
|
/// @type Map
|
|
29
29
|
/// @access public
|
|
@@ -21,9 +21,9 @@
|
|
|
21
21
|
|
|
22
22
|
@use "sass:meta";
|
|
23
23
|
@use "sass:math";
|
|
24
|
-
@import '../layout/breakpoint';
|
|
25
|
-
@import 'font-family';
|
|
26
|
-
@import 'scale';
|
|
24
|
+
@import '../layout/breakpoint';
|
|
25
|
+
@import 'font-family';
|
|
26
|
+
@import 'scale';
|
|
27
27
|
|
|
28
28
|
/// @type Map
|
|
29
29
|
/// @access public
|
|
@@ -5,6 +5,8 @@
|
|
|
5
5
|
// LICENSE file in the root directory of this source tree.
|
|
6
6
|
//
|
|
7
7
|
|
|
8
|
+
@use 'sass:string';
|
|
9
|
+
|
|
8
10
|
/// Font family fallbacks for: IBM Plex Mono, IBM Plex Sans, IBM Plex Sans
|
|
9
11
|
/// Condensed, IBM Plex Sans Hebrew, and IBM Plex Serif
|
|
10
12
|
/// @type Map
|
|
@@ -12,47 +14,47 @@
|
|
|
12
14
|
/// @group @carbon/type
|
|
13
15
|
$font-families: (
|
|
14
16
|
'mono':
|
|
15
|
-
unquote(
|
|
17
|
+
string.unquote(
|
|
16
18
|
"'IBM Plex Mono', system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', monospace"
|
|
17
19
|
),
|
|
18
20
|
'sans':
|
|
19
|
-
unquote(
|
|
21
|
+
string.unquote(
|
|
20
22
|
"'IBM Plex Sans', system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif"
|
|
21
23
|
),
|
|
22
24
|
'sans-condensed':
|
|
23
|
-
unquote(
|
|
25
|
+
string.unquote(
|
|
24
26
|
"'IBM Plex Sans Condensed', system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif"
|
|
25
27
|
),
|
|
26
28
|
'sans-arabic':
|
|
27
|
-
unquote(
|
|
29
|
+
string.unquote(
|
|
28
30
|
"'IBM Plex Sans Arabic', system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif"
|
|
29
31
|
),
|
|
30
32
|
'sans-devanagari':
|
|
31
|
-
unquote(
|
|
33
|
+
string.unquote(
|
|
32
34
|
"'IBM Plex Sans Devanagari', system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif"
|
|
33
35
|
),
|
|
34
36
|
'sans-hebrew':
|
|
35
|
-
unquote(
|
|
37
|
+
string.unquote(
|
|
36
38
|
"'IBM Plex Sans Hebrew', system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif"
|
|
37
39
|
),
|
|
38
40
|
'sans-jp':
|
|
39
|
-
unquote(
|
|
41
|
+
string.unquote(
|
|
40
42
|
"'IBM Plex Sans JP', system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif"
|
|
41
43
|
),
|
|
42
44
|
'sans-kr':
|
|
43
|
-
unquote(
|
|
45
|
+
string.unquote(
|
|
44
46
|
"'IBM Plex Sans KR', system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif"
|
|
45
47
|
),
|
|
46
48
|
'sans-thai-looped':
|
|
47
|
-
unquote(
|
|
49
|
+
string.unquote(
|
|
48
50
|
"'IBM Plex Sans Thai Looped', system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif"
|
|
49
51
|
),
|
|
50
52
|
'sans-thai':
|
|
51
|
-
unquote(
|
|
53
|
+
string.unquote(
|
|
52
54
|
"'IBM Plex Sans Thai', system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', sans-serif"
|
|
53
55
|
),
|
|
54
56
|
'serif':
|
|
55
|
-
unquote(
|
|
57
|
+
string.unquote(
|
|
56
58
|
"'IBM Plex Serif', system-ui, -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', serif"
|
|
57
59
|
),
|
|
58
60
|
) !default;
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
//
|
|
7
7
|
|
|
8
8
|
@use '@carbon/layout';
|
|
9
|
+
@use 'sass:list';
|
|
9
10
|
|
|
10
11
|
/// Compute the type size for the given type scale step
|
|
11
12
|
/// @param {Number} $step
|
|
@@ -26,7 +27,7 @@
|
|
|
26
27
|
/// @group @carbon/type
|
|
27
28
|
$type-scale: ();
|
|
28
29
|
@for $i from 1 through 23 {
|
|
29
|
-
$type-scale: append($type-scale, layout.rem(get-type-size($i)));
|
|
30
|
+
$type-scale: list.append($type-scale, layout.rem(get-type-size($i)));
|
|
30
31
|
}
|
|
31
32
|
|
|
32
33
|
/// Get the value of a specific step in the type scale
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
|
|
10
10
|
@use 'sass:map';
|
|
11
11
|
@use 'sass:math';
|
|
12
|
-
@use '
|
|
12
|
+
@use '../../grid/modules/breakpoint' as grid;
|
|
13
13
|
@use 'font-family';
|
|
14
14
|
@use 'scale';
|
|
15
15
|
|
|
@@ -716,7 +716,7 @@ $tokens: (
|
|
|
716
716
|
/// @param {Map} $breakpoints [$grid-breakpoints] - Custom breakpoints to use
|
|
717
717
|
/// @access public
|
|
718
718
|
/// @group @carbon/type
|
|
719
|
-
@mixin fluid-type($type-styles, $breakpoints:
|
|
719
|
+
@mixin fluid-type($type-styles, $breakpoints: grid.$grid-breakpoints) {
|
|
720
720
|
// Include the initial styles for the given token by default without any
|
|
721
721
|
// media query guard. This includes `font-size` as a fallback in the case
|
|
722
722
|
// that a browser does not support `calc()`
|
|
@@ -729,7 +729,7 @@ $tokens: (
|
|
|
729
729
|
// token and apply the properties and fluid type size for that given
|
|
730
730
|
// breakpoint
|
|
731
731
|
@each $name, $values in map.get($type-styles, breakpoints) {
|
|
732
|
-
@include
|
|
732
|
+
@include grid.breakpoint($name) {
|
|
733
733
|
@include properties($values);
|
|
734
734
|
@include fluid-type-size($type-styles, $name, $breakpoints);
|
|
735
735
|
}
|
|
@@ -745,7 +745,7 @@ $tokens: (
|
|
|
745
745
|
@mixin fluid-type-size(
|
|
746
746
|
$type-styles,
|
|
747
747
|
$name,
|
|
748
|
-
$breakpoints:
|
|
748
|
+
$breakpoints: grid.$grid-breakpoints
|
|
749
749
|
) {
|
|
750
750
|
// Get the information about the breakpoint we're currently working in. Useful
|
|
751
751
|
// for getting initial width information
|
|
@@ -776,7 +776,7 @@ $tokens: (
|
|
|
776
776
|
|
|
777
777
|
// We can use `breakpoint-next` to see if there is another breakpoint we can
|
|
778
778
|
// use to update `max-font-size` and `max-vw` with larger values
|
|
779
|
-
$next-breakpoint-available:
|
|
779
|
+
$next-breakpoint-available: grid.breakpoint-next($name, $breakpoints);
|
|
780
780
|
$next-fluid-breakpoint-name: null;
|
|
781
781
|
|
|
782
782
|
// We need to figure out what the next available fluid breakpoint is for our
|
|
@@ -788,7 +788,7 @@ $tokens: (
|
|
|
788
788
|
$next-fluid-breakpoint-name: $next-breakpoint-available;
|
|
789
789
|
$next-breakpoint-available: null;
|
|
790
790
|
} @else {
|
|
791
|
-
$next-breakpoint-available:
|
|
791
|
+
$next-breakpoint-available: grid.breakpoint-next(
|
|
792
792
|
$next-breakpoint-available,
|
|
793
793
|
$breakpoints
|
|
794
794
|
);
|
|
@@ -846,11 +846,7 @@ $custom-property-prefix: 'cds' !default;
|
|
|
846
846
|
/// @param {Map} $breakpoints [$grid-breakpoints] - Provide a custom breakpoint map to use
|
|
847
847
|
/// @access public
|
|
848
848
|
/// @group @carbon/type
|
|
849
|
-
@mixin type-style(
|
|
850
|
-
$name,
|
|
851
|
-
$fluid: false,
|
|
852
|
-
$breakpoints: layout.$grid-breakpoints
|
|
853
|
-
) {
|
|
849
|
+
@mixin type-style($name, $fluid: false, $breakpoints: grid.$grid-breakpoints) {
|
|
854
850
|
@if not map.has-key($tokens, $name) {
|
|
855
851
|
@error 'Unable to find a token with the name: `#{$name}`';
|
|
856
852
|
}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
//
|
|
2
|
+
// Copyright IBM Corp. 2018, 2018
|
|
3
|
+
//
|
|
4
|
+
// This source code is licensed under the Apache-2.0 license found in the
|
|
5
|
+
// LICENSE file in the root directory of this source tree.
|
|
6
|
+
//
|
|
7
|
+
|
|
8
|
+
@import 'mixins';
|
|
9
|
+
|
|
10
|
+
/// Overrides `$carbon--grid-breakpoints` to use a 12 column grid instead of the default 16
|
|
11
|
+
/// @type Map
|
|
12
|
+
/// @access public
|
|
13
|
+
/// @group @carbon/grid
|
|
14
|
+
$carbon--12-column-grid: map-merge(
|
|
15
|
+
$carbon--grid-breakpoints,
|
|
16
|
+
(
|
|
17
|
+
lg:
|
|
18
|
+
map-merge(
|
|
19
|
+
map-get($carbon--grid-breakpoints, lg),
|
|
20
|
+
(
|
|
21
|
+
columns: 12,
|
|
22
|
+
)
|
|
23
|
+
),
|
|
24
|
+
xlg:
|
|
25
|
+
map-merge(
|
|
26
|
+
map-get($carbon--grid-breakpoints, xlg),
|
|
27
|
+
(
|
|
28
|
+
columns: 12,
|
|
29
|
+
)
|
|
30
|
+
),
|
|
31
|
+
max:
|
|
32
|
+
map-merge(
|
|
33
|
+
map-get($carbon--grid-breakpoints, max),
|
|
34
|
+
(
|
|
35
|
+
columns: 12,
|
|
36
|
+
)
|
|
37
|
+
),
|
|
38
|
+
)
|
|
39
|
+
);
|
|
40
|
+
|
|
41
|
+
@include carbon--grid($breakpoints: $carbon--12-column-grid);
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
//
|
|
2
|
+
// Copyright IBM Corp. 2018, 2018
|
|
3
|
+
//
|
|
4
|
+
// This source code is licensed under the Apache-2.0 license found in the
|
|
5
|
+
// LICENSE file in the root directory of this source tree.
|
|
6
|
+
//
|
|
7
|
+
|
|
8
|
+
@import 'mixins';
|
|
9
|
+
|
|
10
|
+
/// Overrides `$carbon--grid-breakpoints` to use a 12 column grid instead of the default 16
|
|
11
|
+
/// @type Map
|
|
12
|
+
/// @access public
|
|
13
|
+
/// @group @carbon/grid
|
|
14
|
+
$carbon--12-column-grid: map-merge(
|
|
15
|
+
$carbon--grid-breakpoints,
|
|
16
|
+
(
|
|
17
|
+
lg:
|
|
18
|
+
map-merge(
|
|
19
|
+
map-get($carbon--grid-breakpoints, lg),
|
|
20
|
+
(
|
|
21
|
+
columns: 12,
|
|
22
|
+
)
|
|
23
|
+
),
|
|
24
|
+
xlg:
|
|
25
|
+
map-merge(
|
|
26
|
+
map-get($carbon--grid-breakpoints, xlg),
|
|
27
|
+
(
|
|
28
|
+
columns: 12,
|
|
29
|
+
)
|
|
30
|
+
),
|
|
31
|
+
max:
|
|
32
|
+
map-merge(
|
|
33
|
+
map-get($carbon--grid-breakpoints, max),
|
|
34
|
+
(
|
|
35
|
+
columns: 12,
|
|
36
|
+
)
|
|
37
|
+
),
|
|
38
|
+
)
|
|
39
|
+
);
|
|
40
|
+
|
|
41
|
+
@include carbon--grid($breakpoints: $carbon--12-column-grid);
|