@kirbydesign/designsystem 4.0.22 → 5.0.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 (55) hide show
  1. package/bundles/kirbydesign-designsystem-testing-base.umd.js +58 -36
  2. package/bundles/kirbydesign-designsystem-testing-base.umd.js.map +1 -1
  3. package/bundles/kirbydesign-designsystem-testing-base.umd.min.js +1 -1
  4. package/bundles/kirbydesign-designsystem-testing-base.umd.min.js.map +1 -1
  5. package/bundles/kirbydesign-designsystem.umd.js +34 -14
  6. package/bundles/kirbydesign-designsystem.umd.js.map +1 -1
  7. package/bundles/kirbydesign-designsystem.umd.min.js +1 -1
  8. package/bundles/kirbydesign-designsystem.umd.min.js.map +1 -1
  9. package/esm2015/kirbydesign-designsystem.js +11 -10
  10. package/esm2015/kirbydesign-designsystem.metadata.json +1 -1
  11. package/esm2015/lib/components/calendar/calendar.component.js +1 -1
  12. package/esm2015/lib/components/calendar/calendar.component.metadata.json +1 -1
  13. package/esm2015/lib/components/index.js +2 -1
  14. package/esm2015/lib/components/index.metadata.json +1 -1
  15. package/esm2015/lib/components/item/label/label.component.js +1 -1
  16. package/esm2015/lib/components/item/label/label.component.metadata.json +1 -1
  17. package/esm2015/lib/components/item-group/item-group.component.js +17 -0
  18. package/esm2015/lib/components/item-group/item-group.component.metadata.json +1 -0
  19. package/esm2015/lib/components/modal/modal-wrapper/modal-wrapper.component.js +1 -1
  20. package/esm2015/lib/components/modal/modal-wrapper/modal-wrapper.component.metadata.json +1 -1
  21. package/esm2015/lib/components/tabs/tab-button/tab-button.component.js +1 -1
  22. package/esm2015/lib/components/tabs/tab-button/tab-button.component.metadata.json +1 -1
  23. package/esm2015/lib/kirby.module.js +3 -1
  24. package/esm2015/lib/kirby.module.metadata.json +1 -1
  25. package/esm2015/testing-base/kirbydesign-designsystem-testing-base.js +30 -29
  26. package/esm2015/testing-base/kirbydesign-designsystem-testing-base.metadata.json +1 -1
  27. package/esm2015/testing-base/lib/components/mock.item-group.component.js +19 -0
  28. package/esm2015/testing-base/lib/components/mock.item-group.component.metadata.json +1 -0
  29. package/esm2015/testing-base/lib/mock-components.js +3 -1
  30. package/esm2015/testing-base/lib/mock-components.metadata.json +1 -1
  31. package/fesm2015/kirbydesign-designsystem-testing-base.js +20 -2
  32. package/fesm2015/kirbydesign-designsystem-testing-base.js.map +1 -1
  33. package/fesm2015/kirbydesign-designsystem.js +22 -5
  34. package/fesm2015/kirbydesign-designsystem.js.map +1 -1
  35. package/kirbydesign-designsystem.d.ts +10 -9
  36. package/kirbydesign-designsystem.metadata.json +1 -1
  37. package/lib/components/index.d.ts +1 -0
  38. package/lib/components/item-group/item-group.component.d.ts +3 -0
  39. package/package.json +2 -2
  40. package/scss/_global-styles.scss +46 -43
  41. package/scss/_utils.scss +7 -4
  42. package/scss/base/_functions.scss +35 -28
  43. package/scss/base/_ionic.scss +9 -5
  44. package/scss/base/_list.scss +11 -0
  45. package/scss/base/_typography.scss +30 -28
  46. package/scss/base/_variables.scss +16 -14
  47. package/scss/print/_index.scss +3 -3
  48. package/scss/print/components/_index.scss +7 -7
  49. package/scss/print/elements/_index.scss +3 -3
  50. package/scss/print/generic/_index.scss +4 -4
  51. package/scss/themes/_colors.scss +14 -12
  52. package/testing-base/kirbydesign-designsystem-testing-base.d.ts +29 -28
  53. package/testing-base/kirbydesign-designsystem-testing-base.metadata.json +1 -1
  54. package/testing-base/lib/components/mock.item-group.component.d.ts +2 -0
  55. package/scss/base/_include-media.scss +0 -589
