@oslokommune/punkt-css 13.6.3 → 13.6.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.
Files changed (17) hide show
  1. package/CHANGELOG.md +18 -0
  2. package/dist/css/components/bodytext.css +54 -6
  3. package/dist/css/components/bodytext.min.css +1 -1
  4. package/dist/css/components/heading.css +91 -11
  5. package/dist/css/components/heading.min.css +1 -1
  6. package/dist/css/pkt-base.css +14 -14
  7. package/dist/css/pkt-base.min.css +1 -1
  8. package/dist/css/pkt-components.css +145 -17
  9. package/dist/css/pkt-components.min.css +1 -1
  10. package/dist/css/pkt-docs.css +159 -31
  11. package/dist/css/pkt-docs.min.css +1 -1
  12. package/dist/css/pkt.css +159 -31
  13. package/dist/css/pkt.min.css +1 -1
  14. package/dist/scss/abstracts/variables/_typography.scss +4 -2
  15. package/dist/scss/components/_bodytext.scss +27 -3
  16. package/dist/scss/components/_heading.scss +45 -5
  17. package/package.json +2 -2
package/dist/scss/abstracts/variables/_typography.scss CHANGED
@@ -79,7 +79,9 @@ $font-weight: (
79
79
 
80
80
  $line-height: (
81
81
  'body': 1.75rem,
82
+ 'lh-98': 6.125rem,
82
83
  'lh-82': 5.125rem,
84
+ 'lh-64': 4rem,
83
85
  'lh-60': 3.75rem,
84
86
  'lh-54': 3.375rem,
85
87
  'lh-44': 2.75rem,
@@ -121,7 +123,7 @@ $pkt-styles: (
121
123
  'size': 'size-70',
122
124
  'weight': 'regular',
123
125
  'letter-spacing': 'tighter',
124
- 'line-height': 'lh-82',
126
+ 'line-height': 'lh-98',
125
127
  ),
126
128
  'pkt-txt-54': (
127
129
  'size': 'size-54',
@@ -133,7 +135,7 @@ $pkt-styles: (
133
135
  'size': 'size-48',
134
136
  'weight': 'regular',
135
137
  'letter-spacing': 'tight',
136
- 'line-height': 'lh-54',
138
+ 'line-height': 'lh-64',
137
139
  ),
138
140
  'pkt-txt-40': (
139
141
  'size': 'size-40',
package/dist/scss/components/_bodytext.scss CHANGED
@@ -7,14 +7,38 @@
7
7
 
8
8
  .pkt-bodytext {
9
9
  &--large {
10
- @include typography.get-text('pkt-txt-24-light');
10
+ @include typography.get-text('pkt-txt-20-light');
11
+
12
+ @include bp('phablet-up') {
13
+ @include typography.get-text('pkt-txt-22-light');
14
+ }
15
+
16
+ @include bp('tablet-up') {
17
+ @include typography.get-text('pkt-txt-24-light');
18
+ }
11
19
  }
12
20
 
13
21
  &--medium {
14
- @include typography.get-text('pkt-txt-18-light');
22
+ @include typography.get-text('pkt-txt-16-light');
23
+
24
+ @include bp('phablet-up') {
25
+ @include typography.get-text('pkt-txt-18-light');
26
+ }
27
+
28
+ @include bp('tablet-up') {
29
+ @include typography.get-text('pkt-txt-20-light');
30
+ }
15
31
  }
16
32
 
17
33
  &--small {
18
- @include typography.get-text('pkt-txt-16-light');
34
+ @include typography.get-text('pkt-txt-14-light');
35
+
36
+ @include bp('phablet-up') {
37
+ @include typography.get-text('pkt-txt-14-light');
38
+ }
39
+
40
+ @include bp('tablet-up') {
41
+ @include typography.get-text('pkt-txt-16-light');
42
+ }
19
43
  }
20
44
  }
package/dist/scss/components/_heading.scss CHANGED
@@ -13,23 +13,63 @@ pkt-heading {
13
13
  line-height: 1.2;
14
14
 
15
15
  &--xlarge {
16
- @include typography.get-text('pkt-txt-70');
16
+ @include typography.get-text('pkt-txt-40');
17
+
18
+ @include bp('phablet-up') {
19
+ @include typography.get-text('pkt-txt-54');
20
+ }
21
+
22
+ @include bp('tablet-up') {
23
+ @include typography.get-text('pkt-txt-70');
24
+ }
17
25
  }
18
26
 
19
27
  &--large {
20
- @include typography.get-text('pkt-txt-48');
28
+ @include typography.get-text('pkt-txt-28');
29
+
30
+ @include bp('phablet-up') {
31
+ @include typography.get-text('pkt-txt-36');
32
+ }
33
+
34
+ @include bp('tablet-up') {
35
+ @include typography.get-text('pkt-txt-48');
36
+ }
21
37
  }
22
38
 
23
39
  &--medium {
24
- @include typography.get-text('pkt-txt-30-medium');
40
+ @include typography.get-text('pkt-txt-24-medium');
41
+
42
+ @include bp('phablet-up') {
43
+ @include typography.get-text('pkt-txt-28-medium');
44
+ }
45
+
46
+ @include bp('tablet-up') {
47
+ @include typography.get-text('pkt-txt-30-medium');
48
+ }
25
49
  }
26
50
 
27
51
  &--small {
28
- @include typography.get-text('pkt-txt-24-medium');
52
+ @include typography.get-text('pkt-txt-18-medium');
53
+
54
+ @include bp('phablet-up') {
55
+ @include typography.get-text('pkt-txt-20-medium');
56
+ }
57
+
58
+ @include bp('tablet-up') {
59
+ @include typography.get-text('pkt-txt-24-medium');
60
+ }
29
61
  }
30
62
 
31
63
  &--xsmall {
32
- @include typography.get-text('pkt-txt-22-medium');
64
+ @include typography.get-text('pkt-txt-16-medium');
65
+
66
+ @include bp('phablet-up') {
67
+ @include typography.get-text('pkt-txt-18-medium');
68
+ }
69
+
70
+ @include bp('tablet-up') {
71
+ @include typography.get-text('pkt-txt-22-medium');
72
+ }
33
73
  }
34
74
 
35
75
  &--noSpacing {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@oslokommune/punkt-css",
3
- "version": "13.6.3",
3
+ "version": "13.6.4",
4
4
  "description": "CSS-rammeverket til Punkt, et designsystem laget av Oslo Origo",
5
5
  "homepage": "https://punkt.oslo.kommune.no",
6
6
  "author": "Team Designsystem, Oslo Origo",
@@ -55,5 +55,5 @@
55
55
  "url": "https://github.com/oslokommune/punkt/issues"
56
56
  },
57
57
  "license": "MIT",
58
- "gitHead": "b58d1ae17c67067c2cd94a585d1362a9b27483b0"
58
+ "gitHead": "e5cb812d5161777cf03a2a2ed532490446d6d5a9"
59
59
  }