@ndla/ui 44.0.7 → 44.0.9

package/lib/locale/messages-se.js

@@ -1100,6 +1100,7 @@ var messages = _objectSpread(_objectSpread({
       sharing: {
         share: 'Juoge máhpa',
         shared: 'Juogaduvvon',
+        sharedFolder: 'Delt mappe',
         unShare: 'Juohkin lea loahpahuvvon. Máhppa ii leat šat juogaduvvon.',
         copyLink: 'Kopier lenke til mappa',
         link: 'Liŋka lea máŋgejuvvon.',
@@ -1300,7 +1301,10 @@ var messages = _objectSpread(_objectSpread({
       pinyin: 'Pinyin'
     }
   },
-  wordClass: (_wordClass = {}, _defineProperty(_wordClass, WordClass.WordClass.Adjective, 'Adjektiv'), _defineProperty(_wordClass, WordClass.WordClass.Adverb, 'Adverb'), _defineProperty(_wordClass, WordClass.WordClass.ProperNoun, 'Egennavn'), _defineProperty(_wordClass, WordClass.WordClass.Auxiliary, 'Hjelpeord'), _defineProperty(_wordClass, WordClass.WordClass.Complement, 'Komplement'), _defineProperty(_wordClass, WordClass.WordClass.Conjunction, 'Konjunksjon'), _defineProperty(_wordClass, WordClass.WordClass.Coverb, 'Koverb'), _defineProperty(_wordClass, WordClass.WordClass.Determiner, 'Bestemmerord'), _defineProperty(_wordClass, WordClass.WordClass.Interjection, 'Interjeksjon'), _defineProperty(_wordClass, WordClass.WordClass.Quantifier, 'Kvantor'), _defineProperty(_wordClass, WordClass.WordClass.Marker, 'Markør'), _defineProperty(_wordClass, WordClass.WordClass.ModalVerb, 'Modalverb'), _defineProperty(_wordClass, WordClass.WordClass.MeasureWord, 'Målord'), _defineProperty(_wordClass, WordClass.WordClass.Noun, 'Substantiv'), _defineProperty(_wordClass, WordClass.WordClass['Noun-zh'], 'Nomen'), _defineProperty(_wordClass, WordClass.WordClass.NounPhrase, 'Nominalfrase'), _defineProperty(_wordClass, WordClass.WordClass.Onomatopoeia, 'Onomatopoetikon'), _defineProperty(_wordClass, WordClass.WordClass.Particle, 'Partikkel'), _defineProperty(_wordClass, WordClass.WordClass.Demonstrative, 'Pekeord'), _defineProperty(_wordClass, WordClass.WordClass.PersonalPronoun, 'Personlig Pronomen'), _defineProperty(_wordClass, WordClass.WordClass.Preposition, 'Preposisjon'), _defineProperty(_wordClass, WordClass.WordClass.Pronoun, 'Pronomen'), _defineProperty(_wordClass, WordClass.WordClass.QuestionWord, 'Spørreord'), _defineProperty(_wordClass, WordClass.WordClass.LocationWord, 'Stedsord'), _defineProperty(_wordClass, WordClass.WordClass.Suffix, 'Suffiks'), _defineProperty(_wordClass, WordClass.WordClass.Numeral, 'Tallord'), _defineProperty(_wordClass, WordClass.WordClass.TimeWord, 'Tidsord'), _defineProperty(_wordClass, WordClass.WordClass.TimeExpression, 'Tidsuttrykk'), _defineProperty(_wordClass, WordClass.WordClass.StativeVerb, 'Tilstandsverb'), _defineProperty(_wordClass, WordClass.WordClass.SubordinatingConjunction, 'Subjunksjon'), _defineProperty(_wordClass, WordClass.WordClass.ExclamationWord, 'Utropsord'), _defineProperty(_wordClass, WordClass.WordClass.Expression, 'Uttrykk'), _defineProperty(_wordClass, WordClass.WordClass.Verb, 'Verb'), _defineProperty(_wordClass, WordClass.WordClass.VerbComplement, 'Verb-Komplement'), _defineProperty(_wordClass, WordClass.WordClass.VerbObject, 'Verb-Objekt'), _wordClass)
+  wordClass: (_wordClass = {}, _defineProperty(_wordClass, WordClass.WordClass.Adjective, 'Adjektiv'), _defineProperty(_wordClass, WordClass.WordClass.Adverb, 'Adverb'), _defineProperty(_wordClass, WordClass.WordClass.ProperNoun, 'Egennavn'), _defineProperty(_wordClass, WordClass.WordClass.Auxiliary, 'Hjelpeord'), _defineProperty(_wordClass, WordClass.WordClass.Complement, 'Komplement'), _defineProperty(_wordClass, WordClass.WordClass.Conjunction, 'Konjunksjon'), _defineProperty(_wordClass, WordClass.WordClass.Coverb, 'Koverb'), _defineProperty(_wordClass, WordClass.WordClass.Determiner, 'Bestemmerord'), _defineProperty(_wordClass, WordClass.WordClass.Interjection, 'Interjeksjon'), _defineProperty(_wordClass, WordClass.WordClass.Quantifier, 'Kvantor'), _defineProperty(_wordClass, WordClass.WordClass.Marker, 'Markør'), _defineProperty(_wordClass, WordClass.WordClass.ModalVerb, 'Modalverb'), _defineProperty(_wordClass, WordClass.WordClass.MeasureWord, 'Målord'), _defineProperty(_wordClass, WordClass.WordClass.Noun, 'Substantiv'), _defineProperty(_wordClass, WordClass.WordClass['Noun-zh'], 'Nomen'), _defineProperty(_wordClass, WordClass.WordClass.NounPhrase, 'Nominalfrase'), _defineProperty(_wordClass, WordClass.WordClass.Onomatopoeia, 'Onomatopoetikon'), _defineProperty(_wordClass, WordClass.WordClass.Particle, 'Partikkel'), _defineProperty(_wordClass, WordClass.WordClass.Demonstrative, 'Pekeord'), _defineProperty(_wordClass, WordClass.WordClass.PersonalPronoun, 'Personlig Pronomen'), _defineProperty(_wordClass, WordClass.WordClass.Preposition, 'Preposisjon'), _defineProperty(_wordClass, WordClass.WordClass.Pronoun, 'Pronomen'), _defineProperty(_wordClass, WordClass.WordClass.QuestionWord, 'Spørreord'), _defineProperty(_wordClass, WordClass.WordClass.LocationWord, 'Stedsord'), _defineProperty(_wordClass, WordClass.WordClass.Suffix, 'Suffiks'), _defineProperty(_wordClass, WordClass.WordClass.Numeral, 'Tallord'), _defineProperty(_wordClass, WordClass.WordClass.TimeWord, 'Tidsord'), _defineProperty(_wordClass, WordClass.WordClass.TimeExpression, 'Tidsuttrykk'), _defineProperty(_wordClass, WordClass.WordClass.StativeVerb, 'Tilstandsverb'), _defineProperty(_wordClass, WordClass.WordClass.SubordinatingConjunction, 'Subjunksjon'), _defineProperty(_wordClass, WordClass.WordClass.ExclamationWord, 'Utropsord'), _defineProperty(_wordClass, WordClass.WordClass.Expression, 'Uttrykk'), _defineProperty(_wordClass, WordClass.WordClass.Verb, 'Verb'), _defineProperty(_wordClass, WordClass.WordClass.VerbComplement, 'Verb-Komplement'), _defineProperty(_wordClass, WordClass.WordClass.VerbObject, 'Verb-Objekt'), _wordClass),
+  about: {
+    menuTitle: 'Om NDLA'
+  }
 });
 var _default = messages;
 exports.default = _default;

package/lib/locale/messages-sma.d.ts

@@ -99,6 +99,7 @@ declare const messages: {
             sharing: {
                 share: string;
                 shared: string;
+                sharedFolder: string;
                 unShare: string;
                 copyLink: string;
                 link: string;
@@ -302,6 +303,9 @@ declare const messages: {
     wordClass: {
         [x: string]: string;
     };
+    about: {
+        menuTitle: string;
+    };
     common: {
         subject: string;
         subject_plural: string;

package/lib/locale/messages-sma.js

@@ -1100,6 +1100,7 @@ var messages = _objectSpread(_objectSpread({
       sharing: {
         share: 'Del mappe',
         shared: 'Delt',
+        sharedFolder: 'Delt mappe',
         unShare: 'Delingen er avsluttet. Mappen er ikke lenger delt.',
         copyLink: 'Kopier lenke til mappa',
         link: 'Lenken er kopiert',
@@ -1300,7 +1301,10 @@ var messages = _objectSpread(_objectSpread({
       pinyin: 'Pinyin'
     }
   },
-  wordClass: (_wordClass = {}, _defineProperty(_wordClass, WordClass.WordClass.Adjective, 'Adjektiv'), _defineProperty(_wordClass, WordClass.WordClass.Adverb, 'Adverb'), _defineProperty(_wordClass, WordClass.WordClass.ProperNoun, 'Egennavn'), _defineProperty(_wordClass, WordClass.WordClass.Auxiliary, 'Hjelpeord'), _defineProperty(_wordClass, WordClass.WordClass.Complement, 'Komplement'), _defineProperty(_wordClass, WordClass.WordClass.Conjunction, 'Konjunksjon'), _defineProperty(_wordClass, WordClass.WordClass.Coverb, 'Koverb'), _defineProperty(_wordClass, WordClass.WordClass.Determiner, 'Bestemmerord'), _defineProperty(_wordClass, WordClass.WordClass.Interjection, 'Interjeksjon'), _defineProperty(_wordClass, WordClass.WordClass.Quantifier, 'Kvantor'), _defineProperty(_wordClass, WordClass.WordClass.Marker, 'Markør'), _defineProperty(_wordClass, WordClass.WordClass.ModalVerb, 'Modalverb'), _defineProperty(_wordClass, WordClass.WordClass.MeasureWord, 'Målord'), _defineProperty(_wordClass, WordClass.WordClass.Noun, 'Substantiv'), _defineProperty(_wordClass, WordClass.WordClass['Noun-zh'], 'Nomen'), _defineProperty(_wordClass, WordClass.WordClass.NounPhrase, 'Nominalfrase'), _defineProperty(_wordClass, WordClass.WordClass.Onomatopoeia, 'Onomatopoetikon'), _defineProperty(_wordClass, WordClass.WordClass.Particle, 'Partikkel'), _defineProperty(_wordClass, WordClass.WordClass.Demonstrative, 'Pekeord'), _defineProperty(_wordClass, WordClass.WordClass.PersonalPronoun, 'Personlig Pronomen'), _defineProperty(_wordClass, WordClass.WordClass.Preposition, 'Preposisjon'), _defineProperty(_wordClass, WordClass.WordClass.Pronoun, 'Pronomen'), _defineProperty(_wordClass, WordClass.WordClass.QuestionWord, 'Spørreord'), _defineProperty(_wordClass, WordClass.WordClass.LocationWord, 'Stedsord'), _defineProperty(_wordClass, WordClass.WordClass.Suffix, 'Suffiks'), _defineProperty(_wordClass, WordClass.WordClass.Numeral, 'Tallord'), _defineProperty(_wordClass, WordClass.WordClass.TimeWord, 'Tidsord'), _defineProperty(_wordClass, WordClass.WordClass.TimeExpression, 'Tidsuttrykk'), _defineProperty(_wordClass, WordClass.WordClass.StativeVerb, 'Tilstandsverb'), _defineProperty(_wordClass, WordClass.WordClass.SubordinatingConjunction, 'Subjunksjon'), _defineProperty(_wordClass, WordClass.WordClass.ExclamationWord, 'Utropsord'), _defineProperty(_wordClass, WordClass.WordClass.Expression, 'Uttrykk'), _defineProperty(_wordClass, WordClass.WordClass.Verb, 'Verb'), _defineProperty(_wordClass, WordClass.WordClass.VerbComplement, 'Verb-Komplement'), _defineProperty(_wordClass, WordClass.WordClass.VerbObject, 'Verb-Objekt'), _wordClass)
+  wordClass: (_wordClass = {}, _defineProperty(_wordClass, WordClass.WordClass.Adjective, 'Adjektiv'), _defineProperty(_wordClass, WordClass.WordClass.Adverb, 'Adverb'), _defineProperty(_wordClass, WordClass.WordClass.ProperNoun, 'Egennavn'), _defineProperty(_wordClass, WordClass.WordClass.Auxiliary, 'Hjelpeord'), _defineProperty(_wordClass, WordClass.WordClass.Complement, 'Komplement'), _defineProperty(_wordClass, WordClass.WordClass.Conjunction, 'Konjunksjon'), _defineProperty(_wordClass, WordClass.WordClass.Coverb, 'Koverb'), _defineProperty(_wordClass, WordClass.WordClass.Determiner, 'Bestemmerord'), _defineProperty(_wordClass, WordClass.WordClass.Interjection, 'Interjeksjon'), _defineProperty(_wordClass, WordClass.WordClass.Quantifier, 'Kvantor'), _defineProperty(_wordClass, WordClass.WordClass.Marker, 'Markør'), _defineProperty(_wordClass, WordClass.WordClass.ModalVerb, 'Modalverb'), _defineProperty(_wordClass, WordClass.WordClass.MeasureWord, 'Målord'), _defineProperty(_wordClass, WordClass.WordClass.Noun, 'Substantiv'), _defineProperty(_wordClass, WordClass.WordClass['Noun-zh'], 'Nomen'), _defineProperty(_wordClass, WordClass.WordClass.NounPhrase, 'Nominalfrase'), _defineProperty(_wordClass, WordClass.WordClass.Onomatopoeia, 'Onomatopoetikon'), _defineProperty(_wordClass, WordClass.WordClass.Particle, 'Partikkel'), _defineProperty(_wordClass, WordClass.WordClass.Demonstrative, 'Pekeord'), _defineProperty(_wordClass, WordClass.WordClass.PersonalPronoun, 'Personlig Pronomen'), _defineProperty(_wordClass, WordClass.WordClass.Preposition, 'Preposisjon'), _defineProperty(_wordClass, WordClass.WordClass.Pronoun, 'Pronomen'), _defineProperty(_wordClass, WordClass.WordClass.QuestionWord, 'Spørreord'), _defineProperty(_wordClass, WordClass.WordClass.LocationWord, 'Stedsord'), _defineProperty(_wordClass, WordClass.WordClass.Suffix, 'Suffiks'), _defineProperty(_wordClass, WordClass.WordClass.Numeral, 'Tallord'), _defineProperty(_wordClass, WordClass.WordClass.TimeWord, 'Tidsord'), _defineProperty(_wordClass, WordClass.WordClass.TimeExpression, 'Tidsuttrykk'), _defineProperty(_wordClass, WordClass.WordClass.StativeVerb, 'Tilstandsverb'), _defineProperty(_wordClass, WordClass.WordClass.SubordinatingConjunction, 'Subjunksjon'), _defineProperty(_wordClass, WordClass.WordClass.ExclamationWord, 'Utropsord'), _defineProperty(_wordClass, WordClass.WordClass.Expression, 'Uttrykk'), _defineProperty(_wordClass, WordClass.WordClass.Verb, 'Verb'), _defineProperty(_wordClass, WordClass.WordClass.VerbComplement, 'Verb-Komplement'), _defineProperty(_wordClass, WordClass.WordClass.VerbObject, 'Verb-Objekt'), _wordClass),
+  about: {
+    menuTitle: 'Om NDLA'
+  }
 });
 var _default = messages;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/ui",
-  "version": "44.0.7",
+  "version": "44.0.9",
   "description": "UI component library for NDLA.",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -83,5 +83,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "39689c91e40ef6b81e4907354f1898cd6b69124c"
+  "gitHead": "a2f7fb4193e9f9403bd08c08a8d4959395cd8f82"
 }

package/src/CampaignBlock/CampaignBlock.tsx

@@ -94,7 +94,7 @@ const CampaignBlock = ({
   className,
 }: Props) => {
   return (
-    <Container className={className}>
+    <Container className={className} data-type="campaign-block">
       {imageBefore && <StyledImg src={imageBefore.src} />}
       <TextWrapper>
         <Heading css={headingStyle}>{title.title}</Heading>

package/src/FrontpageArticle/FrontpageArticle.tsx

@@ -6,27 +6,49 @@
  *
  */
 
-import { ReactNode } from 'react';
-import { breakpoints, fonts, mq, spacing } from '@ndla/core';
+import { CSSProperties, ReactNode, useMemo } from 'react';
+import { breakpoints, fonts, mq, spacing, spacingUnit } from '@ndla/core';
 import styled from '@emotion/styled';
 import { Article } from '../types';
 import LayoutItem from '../Layout';
 import { Heading } from '../Typography';
 import { ArticleByline } from '../Article';
+import { useMastheadHeight } from '../Masthead';
 
 interface Props {
-  article: Article;
-  children?: ReactNode;
+  article: Omit<Article, 'footNotes'>;
   id: string;
   isWide?: boolean;
   licenseBox?: ReactNode;
 }
 
+export const FRONTPAGE_ARTICLE_MAX_WIDTH = '773px';
+export const WIDE_FRONTPAGE_ARTICLE_MAX_WIDTH = '1100px';
+
 const StyledArticle = styled.article`
   width: 100%;
   max-width: 773px;
+  h2[id] {
+    margin-top: ${spacing.large};
+  }
+  div[data-type='campaign-block'] {
+    margin: ${spacing.large} 0px;
+  }
+  div[data-type='grid'] {
+    h2,
+    h3,
+    h4 {
+      margin-top: 0px;
+    }
+  }
   &[data-wide='true'] {
     max-width: 1100px;
+    h2[id] {
+      margin-top: ${spacingUnit * 4}px;
+    }
+    div[data-type='campaign-block'] {
+      margin: ${spacingUnit * 4}px 0px;
+    }
   }
 `;
 
@@ -43,11 +65,13 @@ const StyledIntroduction = styled.div`
 `;
 
 export const FrontpageArticle = ({ article, id, isWide, licenseBox }: Props) => {
+  const { height = 0 } = useMastheadHeight();
+  const cssVars = useMemo(() => ({ '--masthead-height': `${height}px` } as unknown as CSSProperties), [height]);
   const { title, introduction, content } = article;
 
   if (isWide) {
     return (
-      <StyledArticle data-wide={isWide}>
+      <StyledArticle data-wide={isWide} style={cssVars}>
         <LayoutItem>{content}</LayoutItem>
       </StyledArticle>
     );
@@ -58,7 +82,7 @@ export const FrontpageArticle = ({ article, id, isWide, licenseBox }: Props) =>
       ? article.copyright.creators
       : article.copyright.processors;
   return (
-    <StyledArticle>
+    <StyledArticle style={cssVars}>
       <LayoutItem>
         <Heading id={id} headingStyle="h1" element="h1" margin="normal" tabIndex={-1}>
           {title}
@@ -71,7 +95,6 @@ export const FrontpageArticle = ({ article, id, isWide, licenseBox }: Props) =>
         suppliers={article.copyright.rightsholders}
         license={article.copyright.license?.license!}
         published={article.published}
-        footnotes={article.footNotes}
         accordionHeaderVariant={'white'}
         licenseBox={licenseBox}
       />

package/src/FrontpageArticle/index.ts

@@ -6,6 +6,8 @@
  *
  */
 
-import FrontpageArticle from './FrontpageArticle';
+import FrontpageArticle, { FRONTPAGE_ARTICLE_MAX_WIDTH, WIDE_FRONTPAGE_ARTICLE_MAX_WIDTH } from './FrontpageArticle';
+
+export { FRONTPAGE_ARTICLE_MAX_WIDTH, WIDE_FRONTPAGE_ARTICLE_MAX_WIDTH };
 
 export default FrontpageArticle;

package/src/Grid/Grid.tsx

@@ -90,7 +90,7 @@ const Grid = ({ columns, border, children, background, size, ...rest }: GridProp
 const StyledGridParallaxItem = styled.div`
   position: relative;
   > div {
-    top: 0px;
+    top: var(--masthead-height, 0px);
     position: sticky;
   }
 `;

package/src/index.ts

@@ -268,7 +268,11 @@ export type { GridType } from './Grid';
 export { Heading } from './Typography';
 export type { HeadingLevel } from './types';
 
-export { default as FrontpageArticle } from './FrontpageArticle';
+export {
+  default as FrontpageArticle,
+  FRONTPAGE_ARTICLE_MAX_WIDTH,
+  WIDE_FRONTPAGE_ARTICLE_MAX_WIDTH,
+} from './FrontpageArticle';
 export { DefinitionTerm, DefinitionDescription } from './DefinitionList';
 export type { ProgrammeV2 } from './ProgrammeCard';
 

package/src/locale/messages-en.ts

@@ -1138,6 +1138,7 @@ const messages = {
       sharing: {
         share: 'Share folder',
         shared: 'Shared',
+        sharedFolder: 'Shared folder',
         unShare: 'Sharing stopped. The folder is no longer shared',
         copyLink: 'Copy link to folder',
         link: 'Link is copied',
@@ -1383,6 +1384,9 @@ const messages = {
     [WordClass.WordClass.VerbComplement]: 'Verb-Complement',
     [WordClass.WordClass.VerbObject]: 'Verb-Object',
   },
+  about: {
+    menuTitle: 'About NDLA',
+  },
 };
 
 export default messages;

package/src/locale/messages-nb.ts

@@ -1137,6 +1137,7 @@ const messages = {
       sharing: {
         share: 'Del mappe',
         shared: 'Delt',
+        sharedFolder: 'Delt mappe',
         unShare: 'Delingen er avsluttet. Mappen er ikke lenger delt.',
         copyLink: 'Kopier lenke til mappa',
         link: 'Lenken er kopiert',
@@ -1379,6 +1380,9 @@ const messages = {
     [WordClass.WordClass.VerbComplement]: 'Verb-Komplement',
     [WordClass.WordClass.VerbObject]: 'Verb-Objekt',
   },
+  about: {
+    menuTitle: 'Om NDLA',
+  },
 };
 
 export default messages;

package/src/locale/messages-nn.ts

@@ -1137,6 +1137,7 @@ const messages = {
       sharing: {
         share: 'Del mappe',
         shared: 'Delt',
+        sharedFolder: 'Delt mappe',
         unShare: 'Delinga er avslutta. Mappa er ikkje lenger delt',
         link: 'Lenka er kopiert',
         copyLink: 'Kopier lenke til mappa',
@@ -1379,6 +1380,9 @@ const messages = {
     [WordClass.WordClass.VerbComplement]: 'Verb-Komplement',
     [WordClass.WordClass.VerbObject]: 'Verb-Objekt',
   },
+  about: {
+    menuTitle: 'Om NDLA',
+  },
 };
 
 export default messages;

package/src/locale/messages-se.ts

@@ -1138,6 +1138,7 @@ const messages = {
       sharing: {
         share: 'Juoge máhpa',
         shared: 'Juogaduvvon',
+        sharedFolder: 'Delt mappe',
         unShare: 'Juohkin lea loahpahuvvon. Máhppa ii leat šat juogaduvvon.',
         copyLink: 'Kopier lenke til mappa',
         link: 'Liŋka lea máŋgejuvvon.',
@@ -1380,6 +1381,9 @@ const messages = {
     [WordClass.WordClass.VerbComplement]: 'Verb-Komplement',
     [WordClass.WordClass.VerbObject]: 'Verb-Objekt',
   },
+  about: {
+    menuTitle: 'Om NDLA',
+  },
 };
 
 export default messages;

package/src/locale/messages-sma.ts

@@ -1141,6 +1141,7 @@ const messages = {
       sharing: {
         share: 'Del mappe',
         shared: 'Delt',
+        sharedFolder: 'Delt mappe',
         unShare: 'Delingen er avsluttet. Mappen er ikke lenger delt.',
         copyLink: 'Kopier lenke til mappa',
         link: 'Lenken er kopiert',
@@ -1384,6 +1385,9 @@ const messages = {
     [WordClass.WordClass.VerbComplement]: 'Verb-Komplement',
     [WordClass.WordClass.VerbObject]: 'Verb-Objekt',
   },
+  about: {
+    menuTitle: 'Om NDLA',
+  },
 };
 
 export default messages;