@bonniernews/dn-design-system-web 25.0.6-beta.3 → 25.0.6-beta.4
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/components/button/button.scss +8 -8
- package/components/teaser-centered/teaser-centered.scss +1 -1
- package/foundations/helpers/links.scss +4 -6
- package/foundations/helpers/typography.scss +11 -11
- package/foundations/variables/typographyList.scss +1 -1
- package/foundations/variables/typographyScreenExtraLarge.scss +1 -1
- package/foundations/variables/typographyScreenLarge.scss +1 -1
- package/foundations/variables/typographyScreenSmall.scss +2 -2
- package/package.json +1 -1
- package/variables/typography-list.json +1 -1
|
@@ -116,13 +116,13 @@ $ds-btn-outlined__border-width: ds-border-width(xxs);
|
|
|
116
116
|
--ds-btn__icon-size: #{ds-px-to-rem(20px)};
|
|
117
117
|
--ds-btn__icon-padding: #{_btn-brdr(ds-spacing($ds-s-050), true)};
|
|
118
118
|
padding: _btn-brdr(ds-spacing($ds-s-025), true) _btn-brdr(ds-spacing($ds-s-075), true);
|
|
119
|
-
@include ds-typography($
|
|
119
|
+
@include ds-typography($variable: $ds-typography-functional-body-sm, $fontWeight: $ds-fontweight-semibold);
|
|
120
120
|
@at-root .ds-force-px#{&} {
|
|
121
121
|
--ds-btn__icon-size: 20px;
|
|
122
122
|
--ds-btn__icon-padding: #{_btn-brdr(ds-spacing($ds-s-050))};
|
|
123
123
|
padding: _btn-brdr(ds-spacing($ds-s-025)) _btn-brdr(ds-spacing($ds-s-075));
|
|
124
124
|
@include ds-typography(
|
|
125
|
-
$
|
|
125
|
+
$variable: $ds-typography-functional-body-sm,
|
|
126
126
|
$fontWeight: $ds-fontweight-semibold,
|
|
127
127
|
$forcePx: true
|
|
128
128
|
);
|
|
@@ -132,12 +132,12 @@ $ds-btn-outlined__border-width: ds-border-width(xxs);
|
|
|
132
132
|
&.ds-btn--medium {
|
|
133
133
|
--ds-btn__icon-padding: #{_btn-brdr(ds-spacing($ds-s-100), true)};
|
|
134
134
|
padding: _btn-brdr(ds-spacing($ds-s-050), true) _btn-brdr(ds-spacing($ds-s-125), true);
|
|
135
|
-
@include ds-typography($
|
|
135
|
+
@include ds-typography($variable: $ds-typography-functional-body-md, $fontWeight: $ds-fontweight-semibold);
|
|
136
136
|
@at-root .ds-force-px#{&} {
|
|
137
137
|
--ds-btn__icon-padding: #{_btn-brdr(ds-spacing($ds-s-100))};
|
|
138
138
|
padding: _btn-brdr(ds-spacing($ds-s-050)) _btn-brdr(ds-spacing($ds-s-125));
|
|
139
139
|
@include ds-typography(
|
|
140
|
-
$
|
|
140
|
+
$variable: $ds-typography-functional-body-md,
|
|
141
141
|
$fontWeight: $ds-fontweight-semibold,
|
|
142
142
|
$forcePx: true
|
|
143
143
|
);
|
|
@@ -147,13 +147,13 @@ $ds-btn-outlined__border-width: ds-border-width(xxs);
|
|
|
147
147
|
&.ds-btn--large {
|
|
148
148
|
--ds-btn__icon-padding: #{_btn-brdr(ds-spacing($ds-s-125), true)};
|
|
149
149
|
padding: _btn-brdr(ds-spacing($ds-s-075), true) _btn-brdr(ds-spacing($ds-s-150), true);
|
|
150
|
-
@include ds-typography($
|
|
150
|
+
@include ds-typography($variable: $ds-typography-functional-body-md, $fontWeight: $ds-fontweight-semibold);
|
|
151
151
|
|
|
152
152
|
@at-root .ds-force-px#{&} {
|
|
153
153
|
--ds-btn__icon-padding: #{_btn-brdr(ds-spacing($ds-s-125))};
|
|
154
154
|
padding: _btn-brdr(ds-spacing($ds-s-075)) _btn-brdr(ds-spacing($ds-s-150));
|
|
155
155
|
@include ds-typography(
|
|
156
|
-
$
|
|
156
|
+
$variable: $ds-typography-functional-body-md,
|
|
157
157
|
$fontWeight: $ds-fontweight-semibold,
|
|
158
158
|
$forcePx: true
|
|
159
159
|
);
|
|
@@ -164,13 +164,13 @@ $ds-btn-outlined__border-width: ds-border-width(xxs);
|
|
|
164
164
|
--ds-btn__icon-size: #{ds-px-to-rem(32px)};
|
|
165
165
|
--ds-btn__icon-padding: #{_btn-brdr(ds-spacing($ds-s-200), true) - ds-px-to-rem(4px)};
|
|
166
166
|
padding: _btn-brdr(ds-spacing($ds-s-075), true) _btn-brdr(ds-spacing($ds-s-200), true);
|
|
167
|
-
@include ds-typography($
|
|
167
|
+
@include ds-typography($variable: $ds-typography-functional-body-lg, $fontWeight: $ds-fontweight-semibold);
|
|
168
168
|
@at-root .ds-force-px#{&} {
|
|
169
169
|
--ds-btn__icon-size: 32px;
|
|
170
170
|
--ds-btn__icon-padding: #{_btn-brdr(ds-spacing($ds-s-200)) - 4px};
|
|
171
171
|
padding: _btn-brdr(ds-spacing($ds-s-075)) _btn-brdr(ds-spacing($ds-s-200));
|
|
172
172
|
@include ds-typography(
|
|
173
|
-
$
|
|
173
|
+
$variable: $ds-typography-functional-body-lg,
|
|
174
174
|
$fontWeight: $ds-fontweight-semibold,
|
|
175
175
|
$forcePx: true
|
|
176
176
|
);
|
|
@@ -7,8 +7,6 @@ $ds-link-list: "list";
|
|
|
7
7
|
$ds-link-paragraph: "paragraph";
|
|
8
8
|
$ds-link-article-body: "article-body";
|
|
9
9
|
|
|
10
|
-
$ds-text-decoration-link-underline: underline;
|
|
11
|
-
|
|
12
10
|
@mixin ds-link($type: paragraph) {
|
|
13
11
|
&:focus-visible {
|
|
14
12
|
outline-color: $ds-color-border-primary;
|
|
@@ -20,10 +18,10 @@ $ds-text-decoration-link-underline: underline;
|
|
|
20
18
|
@if ($type == $ds-link-list) {
|
|
21
19
|
text-decoration-line: none;
|
|
22
20
|
&:hover {
|
|
23
|
-
text-decoration-line:
|
|
21
|
+
text-decoration-line: underline;
|
|
24
22
|
}
|
|
25
23
|
} @else if ($type == $ds-link-paragraph) {
|
|
26
|
-
text-decoration-line:
|
|
24
|
+
text-decoration-line: underline;
|
|
27
25
|
&:hover {
|
|
28
26
|
text-decoration-line: none;
|
|
29
27
|
}
|
|
@@ -31,7 +29,7 @@ $ds-text-decoration-link-underline: underline;
|
|
|
31
29
|
color: $ds-color-text-primary-subtle;
|
|
32
30
|
}
|
|
33
31
|
} @else if ($type == $ds-link-article-body) {
|
|
34
|
-
text-decoration-line:
|
|
32
|
+
text-decoration-line: underline;
|
|
35
33
|
color: $ds-color-text-body-link;
|
|
36
34
|
&:hover {
|
|
37
35
|
text-decoration-line: none;
|
|
@@ -45,7 +43,7 @@ $ds-text-decoration-link-underline: underline;
|
|
|
45
43
|
}
|
|
46
44
|
|
|
47
45
|
@mixin ds-underline($offset: 2px, $thickness: 2px) {
|
|
48
|
-
text-decoration-line:
|
|
46
|
+
text-decoration-line: underline;
|
|
49
47
|
text-decoration-thickness: ds-px-to-rem($thickness);
|
|
50
48
|
text-underline-offset: ds-px-to-rem($offset);
|
|
51
49
|
}
|
|
@@ -48,7 +48,7 @@ $dsSerifWeights: (
|
|
|
48
48
|
// Serif variation changes, text 18px, headline 26px, display 34px. As fallback we will always use headline
|
|
49
49
|
|
|
50
50
|
@mixin ds-typography(
|
|
51
|
-
$
|
|
51
|
+
$variable,
|
|
52
52
|
$forcePx: false,
|
|
53
53
|
$fontWeight: null,
|
|
54
54
|
$letterSpacing: null,
|
|
@@ -62,9 +62,9 @@ $dsSerifWeights: (
|
|
|
62
62
|
"lineHeight": null,
|
|
63
63
|
"fontStyle": null,
|
|
64
64
|
);
|
|
65
|
-
$tmpMap: map.merge($addons, map.get($typographyScreenSmall, $
|
|
66
|
-
$tmpMapScreenLarge: map.merge($addons, map.get($typographyScreenLarge, $
|
|
67
|
-
$tmpMapScreenExtraLarge: map.merge($addons, map.get($typographyScreenExtraLarge, $
|
|
65
|
+
$tmpMap: map.merge($addons, map.get($typographyScreenSmall, $variable));
|
|
66
|
+
$tmpMapScreenLarge: map.merge($addons, map.get($typographyScreenLarge, $variable));
|
|
67
|
+
$tmpMapScreenExtraLarge: map.merge($addons, map.get($typographyScreenExtraLarge, $variable));
|
|
68
68
|
|
|
69
69
|
@if $tmpMap {
|
|
70
70
|
@include ds-mq-largest-breakpoint(mobile) {
|
|
@@ -102,7 +102,7 @@ $dsSerifWeights: (
|
|
|
102
102
|
}
|
|
103
103
|
|
|
104
104
|
@mixin ds-typography-without-mq(
|
|
105
|
-
$
|
|
105
|
+
$variable,
|
|
106
106
|
$screen: mobile,
|
|
107
107
|
$forcePx: false,
|
|
108
108
|
$fontWeight: null,
|
|
@@ -121,12 +121,12 @@ $dsSerifWeights: (
|
|
|
121
121
|
);
|
|
122
122
|
|
|
123
123
|
@if $screen == mobile {
|
|
124
|
-
$tmpMap: map.merge($addons, map.get($typographyScreenSmall, $
|
|
124
|
+
$tmpMap: map.merge($addons, map.get($typographyScreenSmall, $variable));
|
|
125
125
|
} @else if $screen == tablet {
|
|
126
|
-
$tmpMap: map.merge($addons, map.get($typographyScreenLarge, $
|
|
126
|
+
$tmpMap: map.merge($addons, map.get($typographyScreenLarge, $variable));
|
|
127
127
|
$scaling: "large";
|
|
128
128
|
} @else if $screen == desktop {
|
|
129
|
-
$tmpMap: map.merge($addons, map.get($typographyScreenExtraLarge, $
|
|
129
|
+
$tmpMap: map.merge($addons, map.get($typographyScreenExtraLarge, $variable));
|
|
130
130
|
$scaling: "extraLarge";
|
|
131
131
|
}
|
|
132
132
|
|
|
@@ -245,11 +245,11 @@ $dsSerifWeights: (
|
|
|
245
245
|
}
|
|
246
246
|
}
|
|
247
247
|
|
|
248
|
-
@mixin ds-typography-with-force-px($
|
|
249
|
-
@include ds-typography($
|
|
248
|
+
@mixin ds-typography-with-force-px($variable) {
|
|
249
|
+
@include ds-typography($variable);
|
|
250
250
|
// If called from element without a wrapper class, ex. a it will generate incorrect selector .ds-force-pxa
|
|
251
251
|
@at-root .ds-force-px#{&} {
|
|
252
|
-
@include ds-typography($
|
|
252
|
+
@include ds-typography($variable, true);
|
|
253
253
|
}
|
|
254
254
|
& {
|
|
255
255
|
@content;
|
|
@@ -41,7 +41,7 @@ $ds-typography-detail-teaser-twin: 'detail-teaser-twin';
|
|
|
41
41
|
$ds-typography-detail-teaser-tipsa: 'detail-teaser-tipsa';
|
|
42
42
|
$ds-typography-detail-teaser-baotaxl: 'detail-teaser-baotaxl';
|
|
43
43
|
$ds-typography-detail-teaser-longlife: 'detail-teaser-longlife';
|
|
44
|
-
$ds-typography-detail-teaser-
|
|
44
|
+
$ds-typography-detail-teaser-centrerad: 'detail-teaser-centrerad';
|
|
45
45
|
$ds-typography-detail-teaser-large-opinion: 'detail-teaser-large-opinion';
|
|
46
46
|
$ds-typography-detail-teaser-story: 'detail-teaser-story';
|
|
47
47
|
$ds-typography-detail-teaser-large-rightcol: 'detail-teaser-large-rightcol';
|
|
@@ -242,7 +242,7 @@ $typographyScreenSmall: (
|
|
|
242
242
|
detail-teaser-standard-compact-opinion: (
|
|
243
243
|
fontFamily: "DN Serif Headline",
|
|
244
244
|
fontSize: 18,
|
|
245
|
-
fontWeight:
|
|
245
|
+
fontWeight: Medium,
|
|
246
246
|
letterSpacing: 0,
|
|
247
247
|
lineHeight: 1.2,
|
|
248
248
|
fontStyle: italic
|
|
@@ -304,7 +304,7 @@ $typographyScreenSmall: (
|
|
|
304
304
|
letterSpacing: 0,
|
|
305
305
|
lineHeight: 1.2
|
|
306
306
|
),
|
|
307
|
-
detail-teaser-
|
|
307
|
+
detail-teaser-centrerad: (
|
|
308
308
|
fontFamily: "DN Serif Display",
|
|
309
309
|
fontSize: 36,
|
|
310
310
|
fontWeight: ExtraBold,
|
package/package.json
CHANGED
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"detail-teaser-tipsa": "'detail-teaser-tipsa'",
|
|
43
43
|
"detail-teaser-baotaxl": "'detail-teaser-baotaxl'",
|
|
44
44
|
"detail-teaser-longlife": "'detail-teaser-longlife'",
|
|
45
|
-
"detail-teaser-
|
|
45
|
+
"detail-teaser-centrerad": "'detail-teaser-centrerad'",
|
|
46
46
|
"detail-teaser-large-opinion": "'detail-teaser-large-opinion'",
|
|
47
47
|
"detail-teaser-story": "'detail-teaser-story'",
|
|
48
48
|
"detail-teaser-large-rightcol": "'detail-teaser-large-rightcol'",
|