@ndla/ui 42.0.3 → 42.0.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.
- package/es/List/OrderedList.js +1 -1
- package/es/Programme/ProgrammeSubjects.js +6 -6
- package/es/all.css +1 -1
- package/lib/List/OrderedList.js +1 -1
- package/lib/Programme/ProgrammeSubjects.d.ts +1 -1
- package/lib/Programme/ProgrammeSubjects.js +6 -6
- package/lib/all.css +1 -1
- package/package.json +2 -2
- package/src/List/OrderedList.tsx +36 -27
- package/src/Programme/ProgrammeSubjects.tsx +5 -5
- package/src/global/components/component.bodybox.scss +0 -16
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ndla/ui",
|
|
3
|
-
"version": "42.0.
|
|
3
|
+
"version": "42.0.4",
|
|
4
4
|
"description": "UI component library for NDLA.",
|
|
5
5
|
"license": "GPL-3.0",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -83,5 +83,5 @@
|
|
|
83
83
|
"publishConfig": {
|
|
84
84
|
"access": "public"
|
|
85
85
|
},
|
|
86
|
-
"gitHead": "
|
|
86
|
+
"gitHead": "c397859812198f1bdb0e321e1a90737bb37bf66e"
|
|
87
87
|
}
|
package/src/List/OrderedList.tsx
CHANGED
|
@@ -41,51 +41,60 @@ const StyledOl = styled.ol`
|
|
|
41
41
|
margin-bottom: ${spacing.nsmall} !important;
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
|
+
counter-reset: level1;
|
|
44
45
|
|
|
45
46
|
&[data-type='letters'] {
|
|
46
|
-
counter-reset: item 0;
|
|
47
47
|
> li {
|
|
48
|
-
counter-increment: item;
|
|
49
48
|
&:before {
|
|
50
|
-
|
|
51
|
-
transform: translateX(-100%);
|
|
52
|
-
content: counter(item, upper-alpha) '.';
|
|
53
|
-
padding-right: ${spacing.nsmall};
|
|
49
|
+
content: counter(level1, upper-alpha) '.';
|
|
54
50
|
}
|
|
55
51
|
|
|
56
52
|
> ol[data-type='letters'] {
|
|
57
53
|
> li:before {
|
|
58
|
-
content: counter(
|
|
54
|
+
content: counter(level1, lower-alpha) '.';
|
|
59
55
|
}
|
|
60
56
|
ol[data-type='letters'] {
|
|
61
57
|
> li:before {
|
|
62
|
-
content: counter(
|
|
58
|
+
content: counter(level1, lower-roman) '.';
|
|
63
59
|
}
|
|
64
60
|
}
|
|
65
61
|
}
|
|
66
62
|
}
|
|
67
63
|
}
|
|
68
64
|
|
|
69
|
-
|
|
70
|
-
counter-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
padding-right: ${spacing.nsmall};
|
|
78
|
-
}
|
|
65
|
+
> li {
|
|
66
|
+
counter-increment: level1;
|
|
67
|
+
&:before {
|
|
68
|
+
position: absolute;
|
|
69
|
+
transform: translateX(-100%);
|
|
70
|
+
content: counter(level1, decimal) '.';
|
|
71
|
+
padding-right: ${spacing.nsmall};
|
|
72
|
+
}
|
|
79
73
|
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
74
|
+
> ol:not([data-type='letters']) {
|
|
75
|
+
counter-reset: level2;
|
|
76
|
+
> li {
|
|
77
|
+
padding-left: ${spacing.nsmall};
|
|
78
|
+
counter-increment: level2;
|
|
79
|
+
&:before {
|
|
80
|
+
content: counter(level1, decimal) '.' counter(level2, decimal) '.';
|
|
81
|
+
}
|
|
82
|
+
> ol:not([data-type='letters']) {
|
|
83
|
+
counter-reset: level3;
|
|
84
|
+
> li {
|
|
85
|
+
padding-left: ${spacing.medium};
|
|
86
|
+
counter-increment: level3;
|
|
87
|
+
&:before {
|
|
88
|
+
content: counter(level1, decimal) '.' counter(level2, decimal) '.' counter(level3, decimal) '.';
|
|
89
|
+
}
|
|
90
|
+
> ol:not([data-type='letters']) {
|
|
91
|
+
counter-reset: level4;
|
|
92
|
+
> li {
|
|
93
|
+
padding-left: ${spacing.large};
|
|
94
|
+
counter-increment: level4;
|
|
95
|
+
&:before {
|
|
96
|
+
content: counter(level1, decimal) '.' counter(level2, decimal) '.' counter(level3, decimal) '.'
|
|
97
|
+
counter(level4, decimal) '.';
|
|
89
98
|
}
|
|
90
99
|
}
|
|
91
100
|
}
|
|
@@ -24,7 +24,7 @@ const GradesMenu = styled.ul`
|
|
|
24
24
|
|
|
25
25
|
export type GradesProps = {
|
|
26
26
|
selectedGrade?: string;
|
|
27
|
-
grades
|
|
27
|
+
grades?: {
|
|
28
28
|
missingProgrammeSubjects?: boolean;
|
|
29
29
|
name: string;
|
|
30
30
|
categories?: {
|
|
@@ -45,14 +45,14 @@ const ProgrammeSubjects = ({ grades, onNavigate, selectedGrade = 'vg1' }: Props)
|
|
|
45
45
|
const { t } = useTranslation();
|
|
46
46
|
|
|
47
47
|
const grade = useMemo(
|
|
48
|
-
() => grades
|
|
48
|
+
() => grades?.find((grade) => grade.name.toLowerCase() === selectedGrade) ?? grades?.[0],
|
|
49
49
|
[grades, selectedGrade],
|
|
50
50
|
);
|
|
51
51
|
|
|
52
52
|
return (
|
|
53
53
|
<>
|
|
54
54
|
<GradesMenu aria-label={t('programme.grades')}>
|
|
55
|
-
{grades
|
|
55
|
+
{grades?.map((item) => {
|
|
56
56
|
const current = item.name.toLowerCase() === selectedGrade;
|
|
57
57
|
return (
|
|
58
58
|
<li key={item.name}>
|
|
@@ -69,8 +69,8 @@ const ProgrammeSubjects = ({ grades, onNavigate, selectedGrade = 'vg1' }: Props)
|
|
|
69
69
|
);
|
|
70
70
|
})}
|
|
71
71
|
</GradesMenu>
|
|
72
|
-
{grade
|
|
73
|
-
{grade
|
|
72
|
+
{grade?.missingProgrammeSubjects && <MessageBox>{t('messageBoxInfo.noContent')}</MessageBox>}
|
|
73
|
+
{grade?.categories?.map((category) => (
|
|
74
74
|
<NavigationBox key={category.name} heading={category.name} items={category.subjects} onClick={onNavigate} />
|
|
75
75
|
))}
|
|
76
76
|
</>
|
|
@@ -31,22 +31,6 @@
|
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
-
/* Hacks for complex content fetched inside bodybox */
|
|
35
|
-
.c-bodybox > ul:not([class]),
|
|
36
|
-
.c-bodybox :not(li) > ul:not([class]) {
|
|
37
|
-
@include mq(desktop) {
|
|
38
|
-
margin-left: $spacing;
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
.c-bodybox > ol:not([class]),
|
|
43
|
-
.c-bodybox :not(li) > ol:not([class]),
|
|
44
|
-
.c-bodybox .ol-list--roman {
|
|
45
|
-
@include mq(desktop) {
|
|
46
|
-
margin-left: $spacing--large;
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
|
|
50
34
|
.c-bodybox {
|
|
51
35
|
.c-figure {
|
|
52
36
|
width: 100% !important;
|