@ndla/ui 47.0.0 → 47.1.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 (39) hide show
  1. package/es/Article/Article.js +6 -5
  2. package/es/FrontpageArticle/FrontpageArticle.js +8 -12
  3. package/es/MyNdla/Resource/Folder.js +15 -15
  4. package/es/ToolboxPage/ToolboxInfo.js +4 -13
  5. package/es/Topic/Topic.js +30 -34
  6. package/es/all.css +1 -1
  7. package/es/locale/messages-en.js +18 -2
  8. package/es/locale/messages-nb.js +18 -2
  9. package/es/locale/messages-nn.js +18 -2
  10. package/es/locale/messages-se.js +18 -2
  11. package/es/locale/messages-sma.js +18 -2
  12. package/lib/Article/Article.js +5 -4
  13. package/lib/FrontpageArticle/FrontpageArticle.js +6 -10
  14. package/lib/MyNdla/Resource/Folder.js +15 -15
  15. package/lib/ToolboxPage/ToolboxInfo.js +3 -13
  16. package/lib/Topic/Topic.js +29 -33
  17. package/lib/all.css +1 -1
  18. package/lib/locale/messages-en.d.ts +16 -0
  19. package/lib/locale/messages-en.js +18 -2
  20. package/lib/locale/messages-nb.d.ts +16 -0
  21. package/lib/locale/messages-nb.js +18 -2
  22. package/lib/locale/messages-nn.d.ts +16 -0
  23. package/lib/locale/messages-nn.js +18 -2
  24. package/lib/locale/messages-se.d.ts +16 -0
  25. package/lib/locale/messages-se.js +18 -2
  26. package/lib/locale/messages-sma.d.ts +16 -0
  27. package/lib/locale/messages-sma.js +18 -2
  28. package/package.json +17 -17
  29. package/src/Article/Article.tsx +3 -3
  30. package/src/Article/component.article.scss +4 -4
  31. package/src/FrontpageArticle/FrontpageArticle.tsx +6 -16
  32. package/src/MyNdla/Resource/Folder.tsx +11 -8
  33. package/src/ToolboxPage/ToolboxInfo.tsx +3 -19
  34. package/src/Topic/Topic.tsx +5 -11
  35. package/src/locale/messages-en.ts +17 -0
  36. package/src/locale/messages-nb.ts +17 -0
  37. package/src/locale/messages-nn.ts +17 -0
  38. package/src/locale/messages-se.ts +17 -0
  39. package/src/locale/messages-sma.ts +17 -0
@@ -125,6 +125,7 @@ declare const messages: {
125
125
  folders: string;
126
126
  tags: string;
127
127
  subjects: string;
128
+ more: string;
128
129
  };
129
130
  tagList: string;
130
131
  tags: string;
@@ -221,6 +222,18 @@ declare const messages: {
221
222
  text: string;
222
223
  };
223
224
  };
225
+ myProfile: {
226
+ title: string;
227
+ disclaimerTitle: string;
228
+ disclaimerText: string;
229
+ preferenceTitle: string;
230
+ preferenceText: string;
231
+ editButtonText: string;
232
+ radioButtonText: {
233
+ option1: string;
234
+ option2: string;
235
+ };
236
+ };
224
237
  resource: {
225
238
  add: string;
226
239
  remove: string;
@@ -253,6 +266,9 @@ declare const messages: {
253
266
  noFavorites: string;
254
267
  goToAllSubjects: string;
255
268
  };
269
+ tools: string;
270
+ simpleList: string;
271
+ detailedList: string;
256
272
  };