@@ -17,6 +17,7 @@ export { GridComponent } from './grid/grid.component';
17
17
  export { GridCardConfiguration } from './grid/grid-card-configuration';
18
18
  export * from './icon';
19
19
  export * from './item';
20
+ export { ItemGroupComponent } from './item-group/item-group.component';
20
21
  export * from './loading-overlay';
21
22
  export * from './list';
22
23
  export * from './reorder-list';
@@ -0,0 +1,3 @@
1
+ export declare class ItemGroupComponent {
2
+ role: string;
3
+ }
package/package.json CHANGED
@@ -1,11 +1,11 @@
1
1
  {
2
2
  "name": "@kirbydesign/designsystem",
3
- "version": "4.0.22",
3
+ "version": "5.0.1",
4
4
  "dependencies": {
5
5
  "chart.js": "3.3.2",
6
6
  "chartjs-plugin-annotation": "1.0.2",
7
7
  "@ionic/angular": "5.5.2",
8
- "@kirbydesign/core": "0.0.10",
8
+ "@kirbydesign/core": "0.0.11",
9
9
  "date-fns": "2.21.1",
10
10
  "date-fns-tz": "1.1.4",
11
11
  "highcharts": "8.0.4",
@@ -1,16 +1,19 @@
1
- @import 'utils';
2
- @import './base/ionic';
3
- @import './base/typography';
4
- @import './base/line-clamp';
1
+ @use "sass:map";
2
+ @use "sass:math";
3
+ @use 'utils';
4
+ @use 'base/ionic';
5
+ @use 'base/typography';
6
+ @use 'base/line-clamp';
7
+ @use 'base/list';
5
8
 
6
9
  :root,
7
10
  :host {
8
11
  --kirby-font-family: 'Roboto';
9
12
  font-family: var(--kirby-font-family);
10
- @each $color, $color-name in $kirby-colors {
13
+ @each $color, $color-name in utils.$kirby-colors {
11
14
  --kirby-#{$color}: #{$color-name};
12
15
  }
13
- @each $color, $color-name in $text-colors {
16
+ @each $color, $color-name in utils.$text-colors {
14
17
  --kirby-text-color-#{$color}: #{$color-name};
15
18
  }
16
19
  --kirby-page-max-width: 1366px;
@@ -26,12 +29,12 @@
26
29
  }
27
30
 
28
31
  @function get-drawer-additional-padding-top() {
29
- $modal-close-button-inner-height: size('l'); // Todo: Move to / get from shared var
30
- $modal-close-button-vertical-margin: size('xxxs') * 2; // Todo: Move to / get from shared var
32
+ $modal-close-button-inner-height: utils.size('l'); // Todo: Move to / get from shared var
33
+ $modal-close-button-vertical-margin: utils.size('xxxs') * 2; // Todo: Move to / get from shared var
31
34
  $modal-header-vertical-padding: 3px * 2; // 3px defined by Ionic
32
35
  $modal-header-total-height: $modal-close-button-inner-height + $modal-close-button-vertical-margin +
33
36
  $modal-header-vertical-padding;
34
- $modal-header-vertical-center: round($modal-header-total-height / 2);
37
+ $modal-header-vertical-center: math.round($modal-header-total-height * 0.5);
35
38
  @return $modal-header-vertical-center;
36
39
  }
37
40
 
@@ -66,19 +69,19 @@ ion-modal.kirby-overlay {
66
69
 
67
70
  &.kirby-modal {
68
71
  box-sizing: border-box;
69
- --background: var(--kirby-modal-background, #{get-color('background-color')});
72
+ --background: var(--kirby-modal-background, #{utils.get-color('background-color')});
70
73
  --border-radius: 0;
71
74
  --height: auto;
72
75
 
73
76
  &.kirby-modal-compact {
74
- --border-radius: #{$border-radius};
75
- --max-width: #{$compact-modal-max-width};
77
+ --border-radius: #{utils.$border-radius};
78
+ --max-width: #{utils.$compact-modal-max-width};
76
79
  text-align: center;
77
80
  }
78
81
 
79
82
  &.kirby-drawer {
80
- --min-height: #{$drawer-default-height};
81
- --kirby-modal-padding-top: calc(var(--kirby-safe-area-top, 0px) + #{size('m')});
83
+ --min-height: #{utils.$drawer-default-height};
84
+ --kirby-modal-padding-top: calc(var(--kirby-safe-area-top, 0px) + #{utils.size('m')});
82
85
  padding-top: var(--kirby-modal-padding-top);
83
86
  align-items: flex-end;
84
87
 
@@ -89,12 +92,12 @@ ion-modal.kirby-overlay {
89
92
  }
90
93
 
91
94
  .modal-wrapper {
92
- border-top-left-radius: #{$border-radius};
93
- border-top-right-radius: #{$border-radius};
95
+ border-top-left-radius: #{utils.$border-radius};
96
+ border-top-right-radius: #{utils.$border-radius};
94
97
  }
95
98
  }
96
99
 
97
- @include media('<medium') {
100
+ @include utils.media('<medium') {
98
101
  &:not(.kirby-drawer):not(.kirby-modal-compact) {
99
102
  --height: 100%;
100
103
  }
@@ -106,43 +109,43 @@ ion-modal.kirby-overlay {
106
109
 
107
110
  &.modal-card:not(.kirby-drawer) {
108
111
  .modal-wrapper {
109
- @include media('<medium') {
112
+ @include utils.media('<medium') {
110
113
  // Reset Ionic Card style height + top border radius:
111
114
  --height: 100%;
112
115
  border-top-left-radius: 0;
113
116
  border-top-right-radius: 0;
114
117
  }
115
118
 
116
- @include media('>=medium') {
119
+ @include utils.media('>=medium') {
117
120
  // Reset Ionic Card style border radius:
118
- border-radius: $border-radius;
121
+ border-radius: utils.$border-radius;
119
122
  }
120
123
  }
121
124
  }
122
125
 
123
- @include media('>=medium') {
124
- --width: #{$modal-max-width};
125
- --border-radius: #{$border-radius};
126
- --box-shadow: #{get-elevation(8)};
126
+ @include utils.media('>=medium') {
127
+ --width: #{utils.$modal-max-width};
128
+ --border-radius: #{utils.$border-radius};
129
+ --box-shadow: #{utils.get-elevation(8)};
127
130
 
128
131
  &:not(.kirby-modal-compact) {
129
132
  --max-height: 100%;
130
- --kirby-modal-padding-top-base: #{size('xl')};
133
+ --kirby-modal-padding-top-base: #{utils.size('xl')};
131
134
  --kirby-modal-padding-top: var(--kirby-modal-padding-top-base);
132
135
  padding-top: var(--kirby-modal-padding-top);
133
136
 
134
137
  &:not(.kirby-drawer) {
135
- --min-height: #{$modal-default-height};
138
+ --min-height: #{utils.$modal-default-height};
136
139
  align-items: flex-start;
137
140
 
138
141
  &.kirby-modal-small {
139
- --min-height: #{map-get($modal-heights, 's')};
142
+ --min-height: #{map.get(utils.$modal-heights, 's')};
140
143
  }
141
144
  &.kirby-modal-medium {
142
- --min-height: #{map-get($modal-heights, 'm')};
145
+ --min-height: #{map.get(utils.$modal-heights, 'm')};
143
146
  }
144
147
  &.kirby-modal-large {
145
- --min-height: #{map-get($modal-heights, 'l')};
148
+ --min-height: #{map.get(utils.$modal-heights, 'l')};
146
149
  }
147
150
 
148
151
  &.kirby-modal-full-height .modal-wrapper,
@@ -182,12 +185,12 @@ ion-modal.kirby-overlay {
182
185
  }
183
186
 
184
187
  &.kirby-alert {
185
- --background: #{get-color('background-color')};
186
- --border-radius: #{$border-radius};
187
- --box-shadow: #{get-elevation(8)};
188
+ --background: #{utils.get-color('background-color')};
189
+ --border-radius: #{utils.$border-radius};
190
+ --box-shadow: #{utils.get-elevation(8)};
188
191
 
189
192
  .modal-wrapper {
190
- max-width: $alert-max-width;
193
+ max-width: utils.$alert-max-width;
191
194
  height: auto;
192
195
  text-align: center;
193
196
  }
@@ -195,8 +198,8 @@ ion-modal.kirby-overlay {
195
198
  }
196
199
 
197
200
  ion-loading.kirby-loading-overlay {
198
- --backdrop-opacity: #{$loading-overlay-backdrop-opacity};
199
- --ion-backdrop-color: #{get-color('background-color')};
201
+ --backdrop-opacity: #{utils.$loading-overlay-backdrop-opacity};
202
+ --ion-backdrop-color: #{utils.get-color('background-color')};
200
203
  .loading-wrapper {
201
204
  --background: transparent;
202
205
  }
@@ -208,15 +211,15 @@ ion-loading.kirby-loading-overlay {
208
211
  text-align: center;
209
212
 
210
213
  // Set default colors
211
- --background: #{get-color('success')};
212
- --color: #{get-color('success-contrast')};
213
- --button-color: #{get-color('success-contrast')};
214
+ --background: #{utils.get-color('success')};
215
+ --color: #{utils.get-color('success-contrast')};
216
+ --button-color: #{utils.get-color('success-contrast')};
214
217
 
215
- @each $color-name, $color-value in $notification-colors {
218
+ @each $color-name, $color-value in utils.$notification-colors {
216
219
  &.#{$color-name} {
217
- --background: #{get-color($color-name)};
218
- --color: #{get-color($color-name + '-contrast')};
219
- --button-color: #{get-color($color-name + '-contrast')};
220
+ --background: #{utils.get-color($color-name)};
221
+ --color: #{utils.get-color($color-name + '-contrast')};
222
+ --button-color: #{utils.get-color($color-name + '-contrast')};
220
223
  }
221
224
  }
222
225
  }
@@ -258,5 +261,5 @@ ion-loading.kirby-loading-overlay {
258
261
  background-position: right 50%;
259
262
  background-size: $icon-scaling-factor;
260
263
  //place icon to the right of text, with icons own width + the actual spacing
261
- padding-right: calc(#{$icon-scaling-factor} + #{size('xxxs')});
264
+ padding-right: calc(#{$icon-scaling-factor} + #{utils.size('xxxs')});
262
265
  }
package/scss/_utils.scss CHANGED
@@ -2,7 +2,10 @@
2
2
  General imports for components
3
3
  NOTICE: Must not contain anything that generates classes or else it will be generated for every component that imports this file.
4
4
  */
5
- @import './base/functions';
6
- @import './base/variables';
7
- @import './base/include-media';
8
- @import './themes/colors';
5
+ @use 'base/variables';
6
+ @forward '~include-media/dist/include-media' with (
7
+ $breakpoints: variables.$breakpoints
8
+ );
9
+ @forward 'base/functions';
10
+ @forward 'base/variables' hide $breakpoints;
11
+ @forward 'themes/colors';
@@ -1,6 +1,13 @@
1
+ @use "sass:list";
2
+ @use "sass:map";
3
+ @use "sass:math";
4
+ @use "sass:string";
5
+ @use "../themes/colors";
6
+ @use "variables";
7
+
1
8
  @function _get-map-prop($map, $key) {
2
- @if map-has-key($map, $key) {
3
- @return map-get($map, $key);
9
+ @if map.has-key($map, $key) {
10
+ @return map.get($map, $key);
4
11
  }
5
12
 
6
13
  @error 'Unknown key `#{$key}`.';
@@ -8,73 +15,73 @@
8
15
  }
9
16
 
10
17
  @function size($key: 'm') {
11
- $negative: str-index($key, '-') == 1;
18
+ $negative: string.index($key, '-') == 1;
12
19
  @if ($negative) {
13
- $key: str-slice($key, 2, -1);
20
+ $key: string.slice($key, 2, -1);
14
21
  }
15
- $value: _get-map-prop($sizes, $key);
16
- @return if($negative, unquote('-' + $value), $value);
22
+ $value: _get-map-prop(variables.$sizes, $key);
23
+ @return if($negative, string.unquote('-' + $value), $value);
17
24
  }
18
25
 
19
26
  @function z($key) {
20
- @return _get-map-prop($z-layers, $key);
27
+ @return _get-map-prop(variables.$z-layers, $key);
21
28
  }
22
29
 
23
30
  @function font-size($key: 'n') {
24
31
  @if ($key == 'display') {
25
32
  @warn 'Display key is deprecated';
26
33
  }
27
- @return _get-map-prop($font-sizes, $key);
34
+ @return _get-map-prop(variables.$font-sizes, $key);
28
35
  }
29
36
 
30
37
  @function line-height($key: 'm') {
31
- @return _get-map-prop($line-height, $key);
38
+ @return _get-map-prop(variables.$line-height, $key);
32
39
  }
33
40
 
34
41
  @function font-weight($key: 'normal') {
35
- @return _get-map-prop($font-weight, $key);
42
+ @return _get-map-prop(variables.$font-weight, $key);
36
43
  }
37
44
 
38
45
  @function icon-font-size($size) {
39
- @return map-get($icon-font-sizes, $size);
46
+ @return map.get(variables.$icon-font-sizes, $size);
40
47
  }
41
48
 
42
- @function get-color($variant, $getValueOnly: false, $map: $kirby-colors) {
49
+ @function get-color($variant, $getValueOnly: false, $map: colors.$kirby-colors) {
43
50
  $value: _get-map-prop($map, $variant);
44
51
  @if $getValueOnly == true {
45
52
  @return $value;
46
53
  } @else {
47
- @return unquote('var(--kirby-' + $variant + ')');
54
+ @return string.unquote('var(--kirby-' + $variant + ')');
48
55
  }
49
56
  }
50
57
 
51
58
  @function get-text-color($variant) {
52
- $value: _get-map-prop($text-colors, $variant);
53
- @return unquote('var(--kirby-text-color-' + $variant + ')');
59
+ $value: _get-map-prop(colors.$text-colors, $variant);
60
+ @return string.unquote('var(--kirby-text-color-' + $variant + ')');
54
61
  }
55
62
 
56
63
  @function get-elevation($value) {
57
- @return map-get($elevations, $value);
64
+ @return map.get(variables.$elevations, $value);
58
65
  }
59
66
 
60
67
  @function get-transition-duration($value) {
61
- @return map-get($transition-durations, $value);
68
+ @return map.get(variables.$transition-durations, $value);
62
69
  }
63
70
 
64
71
  @function get-transition-easing($value) {
65
- @return map-get($transition-easings, $value);
72
+ @return map.get(variables.$transition-easings, $value);
66
73
  }
67
74
 
68
75
  @function get-shadow-size($elevation) {
69
76
  $shadow-size: 0;
70
- $shadow-list: map-get($elevations, $elevation);
77
+ $shadow-list: map.get(variables.$elevations, $elevation);
71
78
  @each $shadow in $shadow-list {
72
- $offset-x: abs(_get-shadow-value($shadow, 'offset-x'));
73
- $offset-y: abs(_get-shadow-value($shadow, 'offset-y'));
79
+ $offset-x: math.abs(_get-shadow-value($shadow, 'offset-x'));
80
+ $offset-y: math.abs(_get-shadow-value($shadow, 'offset-y'));
74
81
  $blur-radius: _get-shadow-value($shadow, 'blur-radius');
75
82
  $spread-radius: _get-shadow-value($shadow, 'spread-radius');
76
- $current-shadow-size: max($offset-x, $offset-y) + $blur-radius + $spread-radius;
77
- $shadow-size: max($shadow-size, $current-shadow-size);
83
+ $current-shadow-size: math.max($offset-x, $offset-y) + $blur-radius + $spread-radius;
84
+ $shadow-size: math.max($shadow-size, $current-shadow-size);
78
85
  }
79
86
  @return $shadow-size;
80
87
  }
@@ -86,8 +93,8 @@
86
93
  'blur-radius': 3,
87
94
  'spread-radius': 4,
88
95
  );
89
- $value-index: map-get($shadow-value-map, $valuekey);
90
- @return nth($shadow, $value-index);
96
+ $value-index: map.get($shadow-value-map, $valuekey);
97
+ @return list.nth($shadow, $value-index);
91
98
  }
92
99
 
93
100
  /**
@@ -95,8 +102,8 @@
95
102
  */
96
103
  @function keys-to-classes($map) {
97
104
  $classes: ();
98
- @each $key in map-keys($map) {
99
- $classes: append($classes, '.#{$key}', $separator: comma);
105
+ @each $key in map.keys($map) {
106
+ $classes: list.append($classes, '.#{$key}', $separator: comma);
100
107
  }
101
108
  @return $classes;
102
109
  }
@@ -164,7 +171,7 @@
164
171
 
165
172
  // Ensure minimum click area (default 44 x 44 px)
166
173
  // Ignore rounded corners to ensure square click area
167
- @mixin accessible-target-size($width: $fat-finger-size, $height: $width) {
174
+ @mixin accessible-target-size($width: variables.$fat-finger-size, $height: $width) {
168
175
  position: relative;
169
176
 
170
177
  &::after {
@@ -1,17 +1,21 @@
1
- @import '../base/functions';
2
- @import '../themes/colors';
1
+ @use '../base/functions';
2
+ @use '../themes/colors';
3
3
 
4
4
  /* Core CSS required for Ionic components to work properly */
5
5
  @import '~@ionic/angular/css/core.css';
6
6
 
7
7
  @mixin ionic-color-map($ionic-variant, $kirby-variant: $ionic-variant) {
8
8
  --ion-color-#{$ionic-variant}: var(--kirby-#{$kirby-variant});
9
- --ion-color-#{$ionic-variant}-rgb: #{get-color(#{$kirby-variant}-rgb, true, $kirby-colors)};
9
+ --ion-color-#{$ionic-variant}-rgb: #{functions.get-color(
10
+ #{$kirby-variant}-rgb,
11
+ true,
12
+ colors.$kirby-colors
13
+ )};
10
14
  --ion-color-#{$ionic-variant}-contrast: var(--kirby-#{$kirby-variant}-contrast);
11
- --ion-color-#{$ionic-variant}-contrast-rgb: #{get-color(
15
+ --ion-color-#{$ionic-variant}-contrast-rgb: #{functions.get-color(
12
16
  #{$kirby-variant}-contrast-rgb,
13
17
  true,
14
- $kirby-colors
18
+ colors.$kirby-colors
15
19
  )};
16
20
  --ion-color-#{$ionic-variant}-shade: var(--kirby-#{$kirby-variant}-shade);
17
21
  --ion-color-#{$ionic-variant}-tint: var(--kirby-#{$kirby-variant}-tint);
@@ -0,0 +1,11 @@
1
+ ul,
2
+ ol {
3
+ margin-inline-start: 0.25em;
4
+ padding-inline-start: 1em;
5
+ line-height: 1.5;
6
+ }
7
+
8
+ li li,
9
+ li + li {
10
+ margin-block-start: 0.5em;
11
+ }
@@ -1,3 +1,5 @@
1
+ @use "functions";
2
+
1
3
  @import '~@fontsource/roboto/300.css';
2
4
  @import '~@fontsource/roboto/400.css';
3
5
  @import '~@fontsource/roboto/700.css';
@@ -14,7 +16,7 @@ h4,
14
16
  p,
15
17
  .p {
16
18
  margin: 0;
17
- margin-bottom: size('s');
19
+ margin-bottom: functions.size('s');
18
20
  }
19
21
 
20
22
  kirby-app .page-title {
@@ -29,75 +31,75 @@ kirby-app .page-title {
29
31
  }
30
32
 
31
33
  .kirby-text-display-1 {
32
- font-size: font-size('xxxxl');
33
- font-weight: font-weight('black');
34
+ font-size: functions.font-size('xxxxl');
35
+ font-weight: functions.font-weight('black');
34
36
  line-height: normal;
35
37
  }
36
38
 
37
39
  .kirby-text-display-2 {
38
- font-size: font-size('xxxl');
39
- font-weight: font-weight('black');
40
+ font-size: functions.font-size('xxxl');
41
+ font-weight: functions.font-weight('black');
40
42
  line-height: normal;
41
43
  }
42
44
 
43
45
  .kirby-text-display-3 {
44
- font-size: font-size('xxl');
45
- font-weight: font-weight('black');
46
+ font-size: functions.font-size('xxl');
47
+ font-weight: functions.font-weight('black');
46
48
  line-height: normal;
47
49
  }
48
50
 
49
51
  h1,
50
52
  .h1,
51
53
  .kirby-text-xlarge {
52
- font-size: font-size('xl');
53
- font-weight: font-weight('black');
54
- line-height: line-height('xl');
54
+ font-size: functions.font-size('xl');
55
+ font-weight: functions.font-weight('black');
56
+ line-height: functions.line-height('xl');
55
57
  }
56
58
 
57
59
  h2,
58
60
  .h2,
59
61
  .kirby-text-large {
60
- font-size: font-size('l');
61
- font-weight: font-weight('bold');
62
- line-height: line-height('l');
62
+ font-size: functions.font-size('l');
63
+ font-weight: functions.font-weight('bold');
64
+ line-height: functions.line-height('l');
63
65
  }
64
66
 
65
67
  h3,
66
68
  .h3,
67
69
  .kirby-text-medium {
68
- font-size: font-size('m');
69
- font-weight: font-weight('bold');
70
- line-height: line-height('m');
70
+ font-size: functions.font-size('m');
71
+ font-weight: functions.font-weight('bold');
72
+ line-height: functions.line-height('m');
71
73
  }
72
74
 
73
75
  p,
74
76
  .p,
75
77
  .kirby-text-normal {
76
- font-size: font-size('n');
77
- line-height: line-height('n');
78
+ font-size: functions.font-size('n');
79
+ line-height: functions.line-height('n');
78
80
  }
79
81
 
80
82
  .kirby-text-small {
81
- font-size: font-size('s');
82
- line-height: line-height('s');
83
+ font-size: functions.font-size('s');
84
+ line-height: functions.line-height('s');
83
85
  }
84
86
 
85
87
  .kirby-text-small-light {
86
- font-size: font-size('s');
87
- font-weight: font-weight('light');
88
- line-height: line-height('s');
88
+ font-size: functions.font-size('s');
89
+ font-weight: functions.font-weight('light');
90
+ line-height: functions.line-height('s');
89
91
  }
90
92
 
91
93
  .kirby-text-xsmall {
92
- font-size: font-size('xs');
93
- line-height: line-height('xs');
94
+ font-size: functions.font-size('xs');
95
+ line-height: functions.line-height('xs');
94
96
  }
95
97
 
96
98
  .kirby-text-xxsmall {
97
- font-size: font-size('xxs');
98
- line-height: line-height('xxs');
99
+ font-size: functions.font-size('xxs');
100
+ line-height: functions.line-height('xxs');
99
101
  }
100
102
 
101
103
  .kirby-text-bold {
102
- font-weight: font-weight('bold');
104
+ font-weight: functions.font-weight('bold');
103
105
  }
@@ -1,3 +1,5 @@
1
+ @use "sass:map";
2
+ @use "sass:math";
1
3
  /*
2
4
  SPACINGS
3
5
  ****************************************************************************/
@@ -58,10 +60,10 @@ $font-weight: (
58
60
  /* Icon
59
61
  ****************************************************************************/
60
62
  $icon-font-sizes: (
61
- 'xs': map-get($sizes, 's'),
62
- 'sm': map-get($sizes, 'm'),
63
- 'md': map-get($sizes, 'l'),
64
- 'lg': map-get($sizes, 'xxxl'),
63
+ 'xs': map.get($sizes, 's'),
64
+ 'sm': map.get($sizes, 'm'),
65
+ 'md': map.get($sizes, 'l'),
66
+ 'lg': map.get($sizes, 'xxxl'),
65
67
  ) !default;
66
68
 
67
69
  /*
@@ -130,13 +132,13 @@ $compact-modal-max-width: 359px;
130
132
  $modal-max-width: 720px;
131
133
 
132
134
  $modal-heights: (
133
- s: floor($modal-max-width * 0.4),
134
- m: floor($modal-max-width * 0.64),
135
- l: floor($modal-max-width * 0.8),
135
+ s: math.floor($modal-max-width * 0.4),
136
+ m: math.floor($modal-max-width * 0.64),
137
+ l: math.floor($modal-max-width * 0.8),
136
138
  ) !default;
137
139
 
138
- $modal-default-height: map-get($modal-heights, 'm');
139
- $drawer-default-height: map-get($modal-heights, 's');
140
+ $modal-default-height: map.get($modal-heights, 'm');
141
+ $drawer-default-height: map.get($modal-heights, 's');
140
142
 
141
143
  /* Item
142
144
  ****************************************************************************/
@@ -148,7 +150,7 @@ $item-heights: (
148
150
 
149
151
  /* Dropdown
150
152
  ****************************************************************************/
151
- $dropdown-item-height: map-get($item-heights, 's');
153
+ $dropdown-item-height: map.get($item-heights, 's');
152
154
 
153
155
  /* Button, Checkbox, Page, Radio
154
156
  ****************************************************************************/
@@ -157,14 +159,14 @@ $fat-finger-size: 44px;
157
159
  /* Checkbox, Radio
158
160
  ****************************************************************************/
159
161
  $checkbox-radio-sizes: (
160
- 'xs': map-get($sizes, 'l'),
162
+ 'xs': map.get($sizes, 'l'),
161
163
  'sm': $fat-finger-size,
162
- 'md': map-get($sizes, 'xxxl'),
164
+ 'md': map.get($sizes, 'xxxl'),
163
165
  );
164
166
 
165
167
  $checkbox-radio-spacing: (
166
- 'to-edge': map-get($sizes, 's'),
167
- 'to-label': map-get($sizes, 'xs'),
168
+ 'to-edge': map.get($sizes, 's'),
169
+ 'to-label': map.get($sizes, 'xs'),
168
170
  );
169
171
 
170
172
  /* Transitions
@@ -1,3 +1,3 @@
1
- @import 'generic';
2
- @import 'elements';
3
- @import 'components';
1
+ @forward 'generic';
2
+ @forward 'elements';
3
+ @forward 'components';
@@ -1,7 +1,7 @@
1
- @import 'kirby-app';
2
- @import 'kirby-fab-sheet';
3
- @import 'kirby-list';
4
- @import 'kirby-modal-wrapper';
5
- @import 'kirby-page';
6
- @import 'kirby-router-outlet';
7
- @import 'kirby-tab-bar';
1
+ @forward 'kirby-app';
2
+ @forward 'kirby-fab-sheet';
3
+ @forward 'kirby-list';
4
+ @forward 'kirby-modal-wrapper';
5
+ @forward 'kirby-page';
6
+ @forward 'kirby-router-outlet';
7
+ @forward 'kirby-tab-bar';
@@ -1,3 +1,3 @@
1
- @import 'button';
2
- @import 'page';
3
- @import 'preformatted-text';
1
+ @forward 'button';
2
+ @forward 'page';
3
+ @forward 'preformatted-text';
@@ -1,4 +1,4 @@
1
- @import 'colors';
2
- @import 'page';
3
- @import 'reset';
4
- @import 'typography';
1
+ @forward 'colors';
2
+ @forward 'page';
3
+ @forward 'reset';
4
+ @forward 'typography';