@ndla/ui 4.3.1 → 5.0.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.
- package/README.md +11 -11
- package/es/Article/Article.js +3 -7
- package/es/Article/ArticleByline.js +4 -4
- package/es/Article/ArticleNotions.js +37 -92
- package/es/ContentTypeBadge/ContentTypeBadge.js +10 -1
- package/es/FactBox/FactBox.js +36 -11
- package/es/Filter/FilterButtons.js +18 -17
- package/es/Filter/FilterCarousel.js +198 -0
- package/es/Masthead/Masthead.js +24 -2
- package/es/Notion/ConceptNotion.js +57 -0
- package/es/Notion/FigureNotion.js +84 -0
- package/es/Notion/Notion.js +122 -48
- package/es/Notion/NotionImage.js +47 -0
- package/es/Notion/NotionVisualElement.js +38 -0
- package/es/Notion/index.js +2 -1
- package/es/SearchTypeResult/ActiveFilterContent.js +17 -2
- package/es/SearchTypeResult/ActiveFilters.js +64 -50
- package/es/SearchTypeResult/PopupFilter.js +28 -125
- package/es/SearchTypeResult/ResultNavigation.js +41 -14
- package/es/SearchTypeResult/SearchFieldHeader.js +20 -41
- package/es/SearchTypeResult/SearchFilterContent.js +61 -0
- package/es/SearchTypeResult/SearchHeader.js +51 -28
- package/es/SearchTypeResult/SearchItem.js +64 -190
- package/es/SearchTypeResult/SearchItemList.js +132 -0
- package/es/SearchTypeResult/SearchItems.js +17 -13
- package/es/SearchTypeResult/SearchNotionItem.js +13 -13
- package/es/SearchTypeResult/SearchNotionsResult.js +16 -21
- package/es/SearchTypeResult/SearchTypeHeader.js +43 -26
- package/es/SearchTypeResult/SearchTypeResult.js +7 -5
- package/es/SearchTypeResult/SearchViewType.js +93 -0
- package/es/SearchTypeResult/components/ItemContexts.js +125 -0
- package/es/SearchTypeResult/components/ItemResourceHeader.js +87 -0
- package/es/SearchTypeResult/components/ItemTopicHeader.js +56 -0
- package/es/SearchTypeResult/components/SubjectFilters.js +177 -0
- package/es/SearchTypeResult/index.js +2 -1
- package/es/all.css +1 -1
- package/es/index.js +3 -2
- package/es/locale/messages-en.js +21 -6
- package/es/locale/messages-nb.js +21 -6
- package/es/locale/messages-nn.js +21 -6
- package/es/model/ContentType.js +2 -1
- package/es/shapes.js +1 -1
- package/lib/Article/Article.d.ts +4 -5
- package/lib/Article/Article.js +3 -7
- package/lib/Article/ArticleByline.js +4 -4
- package/lib/Article/ArticleNotions.d.ts +3 -8
- package/lib/Article/ArticleNotions.js +41 -90
- package/lib/ContentTypeBadge/ContentTypeBadge.d.ts +1 -0
- package/lib/ContentTypeBadge/ContentTypeBadge.js +14 -2
- package/lib/FactBox/FactBox.js +41 -8
- package/lib/Filter/FilterButtons.d.ts +3 -10
- package/lib/Filter/FilterButtons.js +19 -17
- package/lib/Filter/FilterCarousel.d.ts +13 -0
- package/lib/Filter/FilterCarousel.js +207 -0
- package/lib/Masthead/Masthead.js +30 -2
- package/lib/Notion/ConceptNotion.d.ts +25 -0
- package/lib/Notion/ConceptNotion.js +79 -0
- package/lib/Notion/FigureNotion.d.ts +23 -0
- package/lib/Notion/FigureNotion.js +99 -0
- package/lib/Notion/Notion.d.ts +24 -11
- package/lib/Notion/Notion.js +120 -48
- package/lib/Notion/NotionImage.d.ts +15 -0
- package/lib/Notion/NotionImage.js +63 -0
- package/lib/Notion/NotionVisualElement.d.ts +22 -0
- package/lib/Notion/NotionVisualElement.js +51 -0
- package/lib/Notion/index.d.ts +1 -0
- package/lib/Notion/index.js +8 -0
- package/lib/SearchTypeResult/ActiveFilterContent.js +16 -9
- package/lib/SearchTypeResult/ActiveFilters.d.ts +2 -1
- package/lib/SearchTypeResult/ActiveFilters.js +65 -50
- package/lib/SearchTypeResult/PopupFilter.d.ts +13 -19
- package/lib/SearchTypeResult/PopupFilter.js +27 -123
- package/lib/SearchTypeResult/ResultNavigation.d.ts +2 -2
- package/lib/SearchTypeResult/ResultNavigation.js +38 -14
- package/lib/SearchTypeResult/SearchFieldHeader.d.ts +3 -8
- package/lib/SearchTypeResult/SearchFieldHeader.js +18 -39
- package/lib/SearchTypeResult/SearchFilterContent.d.ts +16 -0
- package/lib/SearchTypeResult/SearchFilterContent.js +67 -0
- package/lib/SearchTypeResult/SearchHeader.d.ts +3 -7
- package/lib/SearchTypeResult/SearchHeader.js +59 -30
- package/lib/SearchTypeResult/SearchItem.d.ts +8 -12
- package/lib/SearchTypeResult/SearchItem.js +64 -187
- package/lib/SearchTypeResult/SearchItemList.d.ts +10 -0
- package/lib/SearchTypeResult/SearchItemList.js +139 -0
- package/lib/SearchTypeResult/SearchItems.d.ts +4 -3
- package/lib/SearchTypeResult/SearchItems.js +18 -13
- package/lib/SearchTypeResult/SearchNotionItem.js +13 -13
- package/lib/SearchTypeResult/SearchNotionsResult.d.ts +2 -4
- package/lib/SearchTypeResult/SearchNotionsResult.js +23 -23
- package/lib/SearchTypeResult/SearchTypeHeader.d.ts +2 -2
- package/lib/SearchTypeResult/SearchTypeHeader.js +40 -25
- package/lib/SearchTypeResult/SearchTypeResult.d.ts +7 -6
- package/lib/SearchTypeResult/SearchTypeResult.js +7 -5
- package/lib/SearchTypeResult/SearchViewType.d.ts +13 -0
- package/lib/SearchTypeResult/SearchViewType.js +99 -0
- package/lib/SearchTypeResult/components/ItemContexts.d.ts +19 -0
- package/lib/SearchTypeResult/components/ItemContexts.js +134 -0
- package/lib/SearchTypeResult/components/ItemResourceHeader.d.ts +16 -0
- package/lib/SearchTypeResult/components/ItemResourceHeader.js +98 -0
- package/lib/SearchTypeResult/components/ItemTopicHeader.d.ts +17 -0
- package/lib/SearchTypeResult/components/ItemTopicHeader.js +67 -0
- package/lib/SearchTypeResult/components/SubjectFilters.d.ts +32 -0
- package/lib/SearchTypeResult/components/SubjectFilters.js +192 -0
- package/lib/SearchTypeResult/index.d.ts +2 -1
- package/lib/SearchTypeResult/index.js +8 -0
- package/lib/all.css +1 -1
- package/lib/index.d.ts +2 -1
- package/lib/index.js +24 -1
- package/lib/locale/messages-en.d.ts +16 -1
- package/lib/locale/messages-en.js +21 -6
- package/lib/locale/messages-nb.d.ts +15 -0
- package/lib/locale/messages-nb.js +21 -6
- package/lib/locale/messages-nn.d.ts +16 -1
- package/lib/locale/messages-nn.js +21 -6
- package/lib/model/ContentType.d.ts +1 -0
- package/lib/model/ContentType.js +4 -2
- package/lib/shapes.js +1 -1
- package/lib/types.d.ts +1 -0
- package/package.json +14 -14
- package/src/Article/Article.tsx +8 -15
- package/src/Article/ArticleByline.tsx +1 -1
- package/src/Article/ArticleNotions.tsx +13 -33
- package/src/ContentTypeBadge/ContentTypeBadge.tsx +8 -0
- package/src/ContentTypeBadge/component.content-type-badge.scss +5 -0
- package/src/FactBox/FactBox.tsx +22 -15
- package/src/Figure/component.figure.scss +1 -1
- package/src/Filter/FilterButtons.tsx +14 -15
- package/src/Filter/FilterCarousel.tsx +166 -0
- package/src/Masthead/Masthead.tsx +42 -18
- package/src/Notion/ConceptNotion.tsx +80 -0
- package/src/Notion/FigureNotion.tsx +88 -0
- package/src/Notion/Notion.tsx +205 -75
- package/src/Notion/NotionImage.tsx +51 -0
- package/src/Notion/NotionVisualElement.tsx +50 -0
- package/src/Notion/index.ts +1 -0
- package/src/SearchTypeResult/ActiveFilterContent.tsx +7 -2
- package/src/SearchTypeResult/ActiveFilters.tsx +72 -38
- package/src/SearchTypeResult/PopupFilter.tsx +73 -146
- package/src/SearchTypeResult/ResultNavigation.tsx +54 -16
- package/src/SearchTypeResult/SearchFieldHeader.tsx +15 -40
- package/src/SearchTypeResult/SearchFilterContent.tsx +63 -0
- package/src/SearchTypeResult/SearchHeader.tsx +31 -31
- package/src/SearchTypeResult/SearchItem.tsx +145 -233
- package/src/SearchTypeResult/SearchItemList.tsx +167 -0
- package/src/SearchTypeResult/SearchItems.tsx +26 -19
- package/src/SearchTypeResult/SearchNotionItem.tsx +5 -12
- package/src/SearchTypeResult/SearchNotionsResult.tsx +29 -22
- package/src/SearchTypeResult/SearchTypeHeader.tsx +51 -33
- package/src/SearchTypeResult/SearchTypeResult.tsx +13 -12
- package/src/SearchTypeResult/SearchViewType.tsx +109 -0
- package/src/SearchTypeResult/components/ItemContexts.tsx +138 -0
- package/src/SearchTypeResult/components/ItemResourceHeader.tsx +133 -0
- package/src/SearchTypeResult/components/ItemTopicHeader.tsx +95 -0
- package/src/SearchTypeResult/components/SubjectFilters.tsx +152 -0
- package/src/SearchTypeResult/index.ts +9 -1
- package/src/index.ts +3 -0
- package/src/locale/messages-en.ts +19 -4
- package/src/locale/messages-nb.ts +19 -4
- package/src/locale/messages-nn.ts +19 -4
- package/src/model/ContentType.ts +1 -0
- package/src/shapes.js +1 -0
- package/src/types.ts +1 -0
package/lib/index.d.ts
CHANGED
|
@@ -48,7 +48,7 @@ export { NavigationHeading, NavigationBox, NavigationTopicAbout } from './Naviga
|
|
|
48
48
|
export { default as Programme } from './Programme';
|
|
49
49
|
export { default as CompetenceGoalTab } from './CompetenceGoalTab';
|
|
50
50
|
export { default as MultidisciplinarySubject, MultidisciplinarySubjectHeader } from './MultidisciplinarySubject';
|
|
51
|
-
export { SearchTypeResult, SearchHeader, SearchFieldHeader, SearchNotionsResult, SearchSubjectResult, } from './SearchTypeResult';
|
|
51
|
+
export { SearchTypeResult, SearchHeader, SearchFieldHeader, SearchNotionsResult, SearchSubjectResult, SearchFilterContent, } from './SearchTypeResult';
|
|
52
52
|
export { default as constants } from './model';
|
|
53
53
|
export { default as messagesNB } from './locale/messages-nb';
|
|
54
54
|
export { default as messagesNN } from './locale/messages-nn';
|
|
@@ -71,3 +71,4 @@ export { default as ContentTypeBadge, SubjectMaterialBadge, TasksAndActivitiesBa
|
|
|
71
71
|
export { SubjectAbout, SubjectArchive, SubjectCarousel, SubjectChildContent, SubjectContent, SubjectFilter, SubjectFlexChild, SubjectFlexWrapper, SubjectHeader, SubjectLinks, SubjectNewContent, SubjectSecondaryContent, SubjectSectionTitle, SubjectShortcuts, SubjectSidebarWrapper, SubjectSocialContent, SubjectSocialSection, SubjectTopics, SubjectBanner, } from './Subject';
|
|
72
72
|
export { default as ContentCard } from './ContentCard';
|
|
73
73
|
export { default as CopyParagraphButton } from './CopyParagraphButton';
|
|
74
|
+
export { Notion, ConceptNotion } from './Notion';
|
package/lib/index.js
CHANGED
|
@@ -105,6 +105,7 @@ var _exportNames = {
|
|
|
105
105
|
SearchFieldHeader: true,
|
|
106
106
|
SearchNotionsResult: true,
|
|
107
107
|
SearchSubjectResult: true,
|
|
108
|
+
SearchFilterContent: true,
|
|
108
109
|
constants: true,
|
|
109
110
|
messagesNB: true,
|
|
110
111
|
messagesNN: true,
|
|
@@ -165,7 +166,9 @@ var _exportNames = {
|
|
|
165
166
|
SubjectTopics: true,
|
|
166
167
|
SubjectBanner: true,
|
|
167
168
|
ContentCard: true,
|
|
168
|
-
CopyParagraphButton: true
|
|
169
|
+
CopyParagraphButton: true,
|
|
170
|
+
Notion: true,
|
|
171
|
+
ConceptNotion: true
|
|
169
172
|
};
|
|
170
173
|
Object.defineProperty(exports, "ArticleByline", {
|
|
171
174
|
enumerable: true,
|
|
@@ -761,6 +764,12 @@ Object.defineProperty(exports, "SearchSubjectResult", {
|
|
|
761
764
|
return _SearchTypeResult.SearchSubjectResult;
|
|
762
765
|
}
|
|
763
766
|
});
|
|
767
|
+
Object.defineProperty(exports, "SearchFilterContent", {
|
|
768
|
+
enumerable: true,
|
|
769
|
+
get: function get() {
|
|
770
|
+
return _SearchTypeResult.SearchFilterContent;
|
|
771
|
+
}
|
|
772
|
+
});
|
|
764
773
|
Object.defineProperty(exports, "constants", {
|
|
765
774
|
enumerable: true,
|
|
766
775
|
get: function get() {
|
|
@@ -1127,6 +1136,18 @@ Object.defineProperty(exports, "CopyParagraphButton", {
|
|
|
1127
1136
|
return _CopyParagraphButton["default"];
|
|
1128
1137
|
}
|
|
1129
1138
|
});
|
|
1139
|
+
Object.defineProperty(exports, "Notion", {
|
|
1140
|
+
enumerable: true,
|
|
1141
|
+
get: function get() {
|
|
1142
|
+
return _Notion.Notion;
|
|
1143
|
+
}
|
|
1144
|
+
});
|
|
1145
|
+
Object.defineProperty(exports, "ConceptNotion", {
|
|
1146
|
+
enumerable: true,
|
|
1147
|
+
get: function get() {
|
|
1148
|
+
return _Notion.ConceptNotion;
|
|
1149
|
+
}
|
|
1150
|
+
});
|
|
1130
1151
|
|
|
1131
1152
|
var _indexJavascript = require("./index-javascript");
|
|
1132
1153
|
|
|
@@ -1263,6 +1284,8 @@ var _ContentCard = _interopRequireDefault(require("./ContentCard"));
|
|
|
1263
1284
|
|
|
1264
1285
|
var _CopyParagraphButton = _interopRequireDefault(require("./CopyParagraphButton"));
|
|
1265
1286
|
|
|
1287
|
+
var _Notion = require("./Notion");
|
|
1288
|
+
|
|
1266
1289
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
1267
1290
|
|
|
1268
1291
|
function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
|
|
@@ -39,6 +39,10 @@ declare const messages: {
|
|
|
39
39
|
open: string;
|
|
40
40
|
close: string;
|
|
41
41
|
};
|
|
42
|
+
factbox: {
|
|
43
|
+
open: string;
|
|
44
|
+
close: string;
|
|
45
|
+
};
|
|
42
46
|
htmlTitles: {
|
|
43
47
|
titleTemplate: string;
|
|
44
48
|
welcomePage: string;
|
|
@@ -139,6 +143,7 @@ declare const messages: {
|
|
|
139
143
|
useFilter: string;
|
|
140
144
|
closeFilter: string;
|
|
141
145
|
removeFilter: string;
|
|
146
|
+
additionalSubjectFilters: string;
|
|
142
147
|
coreRelevance: string;
|
|
143
148
|
supplementaryRelevance: string;
|
|
144
149
|
resourceTypeFilter: {
|
|
@@ -148,19 +153,24 @@ declare const messages: {
|
|
|
148
153
|
};
|
|
149
154
|
resultType: {
|
|
150
155
|
showing: string;
|
|
156
|
+
showingAll: string;
|
|
151
157
|
showMore: string;
|
|
152
158
|
showAll: string;
|
|
159
|
+
toTopOfPage: string;
|
|
153
160
|
toSubjectPageLabel: string;
|
|
154
161
|
all: string;
|
|
162
|
+
allContentTypes: string;
|
|
155
163
|
hits: string;
|
|
156
164
|
showingSearchPhrase: string;
|
|
157
|
-
showingCompetenceGoalSearchPhrase: string;
|
|
158
165
|
searchPhraseSuggestion: string;
|
|
166
|
+
showingCompetenceGoalSearchPhrase: string;
|
|
159
167
|
notionLabels: string;
|
|
160
168
|
notionsHeading: string;
|
|
161
169
|
notionsRemove: string;
|
|
162
170
|
showVideo: string;
|
|
163
171
|
showNotion: string;
|
|
172
|
+
gridView: string;
|
|
173
|
+
listView: string;
|
|
164
174
|
};
|
|
165
175
|
contextModal: {
|
|
166
176
|
button: string;
|
|
@@ -560,6 +570,7 @@ declare const messages: {
|
|
|
560
570
|
'source-material': string;
|
|
561
571
|
'assessment-resources': string;
|
|
562
572
|
topic: string;
|
|
573
|
+
'multidisciplinary-topic': string;
|
|
563
574
|
};
|
|
564
575
|
modal: {
|
|
565
576
|
closeModal: string;
|
|
@@ -841,6 +852,9 @@ declare const messages: {
|
|
|
841
852
|
};
|
|
842
853
|
readMoreDescriptionLabel: string;
|
|
843
854
|
};
|
|
855
|
+
h5p: {
|
|
856
|
+
reuse: string;
|
|
857
|
+
};
|
|
844
858
|
video: {
|
|
845
859
|
download: string;
|
|
846
860
|
reuse: string;
|
|
@@ -852,6 +866,7 @@ declare const messages: {
|
|
|
852
866
|
};
|
|
853
867
|
concept: {
|
|
854
868
|
showDescription: string;
|
|
869
|
+
reuse: string;
|
|
855
870
|
error: {
|
|
856
871
|
title: string;
|
|
857
872
|
content: string;
|
|
@@ -119,6 +119,7 @@ var messages = _objectSpread(_objectSpread({
|
|
|
119
119
|
useFilter: 'Use filter',
|
|
120
120
|
closeFilter: 'Close filter',
|
|
121
121
|
removeFilter: 'Remove filter {{filterName}}',
|
|
122
|
+
additionalSubjectFilters: '+ {{count}} subjects',
|
|
122
123
|
coreRelevance: 'Core content',
|
|
123
124
|
supplementaryRelevance: 'Supplementary content',
|
|
124
125
|
resourceTypeFilter: {
|
|
@@ -127,20 +128,25 @@ var messages = _objectSpread(_objectSpread({
|
|
|
127
128
|
}
|
|
128
129
|
},
|
|
129
130
|
resultType: {
|
|
130
|
-
showing: 'Showing {{
|
|
131
|
+
showing: 'Showing {{count}} of {{totalCount}} {{contentType}}',
|
|
132
|
+
showingAll: 'Showing all',
|
|
131
133
|
showMore: 'Show more',
|
|
132
134
|
showAll: 'Show all',
|
|
135
|
+
toTopOfPage: 'To top of page',
|
|
133
136
|
toSubjectPageLabel: 'Go to subject page',
|
|
134
137
|
all: 'All',
|
|
138
|
+
allContentTypes: 'All content-types',
|
|
135
139
|
hits: '{{count}} hits',
|
|
136
|
-
showingSearchPhrase: 'Showing
|
|
140
|
+
showingSearchPhrase: 'Showing hits for',
|
|
141
|
+
searchPhraseSuggestion: 'Search instead for',
|
|
137
142
|
showingCompetenceGoalSearchPhrase: 'Showing results for competence goals {text}',
|
|
138
|
-
searchPhraseSuggestion: 'Search instead for:',
|
|
139
143
|
notionLabels: 'Used in',
|
|
140
144
|
notionsHeading: 'Explanations',
|
|
141
145
|
notionsRemove: 'Remove',
|
|
142
146
|
showVideo: 'Watch video',
|
|
143
|
-
showNotion: 'Show notion'
|
|
147
|
+
showNotion: 'Show notion',
|
|
148
|
+
gridView: 'Grid-view',
|
|
149
|
+
listView: 'List-view'
|
|
144
150
|
},
|
|
145
151
|
contextModal: {
|
|
146
152
|
button: '+ {{count}} more contexts',
|
|
@@ -422,7 +428,7 @@ var messages = _objectSpread(_objectSpread({
|
|
|
422
428
|
heading: 'How to use other content from the article',
|
|
423
429
|
description: 'You will find guidelines for use of other content in the asset',
|
|
424
430
|
itemImage: {
|
|
425
|
-
ariaLabel: 'Open
|
|
431
|
+
ariaLabel: 'Open in new window'
|
|
426
432
|
}
|
|
427
433
|
},
|
|
428
434
|
h5p: {
|
|
@@ -515,7 +521,8 @@ var messages = _objectSpread(_objectSpread({
|
|
|
515
521
|
'external-learning-resources': 'External learning resources',
|
|
516
522
|
'source-material': 'Source material',
|
|
517
523
|
'assessment-resources': 'Assessment resource',
|
|
518
|
-
topic: 'Topic'
|
|
524
|
+
topic: 'Topic',
|
|
525
|
+
'multidisciplinary-topic': 'Multidisciplinary case'
|
|
519
526
|
},
|
|
520
527
|
modal: {
|
|
521
528
|
closeModal: 'Close'
|
|
@@ -797,6 +804,9 @@ var messages = _objectSpread(_objectSpread({
|
|
|
797
804
|
},
|
|
798
805
|
readMoreDescriptionLabel: 'show more'
|
|
799
806
|
},
|
|
807
|
+
h5p: {
|
|
808
|
+
reuse: 'Use H5P'
|
|
809
|
+
},
|
|
800
810
|
video: {
|
|
801
811
|
download: 'Download video',
|
|
802
812
|
reuse: 'Use video',
|
|
@@ -808,6 +818,7 @@ var messages = _objectSpread(_objectSpread({
|
|
|
808
818
|
},
|
|
809
819
|
concept: {
|
|
810
820
|
showDescription: 'Show concept description',
|
|
821
|
+
reuse: 'Use concept',
|
|
811
822
|
error: {
|
|
812
823
|
title: 'An error occurred',
|
|
813
824
|
content: 'Could not load the description of the concept.'
|
|
@@ -857,6 +868,10 @@ var messages = _objectSpread(_objectSpread({
|
|
|
857
868
|
slateBlockMenu: {
|
|
858
869
|
open: 'Open menu',
|
|
859
870
|
close: 'Close menu'
|
|
871
|
+
},
|
|
872
|
+
factbox: {
|
|
873
|
+
open: 'Open fact box',
|
|
874
|
+
close: 'Close fact box'
|
|
860
875
|
}
|
|
861
876
|
});
|
|
862
877
|
|
|
@@ -39,6 +39,10 @@ declare const messages: {
|
|
|
39
39
|
open: string;
|
|
40
40
|
close: string;
|
|
41
41
|
};
|
|
42
|
+
factbox: {
|
|
43
|
+
open: string;
|
|
44
|
+
close: string;
|
|
45
|
+
};
|
|
42
46
|
htmlTitles: {
|
|
43
47
|
titleTemplate: string;
|
|
44
48
|
welcomePage: string;
|
|
@@ -139,6 +143,7 @@ declare const messages: {
|
|
|
139
143
|
useFilter: string;
|
|
140
144
|
closeFilter: string;
|
|
141
145
|
removeFilter: string;
|
|
146
|
+
additionalSubjectFilters: string;
|
|
142
147
|
coreRelevance: string;
|
|
143
148
|
supplementaryRelevance: string;
|
|
144
149
|
resourceTypeFilter: {
|
|
@@ -148,10 +153,13 @@ declare const messages: {
|
|
|
148
153
|
};
|
|
149
154
|
resultType: {
|
|
150
155
|
showing: string;
|
|
156
|
+
showingAll: string;
|
|
151
157
|
showMore: string;
|
|
152
158
|
showAll: string;
|
|
159
|
+
toTopOfPage: string;
|
|
153
160
|
toSubjectPageLabel: string;
|
|
154
161
|
all: string;
|
|
162
|
+
allContentTypes: string;
|
|
155
163
|
hits: string;
|
|
156
164
|
showingSearchPhrase: string;
|
|
157
165
|
showingCompetenceGoalSearchPhrase: string;
|
|
@@ -161,6 +169,8 @@ declare const messages: {
|
|
|
161
169
|
notionsRemove: string;
|
|
162
170
|
showVideo: string;
|
|
163
171
|
showNotion: string;
|
|
172
|
+
gridView: string;
|
|
173
|
+
listView: string;
|
|
164
174
|
};
|
|
165
175
|
contextModal: {
|
|
166
176
|
button: string;
|
|
@@ -560,6 +570,7 @@ declare const messages: {
|
|
|
560
570
|
'source-material': string;
|
|
561
571
|
'assessment-resources': string;
|
|
562
572
|
topic: string;
|
|
573
|
+
'multidisciplinary-topic': string;
|
|
563
574
|
};
|
|
564
575
|
modal: {
|
|
565
576
|
closeModal: string;
|
|
@@ -841,6 +852,9 @@ declare const messages: {
|
|
|
841
852
|
};
|
|
842
853
|
readMoreDescriptionLabel: string;
|
|
843
854
|
};
|
|
855
|
+
h5p: {
|
|
856
|
+
reuse: string;
|
|
857
|
+
};
|
|
844
858
|
video: {
|
|
845
859
|
download: string;
|
|
846
860
|
reuse: string;
|
|
@@ -852,6 +866,7 @@ declare const messages: {
|
|
|
852
866
|
};
|
|
853
867
|
concept: {
|
|
854
868
|
showDescription: string;
|
|
869
|
+
reuse: string;
|
|
855
870
|
error: {
|
|
856
871
|
title: string;
|
|
857
872
|
content: string;
|
|
@@ -119,6 +119,7 @@ var messages = _objectSpread(_objectSpread({
|
|
|
119
119
|
useFilter: 'Bruk filter',
|
|
120
120
|
closeFilter: 'Lukk filter',
|
|
121
121
|
removeFilter: 'Fjern filter {{filterName}}',
|
|
122
|
+
additionalSubjectFilters: '+ {{count}} fag',
|
|
122
123
|
coreRelevance: 'Kjernestoff',
|
|
123
124
|
supplementaryRelevance: 'Tilleggsstoff',
|
|
124
125
|
resourceTypeFilter: {
|
|
@@ -127,20 +128,25 @@ var messages = _objectSpread(_objectSpread({
|
|
|
127
128
|
}
|
|
128
129
|
},
|
|
129
130
|
resultType: {
|
|
130
|
-
showing: 'Viser {{
|
|
131
|
+
showing: 'Viser {{count}} av {{totalCount}} {{contentType}}',
|
|
132
|
+
showingAll: 'Viser alle',
|
|
131
133
|
showMore: 'Vis mer',
|
|
132
134
|
showAll: 'Vis alle',
|
|
135
|
+
toTopOfPage: 'Til toppen',
|
|
133
136
|
toSubjectPageLabel: 'Gå til fagsiden',
|
|
134
137
|
all: 'Alle',
|
|
135
|
-
|
|
136
|
-
|
|
138
|
+
allContentTypes: 'Alle innholdstyper',
|
|
139
|
+
hits: '{{count}} treff',
|
|
140
|
+
showingSearchPhrase: 'Viser treff for',
|
|
137
141
|
showingCompetenceGoalSearchPhrase: 'Viser resultater for kompetansemål {text}',
|
|
138
|
-
searchPhraseSuggestion: 'Søk
|
|
142
|
+
searchPhraseSuggestion: 'Søk heller',
|
|
139
143
|
notionLabels: 'Brukes i',
|
|
140
144
|
notionsHeading: 'Begrepsforklaring',
|
|
141
145
|
notionsRemove: 'Fjern',
|
|
142
146
|
showVideo: 'Se video',
|
|
143
|
-
showNotion: 'Se forklaring'
|
|
147
|
+
showNotion: 'Se forklaring',
|
|
148
|
+
gridView: 'Gallerivisning',
|
|
149
|
+
listView: 'Listevisning'
|
|
144
150
|
},
|
|
145
151
|
contextModal: {
|
|
146
152
|
button: '+ {{count}} flere steder',
|
|
@@ -515,7 +521,8 @@ var messages = _objectSpread(_objectSpread({
|
|
|
515
521
|
'external-learning-resources': 'Ekstern læringsressurs',
|
|
516
522
|
'source-material': 'Kildemateriale',
|
|
517
523
|
'assessment-resources': 'Vurderingsressurs',
|
|
518
|
-
topic: 'Emne'
|
|
524
|
+
topic: 'Emne',
|
|
525
|
+
'multidisciplinary-topic': 'Tverrfaglig case'
|
|
519
526
|
},
|
|
520
527
|
modal: {
|
|
521
528
|
closeModal: 'Lukk'
|
|
@@ -797,6 +804,9 @@ var messages = _objectSpread(_objectSpread({
|
|
|
797
804
|
},
|
|
798
805
|
readMoreDescriptionLabel: 'vis mer'
|
|
799
806
|
},
|
|
807
|
+
h5p: {
|
|
808
|
+
reuse: 'Bruk H5P'
|
|
809
|
+
},
|
|
800
810
|
video: {
|
|
801
811
|
download: 'Last ned video',
|
|
802
812
|
reuse: 'Bruk video',
|
|
@@ -808,6 +818,7 @@ var messages = _objectSpread(_objectSpread({
|
|
|
808
818
|
},
|
|
809
819
|
concept: {
|
|
810
820
|
showDescription: 'Vis beskrivelsen av forklaringen.',
|
|
821
|
+
reuse: 'Bruk forklaring',
|
|
811
822
|
error: {
|
|
812
823
|
title: 'En feil oppstod',
|
|
813
824
|
content: 'Kunne ikke laste beskrivelsen av forklaringen.'
|
|
@@ -857,6 +868,10 @@ var messages = _objectSpread(_objectSpread({
|
|
|
857
868
|
slateBlockMenu: {
|
|
858
869
|
open: 'Åpne meny',
|
|
859
870
|
close: 'Lukk meny'
|
|
871
|
+
},
|
|
872
|
+
factbox: {
|
|
873
|
+
open: 'Åpne faktaboks',
|
|
874
|
+
close: 'Lukk faktaboks'
|
|
860
875
|
}
|
|
861
876
|
});
|
|
862
877
|
|
|
@@ -39,6 +39,10 @@ declare const messages: {
|
|
|
39
39
|
open: string;
|
|
40
40
|
close: string;
|
|
41
41
|
};
|
|
42
|
+
factbox: {
|
|
43
|
+
open: string;
|
|
44
|
+
close: string;
|
|
45
|
+
};
|
|
42
46
|
htmlTitles: {
|
|
43
47
|
titleTemplate: string;
|
|
44
48
|
welcomePage: string;
|
|
@@ -139,6 +143,7 @@ declare const messages: {
|
|
|
139
143
|
useFilter: string;
|
|
140
144
|
removeFilter: string;
|
|
141
145
|
closeFilter: string;
|
|
146
|
+
additionalSubjectFilters: string;
|
|
142
147
|
coreRelevance: string;
|
|
143
148
|
supplementaryRelevance: string;
|
|
144
149
|
resourceTypeFilter: {
|
|
@@ -148,19 +153,24 @@ declare const messages: {
|
|
|
148
153
|
};
|
|
149
154
|
resultType: {
|
|
150
155
|
showing: string;
|
|
156
|
+
showingAll: string;
|
|
151
157
|
showMore: string;
|
|
152
158
|
showAll: string;
|
|
159
|
+
toTopOfPage: string;
|
|
153
160
|
toSubjectPageLabel: string;
|
|
154
161
|
all: string;
|
|
162
|
+
allContentTypes: string;
|
|
155
163
|
hits: string;
|
|
156
164
|
showingSearchPhrase: string;
|
|
157
|
-
showingCompetenceGoalSearchPhrase: string;
|
|
158
165
|
searchPhraseSuggestion: string;
|
|
166
|
+
showingCompetenceGoalSearchPhrase: string;
|
|
159
167
|
notionLabels: string;
|
|
160
168
|
notionsHeading: string;
|
|
161
169
|
notionsRemove: string;
|
|
162
170
|
showVideo: string;
|
|
163
171
|
showNotion: string;
|
|
172
|
+
gridView: string;
|
|
173
|
+
listView: string;
|
|
164
174
|
};
|
|
165
175
|
contextModal: {
|
|
166
176
|
button: string;
|
|
@@ -560,6 +570,7 @@ declare const messages: {
|
|
|
560
570
|
'source-material': string;
|
|
561
571
|
'assessment-resources': string;
|
|
562
572
|
topic: string;
|
|
573
|
+
'multidisciplinary-topic': string;
|
|
563
574
|
};
|
|
564
575
|
modal: {
|
|
565
576
|
closeModal: string;
|
|
@@ -841,6 +852,9 @@ declare const messages: {
|
|
|
841
852
|
};
|
|
842
853
|
readMoreDescriptionLabel: string;
|
|
843
854
|
};
|
|
855
|
+
h5p: {
|
|
856
|
+
reuse: string;
|
|
857
|
+
};
|
|
844
858
|
video: {
|
|
845
859
|
download: string;
|
|
846
860
|
reuse: string;
|
|
@@ -852,6 +866,7 @@ declare const messages: {
|
|
|
852
866
|
};
|
|
853
867
|
concept: {
|
|
854
868
|
showDescription: string;
|
|
869
|
+
reuse: string;
|
|
855
870
|
error: {
|
|
856
871
|
title: string;
|
|
857
872
|
content: string;
|
|
@@ -119,6 +119,7 @@ var messages = _objectSpread(_objectSpread({
|
|
|
119
119
|
useFilter: 'Bruk filter',
|
|
120
120
|
removeFilter: 'Fjern filter {{filterName}}',
|
|
121
121
|
closeFilter: 'Lukk filter',
|
|
122
|
+
additionalSubjectFilters: '+ {{count}} fag',
|
|
122
123
|
coreRelevance: 'Kjernestoff',
|
|
123
124
|
supplementaryRelevance: 'Tilleggsstoff',
|
|
124
125
|
resourceTypeFilter: {
|
|
@@ -127,20 +128,25 @@ var messages = _objectSpread(_objectSpread({
|
|
|
127
128
|
}
|
|
128
129
|
},
|
|
129
130
|
resultType: {
|
|
130
|
-
showing: 'Viser {{
|
|
131
|
+
showing: 'Viser {{count}} av {{totalCount}} {{contentType}}',
|
|
132
|
+
showingAll: 'Viser alle',
|
|
131
133
|
showMore: 'Vis meir',
|
|
132
134
|
showAll: 'Vis alle',
|
|
135
|
+
toTopOfPage: 'Til toppen',
|
|
133
136
|
toSubjectPageLabel: 'Gå til fagsida',
|
|
134
137
|
all: 'Alle',
|
|
135
|
-
|
|
136
|
-
|
|
138
|
+
allContentTypes: 'Alle innhaldstyper',
|
|
139
|
+
hits: '{{count}} treff',
|
|
140
|
+
showingSearchPhrase: 'Viser treff for',
|
|
141
|
+
searchPhraseSuggestion: 'Søk heller',
|
|
137
142
|
showingCompetenceGoalSearchPhrase: 'Viser resultat for kompetansemål {text}',
|
|
138
|
-
searchPhraseSuggestion: 'Søk i staden for',
|
|
139
143
|
notionLabels: 'Brukes i',
|
|
140
144
|
notionsHeading: 'Begrepsforklaring',
|
|
141
145
|
notionsRemove: 'Fjern',
|
|
142
146
|
showVideo: 'Sjå video',
|
|
143
|
-
showNotion: 'Sjå forklaring'
|
|
147
|
+
showNotion: 'Sjå forklaring',
|
|
148
|
+
gridView: 'Gallerivisning',
|
|
149
|
+
listView: 'Listevisning'
|
|
144
150
|
},
|
|
145
151
|
contextModal: {
|
|
146
152
|
button: '+ {{count}} fleire stader',
|
|
@@ -515,7 +521,8 @@ var messages = _objectSpread(_objectSpread({
|
|
|
515
521
|
'external-learning-resources': 'Ekstern læringsressurs',
|
|
516
522
|
'source-material': 'Kjeldemateriale',
|
|
517
523
|
'assessment-resources': 'Vurderingsressurs',
|
|
518
|
-
topic: 'Emne'
|
|
524
|
+
topic: 'Emne',
|
|
525
|
+
'multidisciplinary-topic': 'Tverrfagleg case'
|
|
519
526
|
},
|
|
520
527
|
modal: {
|
|
521
528
|
closeModal: 'Lukk'
|
|
@@ -797,6 +804,9 @@ var messages = _objectSpread(_objectSpread({
|
|
|
797
804
|
},
|
|
798
805
|
readMoreDescriptionLabel: 'vis meir'
|
|
799
806
|
},
|
|
807
|
+
h5p: {
|
|
808
|
+
reuse: 'Bruk H5P'
|
|
809
|
+
},
|
|
800
810
|
video: {
|
|
801
811
|
download: 'Last ned video',
|
|
802
812
|
reuse: 'Bruk video',
|
|
@@ -808,6 +818,7 @@ var messages = _objectSpread(_objectSpread({
|
|
|
808
818
|
},
|
|
809
819
|
concept: {
|
|
810
820
|
showDescription: 'Vis skildring av forklaringa',
|
|
821
|
+
reuse: 'Bruk forklaring',
|
|
811
822
|
error: {
|
|
812
823
|
title: 'Ein feil oppstod',
|
|
813
824
|
content: 'Kunne ikkje laste skildringa av forklaringa.'
|
|
@@ -857,6 +868,10 @@ var messages = _objectSpread(_objectSpread({
|
|
|
857
868
|
slateBlockMenu: {
|
|
858
869
|
open: 'Åpne meny',
|
|
859
870
|
close: 'Lukk meny'
|
|
871
|
+
},
|
|
872
|
+
factbox: {
|
|
873
|
+
open: 'Åpne faktaboks',
|
|
874
|
+
close: 'Lukk faktaboks'
|
|
860
875
|
}
|
|
861
876
|
});
|
|
862
877
|
|
|
@@ -13,3 +13,4 @@ export declare const EXTERNAL_LEARNING_RESOURCES = "external-learning-resources"
|
|
|
13
13
|
export declare const SOURCE_MATERIAL = "source-material";
|
|
14
14
|
export declare const LEARNING_PATH = "learning-path";
|
|
15
15
|
export declare const TOPIC = "topic";
|
|
16
|
+
export declare const MULTIDISCIPLINARY_TOPIC = "multidisciplinary-topic";
|
package/lib/model/ContentType.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.TOPIC = exports.LEARNING_PATH = exports.SOURCE_MATERIAL = exports.EXTERNAL_LEARNING_RESOURCES = exports.SUBJECT = exports.ASSESSMENT_RESOURCES = exports.TASKS_AND_ACTIVITIES = exports.SUBJECT_MATERIAL = void 0;
|
|
6
|
+
exports.MULTIDISCIPLINARY_TOPIC = exports.TOPIC = exports.LEARNING_PATH = exports.SOURCE_MATERIAL = exports.EXTERNAL_LEARNING_RESOURCES = exports.SUBJECT = exports.ASSESSMENT_RESOURCES = exports.TASKS_AND_ACTIVITIES = exports.SUBJECT_MATERIAL = void 0;
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
9
|
* Copyright (c) 2017-present, NDLA.
|
|
@@ -27,4 +27,6 @@ exports.SOURCE_MATERIAL = SOURCE_MATERIAL;
|
|
|
27
27
|
var LEARNING_PATH = 'learning-path';
|
|
28
28
|
exports.LEARNING_PATH = LEARNING_PATH;
|
|
29
29
|
var TOPIC = 'topic';
|
|
30
|
-
exports.TOPIC = TOPIC;
|
|
30
|
+
exports.TOPIC = TOPIC;
|
|
31
|
+
var MULTIDISCIPLINARY_TOPIC = 'multidisciplinary-topic';
|
|
32
|
+
exports.MULTIDISCIPLINARY_TOPIC = MULTIDISCIPLINARY_TOPIC;
|
package/lib/shapes.js
CHANGED
|
@@ -100,7 +100,7 @@ var ResourceShape = _propTypes["default"].shape({
|
|
|
100
100
|
|
|
101
101
|
exports.ResourceShape = ResourceShape;
|
|
102
102
|
|
|
103
|
-
var ContentTypeShape = _propTypes["default"].oneOf([contentTypes.SUBJECT_MATERIAL, contentTypes.TASKS_AND_ACTIVITIES, contentTypes.ASSESSMENT_RESOURCES, contentTypes.SUBJECT, contentTypes.EXTERNAL_LEARNING_RESOURCES, contentTypes.SOURCE_MATERIAL, contentTypes.LEARNING_PATH, contentTypes.TOPIC, 'beta', 'ndla-film', 'ndla-film has-image']);
|
|
103
|
+
var ContentTypeShape = _propTypes["default"].oneOf([contentTypes.SUBJECT_MATERIAL, contentTypes.TASKS_AND_ACTIVITIES, contentTypes.ASSESSMENT_RESOURCES, contentTypes.SUBJECT, contentTypes.EXTERNAL_LEARNING_RESOURCES, contentTypes.SOURCE_MATERIAL, contentTypes.LEARNING_PATH, contentTypes.TOPIC, contentTypes.MULTIDISCIPLINARY_TOPIC, 'beta', 'ndla-film', 'ndla-film has-image']);
|
|
104
104
|
|
|
105
105
|
exports.ContentTypeShape = ContentTypeShape;
|
|
106
106
|
|
package/lib/types.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ndla/ui",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "5.0.1",
|
|
4
4
|
"description": "UI component library for NDLA.",
|
|
5
5
|
"license": "GPL-3.0",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -31,18 +31,18 @@
|
|
|
31
31
|
"types"
|
|
32
32
|
],
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@ndla/button": "^2.1.
|
|
35
|
-
"@ndla/carousel": "^1.2.
|
|
36
|
-
"@ndla/core": "^1.0.
|
|
37
|
-
"@ndla/hooks": "^1.1.
|
|
38
|
-
"@ndla/icons": "^1.6.
|
|
39
|
-
"@ndla/licenses": "^
|
|
40
|
-
"@ndla/modal": "^1.2.
|
|
41
|
-
"@ndla/safelink": "^1.1.
|
|
42
|
-
"@ndla/switch": "^0.1.
|
|
43
|
-
"@ndla/tabs": "^1.1.
|
|
44
|
-
"@ndla/tooltip": "^0.3.
|
|
45
|
-
"@ndla/util": "^2.0.
|
|
34
|
+
"@ndla/button": "^2.1.1",
|
|
35
|
+
"@ndla/carousel": "^1.2.1",
|
|
36
|
+
"@ndla/core": "^1.0.1",
|
|
37
|
+
"@ndla/hooks": "^1.1.1",
|
|
38
|
+
"@ndla/icons": "^1.6.1",
|
|
39
|
+
"@ndla/licenses": "^4.0.0",
|
|
40
|
+
"@ndla/modal": "^1.2.1",
|
|
41
|
+
"@ndla/safelink": "^1.1.1",
|
|
42
|
+
"@ndla/switch": "^0.1.1",
|
|
43
|
+
"@ndla/tabs": "^1.1.1",
|
|
44
|
+
"@ndla/tooltip": "^0.3.1",
|
|
45
|
+
"@ndla/util": "^2.0.3",
|
|
46
46
|
"@reach/menu-button": "^0.16.2",
|
|
47
47
|
"@reach/slider": "^0.16.0",
|
|
48
48
|
"focus-trap-react": "^8.9.2",
|
|
@@ -81,5 +81,5 @@
|
|
|
81
81
|
"publishConfig": {
|
|
82
82
|
"access": "public"
|
|
83
83
|
},
|
|
84
|
-
"gitHead": "
|
|
84
|
+
"gitHead": "43a6444a198b56add3ab80245b26f075c20b465e"
|
|
85
85
|
}
|
package/src/Article/Article.tsx
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
*
|
|
7
7
|
*/
|
|
8
8
|
|
|
9
|
-
import React, { ComponentType, ReactNode, useEffect, useRef, useState, forwardRef
|
|
9
|
+
import React, { ComponentType, ReactNode, useEffect, useRef, useState, forwardRef } from 'react';
|
|
10
10
|
import BEMHelper from 'react-bem-helper';
|
|
11
11
|
import isString from 'lodash/isString';
|
|
12
12
|
import parse from 'html-react-parser';
|
|
@@ -21,9 +21,9 @@ import ArticleByline from './ArticleByline';
|
|
|
21
21
|
import LayoutItem from '../Layout';
|
|
22
22
|
import ArticleHeaderWrapper from './ArticleHeaderWrapper';
|
|
23
23
|
import ArticleNotions, { NotionRelatedContent } from './ArticleNotions';
|
|
24
|
-
import { NotionProps } from '../Notion/Notion';
|
|
25
24
|
import ArticleAccessMessage from './ArticleAccessMessage';
|
|
26
25
|
import MessageBox from '../MessageBox/MessageBox';
|
|
26
|
+
import { ConceptNotionType } from '../Notion/ConceptNotion';
|
|
27
27
|
|
|
28
28
|
const classes = new BEMHelper({
|
|
29
29
|
name: 'article',
|
|
@@ -114,8 +114,7 @@ type Props = {
|
|
|
114
114
|
renderMarkdown: (text: string) => string;
|
|
115
115
|
copyPageUrlLink?: string;
|
|
116
116
|
printUrl?: string;
|
|
117
|
-
notions?: { list:
|
|
118
|
-
onReferenceClick?: MouseEventHandler;
|
|
117
|
+
notions?: { list: ConceptNotionType[]; related: NotionRelatedContent[] };
|
|
119
118
|
accessMessage?: string;
|
|
120
119
|
};
|
|
121
120
|
|
|
@@ -144,7 +143,6 @@ export const Article = ({
|
|
|
144
143
|
id,
|
|
145
144
|
locale,
|
|
146
145
|
notions,
|
|
147
|
-
onReferenceClick,
|
|
148
146
|
printUrl,
|
|
149
147
|
renderMarkdown,
|
|
150
148
|
accessMessage,
|
|
@@ -207,16 +205,11 @@ export const Article = ({
|
|
|
207
205
|
</LayoutItem>
|
|
208
206
|
<LayoutItem layout="center">
|
|
209
207
|
{notions && showExplainNotions && (
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
relatedContent={notions.related}
|
|
216
|
-
renderMarkdown={renderMarkdown}
|
|
217
|
-
buttonOffsetRight={articlePositionRight}
|
|
218
|
-
/>
|
|
219
|
-
</>
|
|
208
|
+
<ArticleNotions
|
|
209
|
+
notions={notions.list}
|
|
210
|
+
relatedContent={notions.related}
|
|
211
|
+
buttonOffsetRight={articlePositionRight}
|
|
212
|
+
/>
|
|
220
213
|
)}
|
|
221
214
|
{getArticleContent(content, locale)}
|
|
222
215
|
</LayoutItem>
|
|
@@ -21,7 +21,7 @@ const Wrapper = styled.div`
|
|
|
21
21
|
margin-top: ${spacing.normal};
|
|
22
22
|
padding-top: ${spacing.normal};
|
|
23
23
|
padding-bottom: ${spacing.xsmall};
|
|
24
|
-
border-top:
|
|
24
|
+
border-top: 1px solid ${colors.brand.greyLight};
|
|
25
25
|
${fonts.sizes('14px', '18px')};
|
|
26
26
|
font-family: ${fonts.sans};
|
|
27
27
|
color: ${colors.brand.greyDark};
|