@ndla/ui 44.0.11 → 44.0.12

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.
@@ -151,6 +151,7 @@ declare const messages: {
151
151
  detailView: string;
152
152
  shortView: string;
153
153
  sharedFolder: {
154
+ folderCopied: string;
154
155
  info: string;
155
156
  firstShared: string;
156
157
  learningpathUnsupported: string;
@@ -1154,6 +1154,7 @@ var messages = _objectSpread(_objectSpread({
1154
1154
  detailView: 'Detailed listview',
1155
1155
  shortView: 'Card view',
1156
1156
  sharedFolder: {
1157
+ folderCopied: 'The folder was copied.',
1157
1158
  info: 'This folder contains learning resources and tasks from NDLA, gathered by a teacher.',
1158
1159
  firstShared: 'The folder was shared for the first time {{date}}',
1159
1160
  learningpathUnsupported: 'Learning paths and multidisciplinary cases cannot be shown directly in a shared folder. You can open the learning path in a new tab by clicking the link in the navigation menu to the left.',
@@ -151,6 +151,7 @@ declare const messages: {
151
151
  detailView: string;
152
152
  shortView: string;
153
153
  sharedFolder: {
154
+ folderCopied: string;
154
155
  info: string;
155
156
  firstShared: string;
156
157
  learningpathUnsupported: string;
@@ -1152,6 +1152,7 @@ var messages = _objectSpread(_objectSpread({
1152
1152
  detailView: 'Detaljert listevisning',
1153
1153
  shortView: 'Kort visning',
1154
1154
  sharedFolder: {
1155
+ folderCopied: 'Mappen har blitt kopiert.',
1155
1156
  info: 'Denne mappa inneholder fagstoff og oppgaver fra NDLA, samlet av en lærer. ',
1156
1157
  firstShared: 'Mappa ble delt første gang {{date}}',
1157
1158
  learningpathUnsupported: 'Læringsstier og tverrfaglige caser kan ikke vises direkte i delte mapper. Dersom du trykker på lenka i navigasjonsmenyen til venstre, vil stien åpnes i en ny fane.',
@@ -151,6 +151,7 @@ declare const messages: {
151
151
  detailView: string;
152
152
  shortView: string;
153
153
  sharedFolder: {
154
+ folderCopied: string;
154
155
  info: string;
155
156
  firstShared: string;
156
157
  drawerButton: string;
@@ -1152,6 +1152,7 @@ var messages = _objectSpread(_objectSpread({
1152
1152
  detailView: 'Detaljert listevisning',
1153
1153
  shortView: 'Kortvisning',
1154
1154
  sharedFolder: {
1155
+ folderCopied: 'Mappa vart kopiert.',
1155
1156
  info: 'Denne mappa inneheld fagstoff og oppgåver frå NDLA, samla av ein lærar.',
1156
1157
  firstShared: 'Mappa vart delt første gong {{date}}',
1157
1158
  drawerButton: 'Vis mapper og ressursar',
@@ -151,6 +151,7 @@ declare const messages: {
151
151
  detailView: string;
152
152
  shortView: string;
153
153
  sharedFolder: {
154
+ folderCopied: string;
154
155
  info: string;
155
156
  firstShared: string;
156
157
  drawerButton: string;
@@ -1152,6 +1152,7 @@ var messages = _objectSpread(_objectSpread({
1152
1152
  detailView: 'Bienalaš oppalašlistu',
1153
1153
  shortView: 'Oanehis listu',
1154
1154
  sharedFolder: {
1155
+ folderCopied: 'Mappen har blitt kopiert.',
1155
1156
  info: 'Dán máhpas lea NDLA fágasisdoallu ja bargobihtát, čohkkejuvvon oahpaheaddjis.',
1156
1157
  firstShared: 'Máhppa juogaduvvui vuosttaš geardde {{date}}',
1157
1158
  drawerButton: 'Čájet máhpaid ja resurssaid',
@@ -151,6 +151,7 @@ declare const messages: {
151
151
  detailView: string;
152
152
  shortView: string;
153
153
  sharedFolder: {
154
+ folderCopied: string;
154
155
  info: string;
155
156
  firstShared: string;
156
157
  drawerButton: string;
@@ -1152,6 +1152,7 @@ var messages = _objectSpread(_objectSpread({
1152
1152
  detailView: 'Detaljert listevisning',
1153
1153
  shortView: 'Kort visning',
1154
1154
  sharedFolder: {
1155
+ folderCopied: 'Mappen har blitt kopiert.',
1155
1156
  info: 'Denne mappa inneheld fagstoff og oppgåver frå NDLA, samla av ein lærar.',
1156
1157
  firstShared: 'Mappa vart delt første gong {{date}}',
1157
1158
  drawerButton: 'Vis mapper og ressursar',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ndla/ui",
3
- "version": "44.0.11",
3
+ "version": "44.0.12",
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.18",
34
+ "@ndla/accordion": "^2.2.19",
35
35
  "@ndla/article-scripts": "^3.0.20",
36
- "@ndla/button": "^11.0.3",
37
- "@ndla/carousel": "^3.1.13",
38
- "@ndla/core": "^4.1.4",
39
- "@ndla/dropdown-menu": "^1.0.2",
40
- "@ndla/forms": "^4.3.18",
36
+ "@ndla/button": "^11.0.4",
37
+ "@ndla/carousel": "^3.1.14",
38
+ "@ndla/core": "^4.1.5",
39
+ "@ndla/dropdown-menu": "^1.0.3",
40
+ "@ndla/forms": "^4.3.19",
41
41
  "@ndla/hooks": "^2.0.9",
42
- "@ndla/icons": "^4.0.3",
42
+ "@ndla/icons": "^4.0.4",
43
43
  "@ndla/licenses": "^7.1.3",
44
- "@ndla/modal": "^4.0.2",
45
- "@ndla/notion": "^5.0.17",
46
- "@ndla/safelink": "^4.1.17",
47
- "@ndla/select": "^2.4.9",
48
- "@ndla/switch": "^1.1.9",
49
- "@ndla/tabs": "^3.0.5",
50
- "@ndla/tooltip": "^4.1.15",
44
+ "@ndla/modal": "^4.0.3",
45
+ "@ndla/notion": "^5.0.18",
46
+ "@ndla/safelink": "^4.1.18",
47
+ "@ndla/select": "^2.4.10",
48
+ "@ndla/switch": "^1.1.10",
49
+ "@ndla/tabs": "^3.0.6",
50
+ "@ndla/tooltip": "^4.1.16",
51
51
  "@ndla/util": "^3.1.15",
52
52
  "@radix-ui/react-popover": "^1.0.6",
53
53
  "@radix-ui/react-slider": "^1.1.2",
@@ -83,5 +83,5 @@
83
83
  "publishConfig": {
84
84
  "access": "public"
85
85
  },
86
- "gitHead": "7c947d3a6bee5724031ca2dac8b24af20b466834"
86
+ "gitHead": "34623f3f23a922343d9de9746ea901cf1e2065ce"
87
87
  }
@@ -139,7 +139,6 @@ const ArticleByline = ({
139
139
  const license = getLicenseByAbbreviation(licenseString, locale);
140
140
 
141
141
  const showPrimaryContributors = suppliers.length > 0 || authors.length > 0;
142
- const showSecondaryContributors = suppliers.length > 0 && authors.length > 0;
143
142
 
144
143
  return (
145
144
  <Wrapper>
@@ -148,12 +147,12 @@ const ArticleByline = ({
148
147
  <LicenseLink license={license} />
149
148
  {showPrimaryContributors && (
150
149
  <PrimaryContributorsWrapper>
151
- {authors.length > 0
152
- ? t('article.authorsLabel', {
153
- names: renderContributors(authors, t),
154
- interpolation: { escapeValue: false },
155
- })
156
- : getSuppliersText(suppliers, t)}
150
+ {authors.length > 0 &&
151
+ `${t('article.authorsLabel', {
152
+ names: renderContributors(authors, t),
153
+ interpolation: { escapeValue: false },
154
+ })}. `}
155
+ {getSuppliersText(suppliers, t)}
157
156
  </PrimaryContributorsWrapper>
158
157
  )}
159
158
  </LicenseWrapper>
@@ -161,7 +160,6 @@ const ArticleByline = ({
161
160
  {t('article.lastUpdated')} {published}
162
161
  </div>
163
162
  </TextWrapper>
164
- {showSecondaryContributors && <TextWrapper>{getSuppliersText(suppliers, t)}</TextWrapper>}
165
163
  <AccordionRoot type="multiple" onValueChange={setOpenAccordions} value={openAccordions}>
166
164
  {licenseBox && (
167
165
  <AccordionItem value="rulesForUse">
@@ -58,7 +58,7 @@ const ContentText = styled.p`
58
58
  `;
59
59
  const LinkText = styled(SafeLink)`
60
60
  font-size: ${fonts.sizes(16)};
61
- color: ${colors.brand.grey};
61
+ color: ${colors.brand.primary};
62
62
  `;
63
63
  const TitleText = styled.h2`
64
64
  margin-top: 7px;
@@ -150,6 +150,11 @@ article table {
150
150
  @include font-size(15px, 30px);
151
151
  }
152
152
 
153
+ ol,
154
+ ul {
155
+ font-size: unset !important;
156
+ }
157
+
153
158
  p {
154
159
  line-height: 1.6em;
155
160
  }
@@ -1197,6 +1197,7 @@ const messages = {
1197
1197
  detailView: 'Detailed listview',
1198
1198
  shortView: 'Card view',
1199
1199
  sharedFolder: {
1200
+ folderCopied: 'The folder was copied.',
1200
1201
  info: 'This folder contains learning resources and tasks from NDLA, gathered by a teacher.',
1201
1202
  firstShared: 'The folder was shared for the first time {{date}}',
1202
1203
  learningpathUnsupported:
@@ -1194,6 +1194,7 @@ const messages = {
1194
1194
  detailView: 'Detaljert listevisning',
1195
1195
  shortView: 'Kort visning',
1196
1196
  sharedFolder: {
1197
+ folderCopied: 'Mappen har blitt kopiert.',
1197
1198
  info: 'Denne mappa inneholder fagstoff og oppgaver fra NDLA, samlet av en lærer. ',
1198
1199
  firstShared: 'Mappa ble delt første gang {{date}}',
1199
1200
  learningpathUnsupported:
@@ -1194,6 +1194,7 @@ const messages = {
1194
1194
  detailView: 'Detaljert listevisning',
1195
1195
  shortView: 'Kortvisning',
1196
1196
  sharedFolder: {
1197
+ folderCopied: 'Mappa vart kopiert.',
1197
1198
  info: 'Denne mappa inneheld fagstoff og oppgåver frå NDLA, samla av ein lærar.',
1198
1199
  firstShared: 'Mappa vart delt første gong {{date}}',
1199
1200
  drawerButton: 'Vis mapper og ressursar',
@@ -1195,6 +1195,7 @@ const messages = {
1195
1195
  detailView: 'Bienalaš oppalašlistu',
1196
1196
  shortView: 'Oanehis listu',
1197
1197
  sharedFolder: {
1198
+ folderCopied: 'Mappen har blitt kopiert.',
1198
1199
  info: 'Dán máhpas lea NDLA fágasisdoallu ja bargobihtát, čohkkejuvvon oahpaheaddjis.',
1199
1200
  firstShared: 'Máhppa juogaduvvui vuosttaš geardde {{date}}',
1200
1201
  drawerButton: 'Čájet máhpaid ja resurssaid',
@@ -1199,6 +1199,7 @@ const messages = {
1199
1199
  detailView: 'Detaljert listevisning',
1200
1200
  shortView: 'Kort visning',
1201
1201
  sharedFolder: {
1202
+ folderCopied: 'Mappen har blitt kopiert.',
1202
1203
  info: 'Denne mappa inneheld fagstoff og oppgåver frå NDLA, samla av ein lærar.',
1203
1204
  firstShared: 'Mappa vart delt første gong {{date}}',
1204
1205
  drawerButton: 'Vis mapper og ressursar',