257
273
  snackbar: {
258
274
  close: string;
@@ -1130,7 +1130,8 @@ var messages = _objectSpread(_objectSpread({
1130
1130
  iconMenu: {
1131
1131
  folders: 'Folders',
1132
1132
  tags: 'Tags',
1133
- subjects: 'Favourite subjects'
1133
+ subjects: 'Favourite subjects',
1134
+ more: 'More'
1134
1135
  },
1135
1136
  tagList: 'Tags',
1136
1137
  tags: '{{count}} tag',
@@ -1227,6 +1228,18 @@ var messages = _objectSpread(_objectSpread({
1227
1228
  text: 'When you save a resource, you will have the option to tag it with a keyword. This tag can be used to find the resource across folders. By selecting <strong>My tags</strong> on the menu to the left, you will see all the tags your have used. You can also see which resources are tagget with which keyword.'
1228
1229
  }
1229
1230
  },
1231
+ myProfile: {
1232
+ title: 'My Profile',
1233
+ disclaimerTitle: 'Where is my picture and name used?',
1234
+ disclaimerText: 'Your picture and name are displayed when you participate in discussions in the arena.',
1235
+ preferenceTitle: 'Choose whether you want to display name when sharing a folder',
1236
+ preferenceText: 'Here you can choose whether you want to display your name when you share a folder. The selected option applies to all your folders and can be changed later. If you later change the option, your name will appear on all your shared folders.',
1237
+ editButtonText: 'Change profile picture',
1238
+ radioButtonText: {
1239
+ option1: 'Show my name when I share a folder',
1240
+ option2: 'Do not show my name when I share a folder'
1241
+ }
1242
+ },
1230
1243
  resource: {
1231
1244
  add: 'Add folder/tag',
1232
1245
  remove: 'Remove',
@@ -1258,7 +1271,10 @@ var messages = _objectSpread(_objectSpread({
1258
1271
  subjects_plural: '{{count}} subjects',
1259
1272
  noFavorites: 'You do not have any favorite subjects!',
1260
1273
  goToAllSubjects: 'Go to all subjects'
1261
- }
1274
+ },
1275
+ tools: 'Tools',
1276
+ simpleList: 'Simple list',
1277
+ detailedList: 'With preamble'
1262
1278
  },
1263
1279
  snackbar: {
1264
1280
  close: 'Close notification'
@@ -125,6 +125,7 @@ declare const messages: {
125
125
  folders: string;
126
126
  tags: string;
127
127
  subjects: string;
128
+ more: string;
128
129
  };
129
130
  tagList: string;
130
131
  tags: string;
@@ -221,6 +222,18 @@ declare const messages: {
221
222
  text: string;
222
223
  };
223
224
  };
225
+ myProfile: {
226
+ title: string;
227
+ disclaimerTitle: string;
228
+ disclaimerText: string;
229
+ preferenceTitle: string;
230
+ preferenceText: string;
231
+ editButtonText: string;
232
+ radioButtonText: {
233
+ option1: string;
234
+ option2: string;
235
+ };
236
+ };
224
237
  resource: {
225
238
  add: string;
226
239
  remove: string;
@@ -253,6 +266,9 @@ declare const messages: {
253
266
  noFavorites: string;
254
267
  goToAllSubjects: string;
255
268
  };
269
+ tools: string;
270
+ simpleList: string;
271
+ detailedList: string;
256
272
  };
257
273
  snackbar: {
258
274
  close: string;
@@ -1128,7 +1128,8 @@ var messages = _objectSpread(_objectSpread({
1128
1128
  iconMenu: {
1129
1129
  folders: 'Mapper',
1130
1130
  tags: 'Knagger',
1131
- subjects: 'Favorittfag'
1131
+ subjects: 'Favorittfag',
1132
+ more: 'Mer'
1132
1133
  },
1133
1134
  tagList: 'Emneknagger',
1134
1135
  tags: '{{count}} emneknagg',
@@ -1225,6 +1226,18 @@ var messages = _objectSpread(_objectSpread({
1225
1226
  text: 'Når du lagrer en ressurs, får du mulighet til å markere ressursen med en emneknagg. Emneknaggen er et nøkkelord du kan bruke til å finne tilbake til ressurser på tvers av mapper. Du finner alle emneknaggene du har brukt, ved å velge <strong>Mine emneknagger</strong> i venstremenyen. Her kan du også se hvilke ressurser du har markert med hvilken emneknagg.'
1226
1227
  }
1227
1228
  },
1229
+ myProfile: {
1230
+ title: 'Min Profil',
1231
+ disclaimerTitle: 'Hvor brukes bildet og navnet mitt?',
1232
+ disclaimerText: 'Bilde og navn vises når du deltar i diskusjoner i arenaen.',
1233
+ preferenceTitle: 'Velg om du vil vise navn når du deler en mappe',
1234
+ preferenceText: 'Her kan du selv velge om du vil vise navnet ditt når du deler en mappe. Valget gjelder for alle mappene dine og kan endres senere. Dersom du endrer vil navnet ditt vises på alle dine delte mapper.',
1235
+ editButtonText: 'Endre profilbilde',
1236
+ radioButtonText: {
1237
+ option1: 'Vis navnet mitt når jeg deler en mappe',
1238
+ option2: 'Ikke vis navnet mitt når jeg deler mappe'
1239
+ }
1240
+ },
1228
1241
  resource: {
1229
1242
  add: 'Legg til mappe/emneknagg',
1230
1243
  remove: 'Fjern',
@@ -1256,7 +1269,10 @@ var messages = _objectSpread(_objectSpread({
1256
1269
  subjects_plural: '{{count}} fag',
1257
1270
  noFavorites: 'Du har ingen favorittfag!',
1258
1271
  goToAllSubjects: 'Gå til alle fag'
1259
- }
1272
+ },
1273
+ tools: 'Verktøy',
1274
+ simpleList: 'Enkel liste',
1275
+ detailedList: 'Med ingress'
1260
1276
  },
1261
1277
  snackbar: {
1262
1278
  close: 'Lukk melding'
@@ -125,6 +125,7 @@ declare const messages: {
125
125
  folders: string;
126
126
  tags: string;
127
127
  subjects: string;
128
+ more: string;
128
129
  };
129
130
  tagList: string;
130
131
  tags: string;
@@ -221,6 +222,18 @@ declare const messages: {
221
222
  text: string;
222
223
  };
223
224
  };
225
+ myProfile: {
226
+ title: string;
227
+ disclaimerTitle: string;
228
+ disclaimerText: string;
229
+ preferenceTitle: string;
230
+ preferenceText: string;
231
+ editButtonText: string;
232
+ radioButtonText: {
233
+ option1: string;
234
+ option2: string;
235
+ };
236
+ };
224
237
  resource: {
225
238
  add: string;
226
239
  remove: string;
@@ -253,6 +266,9 @@ declare const messages: {
253
266
  noFavorites: string;
254
267
  goToAllSubjects: string;
255
268
  };
269
+ tools: string;
270
+ simpleList: string;
271
+ detailedList: string;
256
272
  };
257
273
  snackbar: {
258
274
  close: string;
@@ -1128,7 +1128,8 @@ var messages = _objectSpread(_objectSpread({
1128
1128
  iconMenu: {
1129
1129
  folders: 'Mappar',
1130
1130
  tags: 'Knaggar',
1131
- subjects: 'Favorittfag'
1131
+ subjects: 'Favorittfag',
1132
+ more: 'Meire'
1132
1133
  },
1133
1134
  tagList: 'Emneknaggar',
1134
1135
  tags: '{{count}} emneknagg',
@@ -1225,6 +1226,18 @@ var messages = _objectSpread(_objectSpread({
1225
1226
  text: 'Når du lagrar ein ressurs, får du høve til å markere ressursen med ein emneknagg. Emneknaggen er eit nøkkelord du kan bruke til å finne tilbake til ressursar på tvers av mapper. Du finn alle emneknaggane du har brukt, ved å velje <strong>Mine emneknaggar</strong> i venstremenyen. Her kan du også sjå kva for ressursar du har merkt med kva knagg.'
1226
1227
  }
1227
1228
  },
1229
+ myProfile: {
1230
+ title: 'Min Profil',
1231
+ disclaimerTitle: 'Kvar blir biletet og namnet mitt brukt?',
1232
+ disclaimerText: 'Bilete og namn vert vist når du deltek i diskusjonar i arenaen.',
1233
+ preferenceTitle: 'Vel om du vil vise namn når du deler ei mappe',
1234
+ preferenceText: 'Her kan du sjølv velje om du vil vise namnet ditt når du deler ei mappe. Valet gjeld for alle mappene dine og kan endrast seinare. Dersom du endrar vil namnet ditt visast på alle dine delte mapper.',
1235
+ editButtonText: 'Endre profilbilete',
1236
+ radioButtonText: {
1237
+ option1: 'Vis namnet mitt når eg deler ei mappe',
1238
+ option2: 'Ikkje vis namnet mitt når eg deler mappe'
1239
+ }
1240
+ },
1228
1241
  resource: {
1229
1242
  add: 'Legg til mappe/emneknagg',
1230
1243
  remove: 'Fjern',
@@ -1256,7 +1269,10 @@ var messages = _objectSpread(_objectSpread({
1256
1269
  subjects_plural: '{{count}} fag',
1257
1270
  noFavorites: 'Du har ingen favorittfag!',
1258
1271
  goToAllSubjects: 'Gå til alle fag'
1259
- }
1272
+ },
1273
+ tools: 'Verktøy',
1274
+ simpleList: 'Enkel liste',
1275
+ detailedList: 'Med ingress'
1260
1276
  },
1261
1277
  snackbar: {
1262
1278
  close: 'Lukk melding'
@@ -125,6 +125,7 @@ declare const messages: {
125
125
  folders: string;
126
126
  tags: string;
127
127
  subjects: string;
128
+ more: string;
128
129
  };
129
130
  tagList: string;
130
131
  tags: string;
@@ -221,6 +222,18 @@ declare const messages: {
221
222
  text: string;
222
223
  };
223
224
  };
225
+ myProfile: {
226
+ title: string;
227
+ disclaimerTitle: string;
228
+ disclaimerText: string;
229
+ preferenceTitle: string;
230
+ preferenceText: string;
231
+ editButtonText: string;
232
+ radioButtonText: {
233
+ option1: string;
234
+ option2: string;
235
+ };
236
+ };
224
237
  resource: {
225
238
  add: string;
226
239
  remove: string;
@@ -253,6 +266,9 @@ declare const messages: {
253
266
  noFavorites: string;
254
267
  goToAllSubjects: string;
255
268
  };
269
+ tools: string;
270
+ simpleList: string;
271
+ detailedList: string;
256
272
  };
257
273
  snackbar: {
258
274
  close: string;
@@ -1128,7 +1128,8 @@ var messages = _objectSpread(_objectSpread({
1128
1128
  iconMenu: {
1129
1129
  folders: 'Mapper',
1130
1130
  tags: 'Knagger',
1131
- subjects: 'Favorittfag'
1131
+ subjects: 'Favorittfag',
1132
+ more: 'Mer'
1132
1133
  },
1133
1134
  tagList: 'Fáddágilkor',
1134
1135
  tags: '{{count}} fáddágilkor',
@@ -1225,6 +1226,18 @@ var messages = _objectSpread(_objectSpread({
1225
1226
  text: 'Go vurket muhtin resurssa de lea vejolaš merket resurssa fáddágilkoriin. Fáddágilkor lea čoavddasátni man sáhtát geavahit gávdnan dihte ruovttoluotta resurssaide máhpaid rastá. Gávnnat buot fáddágilkoriid maid leat geavahan go válljet mu fáddágilkoriid gurut bealde fálus. Das oainnát maiddái maid resurssaid don leat merken juohke fáddágilkoriin.'
1226
1227
  }
1227
1228
  },
1229
+ myProfile: {
1230
+ title: 'Mu profiila',
1231
+ disclaimerTitle: 'Gos geavahit mu gova ja mu nama?',
1232
+ disclaimerText: 'Govva ja namma čájehuvvojit go searvat digaštallamii arenain.',
1233
+ preferenceTitle: 'Vállje jos namma čájehuvvo máhpa juohkkedettiin',
1234
+ preferenceText: 'Dás válljet jos iežat namma čájehuvvo juohkkedettiin máhpa. Dát molssaeaktu guoská buot máhpaide ja sáhttá rievdaduvvot maŋŋil. Jos rievdadat dán, de čájehuvvo du namma buot juogaduvvon máhpain.',
1235
+ editButtonText: 'Rievdat profiilagova',
1236
+ radioButtonText: {
1237
+ option1: 'Čájet mu nama máhpa juohkkedettiin',
1238
+ option2: 'Ale čájet mu nama máhpa juohkkedettiin'
1239
+ }
1240
+ },
1228
1241
  resource: {
1229
1242
  add: 'Lasit máhpa/fáddágilkora',
1230
1243
  remove: 'Sihko',
@@ -1256,7 +1269,10 @@ var messages = _objectSpread(_objectSpread({
1256
1269
  subjects_plural: '{{count}} fága',
1257
1270
  noFavorites: 'Dus ii leat oktage favorihttafága!',
1258
1271
  goToAllSubjects: 'Mana buot fágaide'
1259
- }
1272
+ },
1273
+ tools: 'Verktøy',
1274
+ simpleList: 'Enkel liste',
1275
+ detailedList: 'Med ingress'
1260
1276
  },
1261
1277
  snackbar: {
1262
1278
  close: 'Govčča dieđu'
@@ -125,6 +125,7 @@ declare const messages: {
125
125
  folders: string;
126
126
  tags: string;
127
127
  subjects: string;
128
+ more: string;
128
129
  };
129
130
  tagList: string;
130
131
  tags: string;
@@ -221,6 +222,18 @@ declare const messages: {
221
222
  text: string;
222
223
  };
223
224
  };
225
+ myProfile: {
226
+ title: string;
227
+ disclaimerTitle: string;
228
+ disclaimerText: string;
229
+ preferenceTitle: string;
230
+ preferenceText: string;
231
+ editButtonText: string;
232
+ radioButtonText: {
233
+ option1: string;
234
+ option2: string;
235
+ };
236
+ };
224
237
  resource: {
225
238
  add: string;
226
239
  remove: string;
@@ -253,6 +266,9 @@ declare const messages: {
253
266
  noFavorites: string;
254
267
  goToAllSubjects: string;
255
268
  };
269
+ tools: string;
270
+ simpleList: string;
271
+ detailedList: string;
256
272
  };
257
273
  snackbar: {
258
274
  close: string;
@@ -1128,7 +1128,8 @@ var messages = _objectSpread(_objectSpread({
1128
1128
  iconMenu: {
1129
1129
  folders: 'Mapper',
1130
1130
  tags: 'Knagger',
1131
- subjects: 'Favorittfag'
1131
+ subjects: 'Favorittfag',
1132
+ more: 'Mer'
1132
1133
  },
1133
1134
  tagList: 'Emneknagg',
1134
1135
  tags: '{{count}} emneknagg',
@@ -1225,6 +1226,18 @@ var messages = _objectSpread(_objectSpread({
1225
1226
  text: 'Når du lagrar ein ressurs, får du høve til å markere ressursen med ein emneknagg. Emneknaggen er eit nøkkelord du kan bruke til å finne tilbake til ressursar på tvers av mapper. Du finn alle emneknaggane du har brukt, ved å velje <strong>Mine emneknaggar</strong> i venstremenyen. Her kan du også sjå kva for ressursar du har merkt med kva knagg.'
1226
1227
  }
1227
1228
  },
1229
+ myProfile: {
1230
+ title: 'Mov Profijle',
1231
+ disclaimerTitle: 'Gusnie guvvie jïh nomme åtnasuvvieh?',
1232
+ disclaimerText: 'Guvvie jïh nomme våajnoes sjidtieh gosse meatan digkiedimmesne sijjesne.',
1233
+ preferenceTitle: 'Sjïehtedh jis edtja nommem vuesiehtidh gosse maabpam juekedh',
1234
+ preferenceText: 'Daesnie jïjtje veeljh mejtie sïjhth dov nommem vuesiehtidh gosse maabpam juekedh . Daate veeljeme lea gaajhkine dov maabpojne, jïh maahta dam mænngan jarkelidh. Jis jeatjahdahtah , dov nomme sæjhta våajnoes årrodh gaajhkine dov joekedamme maabpojne.',
1235
+ editButtonText: 'Naemhtie profijleguvviem jarkelidh',
1236
+ radioButtonText: {
1237
+ option1: 'Vuesehth mov nommem gosse maabpam juekieh',
1238
+ option2: 'Aellieh mov nommem vuesehth gosse maabpam juekieh'
1239
+ }
1240
+ },
1228
1241
  resource: {
1229
1242
  add: 'Legg til mappe/emneknagg',
1230
1243
  remove: 'Fjern',
@@ -1256,7 +1269,10 @@ var messages = _objectSpread(_objectSpread({
1256
1269
  subjects_plural: '{{count}} fag',
1257
1270
  noFavorites: 'Du har ingen favorittfag!',
1258
1271
  goToAllSubjects: 'Gå til alle fag'
1259
- }
1272
+ },
1273
+ tools: 'Verktøy',
1274
+ simpleList: 'Enkel liste',
1275
+ detailedList: 'Med ingress'
1260
1276
  },
1261
1277
  snackbar: {
1262
1278
  close: 'Lukk melding'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ndla/ui",
3
- "version": "47.0.0",
3
+ "version": "47.1.1",
4
4
  "description": "UI component library for NDLA.",
5
5
  "license": "GPL-3.0",
6
6
  "main": "lib/index.js",
@@ -31,23 +31,23 @@
31
31
  "types"
32
32
  ],
33
33
  "dependencies": {
34
- "@ndla/accordion": "^2.2.26",
35
- "@ndla/button": "^12.0.0",
36
- "@ndla/carousel": "^4.0.3",
37
- "@ndla/core": "^4.1.9",
38
- "@ndla/dropdown-menu": "^1.0.8",
39
- "@ndla/forms": "^5.0.1",
34
+ "@ndla/accordion": "^2.2.28",
35
+ "@ndla/button": "^12.0.2",
36
+ "@ndla/carousel": "^4.0.5",
37
+ "@ndla/core": "^4.2.0",
38
+ "@ndla/dropdown-menu": "^1.0.9",
39
+ "@ndla/forms": "^5.0.3",
40
40
  "@ndla/hooks": "^2.1.1",
41
- "@ndla/icons": "^4.0.9",
41
+ "@ndla/icons": "^4.1.0",
42
42
  "@ndla/licenses": "^7.1.4",
43
- "@ndla/modal": "^5.0.0",
44
- "@ndla/notion": "^6.0.1",
45
- "@ndla/safelink": "^4.1.25",
46
- "@ndla/select": "^3.0.0",
47
- "@ndla/switch": "^1.1.14",
48
- "@ndla/tabs": "^3.0.10",
49
- "@ndla/tooltip": "^5.0.0",
50
- "@ndla/typography": "^0.2.1",
43
+ "@ndla/modal": "^5.0.2",
44
+ "@ndla/notion": "^6.0.3",
45
+ "@ndla/safelink": "^4.1.27",
46
+ "@ndla/select": "^3.1.0",
47
+ "@ndla/switch": "^1.1.15",
48
+ "@ndla/tabs": "^3.0.11",
49
+ "@ndla/tooltip": "^5.0.2",
50
+ "@ndla/typography": "^0.2.2",
51
51
  "@ndla/util": "^4.0.0",
52
52
  "@radix-ui/react-popover": "^1.0.7",
53
53
  "@radix-ui/react-radio-group": "^1.1.3",
@@ -80,5 +80,5 @@
80
80
  "publishConfig": {
81
81
  "access": "public"
82
82
  },
83
- "gitHead": "7b9ab5e858be896e97c8360f92b2385adceabf7a"
83
+ "gitHead": "95e3bd37d05958082f70ef0b3e8f2ded5ab47904"
84
84
  }
@@ -13,7 +13,7 @@ import styled from '@emotion/styled';
13
13
  import { useIntersectionObserver } from '@ndla/hooks';
14
14
  import { resizeObserver } from '@ndla/util';
15
15
  import { spacing, spacingUnit, mq, breakpoints } from '@ndla/core';
16
- import { Heading } from '@ndla/typography';
16
+ import { Heading, Text } from '@ndla/typography';
17
17
  import { Article as ArticleType } from '../types';
18
18
  import ArticleByline from './ArticleByline';
19
19
  import LayoutItem from '../Layout';
@@ -77,9 +77,9 @@ type ArticleIntroductionProps = {
77
77
  export const ArticleIntroduction = ({ children, lang }: ArticleIntroductionProps) => {
78
78
  if (children) {
79
79
  return (
80
- <div className="article_introduction" lang={lang}>
80
+ <Text textStyle="ingress" element="div" lang={lang}>
81
81
  {children}
82
- </div>
82
+ </Text>
83
83
  );
84
84
  }
85
85
  return null;
@@ -26,7 +26,7 @@
26
26
  }
27
27
 
28
28
  @include mq(tablet) {
29
- @include font-size(20px, 35px);
29
+ @include font-size(18px, 29px);
30
30
 
31
31
  > section > p {
32
32
  &:not([class]) {
@@ -120,14 +120,14 @@
120
120
  }
121
121
  }
122
122
 
123
- padding: 0 0 $spacing--small 0;
123
+ padding: 0 0 $spacing 0;
124
124
 
125
125
  @include mq(tablet) {
126
- padding: 0 0 $spacing 0;
126
+ padding: 0 0 $spacing--medium 0;
127
127
  }
128
128
 
129
129
  p {
130
- @include font-size(16px, 20px);
130
+ @include font-size(18px, 24px);
131
131
  color: $text-light-color;
132
132
  text-transform: uppercase;
133
133
  margin-bottom: 0;
@@ -7,9 +7,9 @@
7
7
  */
8
8
 
9
9
  import { CSSProperties, ReactNode, useMemo } from 'react';
10
- import { breakpoints, fonts, mq, spacing, spacingUnit } from '@ndla/core';
10
+ import { spacing, spacingUnit } from '@ndla/core';
11
11
  import styled from '@emotion/styled';
12
- import { Heading } from '@ndla/typography';
12
+ import { Heading, Text } from '@ndla/typography';
13
13
  import { Article } from '../types';
14
14
  import { ArticleByline } from '../Article';
15
15
  import { useMastheadHeight } from '../Masthead';
@@ -56,18 +56,6 @@ const StyledArticle = styled.article`
56
56
  }
57
57
  `;
58
58
 
59
- const StyledIntroduction = styled.div`
60
- font-weight: ${fonts.weight.light};
61
- font-family: ${fonts.sans};
62
- margin-top: ${spacing.small};
63
- ${fonts.sizes('22px', '30px')};
64
-
65
- ${mq.range({ from: breakpoints.tablet })} {
66
- margin-top: ${spacing.mediumlarge};
67
- ${fonts.sizes('26px', '36px')};
68
- }
69
- `;
70
-
71
59
  export const FrontpageArticle = ({ article, id, isWide, licenseBox }: Props) => {
72
60
  const { height = 0 } = useMastheadHeight();
73
61
  const cssVars = useMemo(() => ({ '--masthead-height': `${height}px` } as unknown as CSSProperties), [height]);
@@ -83,10 +71,12 @@ export const FrontpageArticle = ({ article, id, isWide, licenseBox }: Props) =>
83
71
 
84
72
  return (
85
73
  <StyledArticle style={cssVars}>
86
- <Heading id={id} headingStyle="h1" element="h1" margin="normal" tabIndex={-1}>
74
+ <Heading id={id} headingStyle="h1-resource" element="h1" margin="normal" tabIndex={-1}>
87
75
  {title}
88
76
  </Heading>
89
- <StyledIntroduction>{introduction}</StyledIntroduction>
77
+ <Text textStyle="ingress" element="div">
78
+ {introduction}
79
+ </Text>
90
80
  {content}
91
81
  <ArticleByline accordionHeaderVariant={'white'} licenseBox={licenseBox} displayByline={false} />
92
82
  </StyledArticle>
@@ -21,6 +21,9 @@ const FolderWrapper = styled.div`
21
21
  position: relative;
22
22
  align-items: center;
23
23
  justify-content: space-between;
24
+ text-overflow: ellipsis;
25
+ overflow: hidden;
26
+ word-break: break-word;
24
27
 
25
28
  ${mq.range({ until: breakpoints.mobileWide })} {
26
29
  &:not([data-type='list']) {
@@ -87,7 +90,6 @@ const FolderTitle = styled.h2`
87
90
  `;
88
91
 
89
92
  const MenuWrapper = styled.div`
90
- overflow: hidden;
91
93
  display: flex;
92
94
  z-index: 1;
93
95
  flex-direction: row;
@@ -102,6 +104,12 @@ const CountContainer = styled.div`
102
104
  min-height: 44px;
103
105
  gap: ${spacing.small};
104
106
  margin: 0 ${spacing.small} 0 ${spacing.nsmall};
107
+
108
+ ${mq.range({ until: breakpoints.tablet })} {
109
+ &[data-type='list'] {
110
+ display: none;
111
+ }
112
+ }
105
113
  `;
106
114
 
107
115
  const IconTextWrapper = styled.div`
@@ -115,11 +123,6 @@ const IconTextWrapper = styled.div`
115
123
  height: 13px;
116
124
  }
117
125
  ${fonts.sizes(16)};
118
- ${mq.range({ until: breakpoints.mobileWide })} {
119
- &[data-type='list'] {
120
- display: none;
121
- }
122
- }
123
126
  `;
124
127
 
125
128
  interface IconCountProps {
@@ -172,10 +175,10 @@ const Folder = ({ id, link, title, subFolders, subResources, type = 'list', menu
172
175
  </ResourceTitleLink>
173
176
  </TitleWrapper>
174
177
  <MenuWrapper>
175
- <CountContainer>
178
+ <CountContainer data-type={type}>
176
179
  {isShared && (
177
180
  // Information regarding the shared status of a folder is read previously, ignore this
178
- <IconTextWrapper data-type={type} aria-hidden>
181
+ <IconTextWrapper aria-hidden>
179
182
  <Share />
180
183
  <span>{t('myNdla.folder.sharing.shared')}</span>
181
184
  </IconTextWrapper>
@@ -7,27 +7,11 @@
7
7
  */
8
8
 
9
9
  import { MouseEvent } from 'react';
10
- import styled from '@emotion/styled';
11
- import { breakpoints, fonts, mq } from '@ndla/core';
12
10
  import { useTranslation } from 'react-i18next';
13
- import { Heading } from '@ndla/typography';
11
+ import { Heading, Text } from '@ndla/typography';
14
12
  import { ItemProps } from '../Navigation/NavigationBox';
15
13
  import { NavigationBox } from '../Navigation';
16
14
 
17
- const Introduction = styled.p`
18
- max-width: 800px;
19
- font-weight: ${fonts.weight.light};
20
- ${fonts.sizes('18px', '28px')};
21
-
22
- ${mq.range({ from: breakpoints.tablet })} {
23
- ${fonts.sizes('22px', '32px')};
24
- }
25
-
26
- ${mq.range({ from: breakpoints.desktop })} {
27
- ${fonts.sizes('26px', '36px')};
28
- }
29
- `;
30
-
31
15
  interface Props {
32
16
  id?: string;
33
17
  title: string;
@@ -40,10 +24,10 @@ const ToolboxInfo = ({ title, introduction, topics, onSelectTopic, id }: Props)
40
24
  const { t } = useTranslation();
41
25
  return (
42
26
  <>
43
- <Heading element="h1" headingStyle="h1" id={id} tabIndex={-1}>
27
+ <Heading element="h1" headingStyle="h1-resource" id={id} tabIndex={-1}>
44
28
  {title}
45
29
  </Heading>
46
- <Introduction>{introduction}</Introduction>
30
+ <Text textStyle="ingress">{introduction}</Text>
47
31
  <NavigationBox
48
32
  items={topics}
49
33
  listDirection="floating"