@onemrvapublic/design-system-theme 17.9.1-develop.1 → 17.12.6
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/components/_checkbox.scss +10 -7
- package/components/_table.scss +11 -0
- package/package.json +1 -1
- package/utilities/_fonts.scss +10 -14
- package/utilities/_variables.scss +22 -19
|
@@ -1,14 +1,18 @@
|
|
|
1
|
-
@use
|
|
2
|
-
@use
|
|
3
|
-
@use
|
|
4
|
-
@import
|
|
1
|
+
@use '@angular/material' as mat;
|
|
2
|
+
@use 'sass:map';
|
|
3
|
+
@use './µ';
|
|
4
|
+
@import '../utilities/variables';
|
|
5
5
|
|
|
6
6
|
@mixin theme($theme) {
|
|
7
|
-
|
|
8
7
|
@include mat.checkbox-base($theme);
|
|
9
8
|
@include mat.checkbox-theme($theme);
|
|
10
9
|
|
|
11
10
|
.mat-mdc-checkbox {
|
|
11
|
+
.mdc-checkbox {
|
|
12
|
+
.mdc-checkbox__ripple {
|
|
13
|
+
display: none;
|
|
14
|
+
}
|
|
15
|
+
}
|
|
12
16
|
&.mat-accent {
|
|
13
17
|
.mdc-checkbox__native-control:enabled:checked,
|
|
14
18
|
.mdc-checkbox__native-control:enabled:indeterminate {
|
|
@@ -68,7 +72,6 @@
|
|
|
68
72
|
.mdc-checkbox__native-control:enabled:checked,
|
|
69
73
|
.mdc-checkbox__native-control:enabled:indeterminate {
|
|
70
74
|
~ .mdc-checkbox__background {
|
|
71
|
-
|
|
72
75
|
.mdc-checkbox__checkmark {
|
|
73
76
|
width: calc(100% - 4px);
|
|
74
77
|
top: 2px;
|
|
@@ -93,7 +96,7 @@
|
|
|
93
96
|
label {
|
|
94
97
|
@include µ.label-button($theme);
|
|
95
98
|
font-family: mat.font-family(
|
|
96
|
-
map.get($theme,
|
|
99
|
+
map.get($theme, 'typography'),
|
|
97
100
|
label-button
|
|
98
101
|
); // HWKTMP For some reason, the font family is not taken into account from configuration
|
|
99
102
|
}
|
package/components/_table.scss
CHANGED
|
@@ -8,6 +8,14 @@
|
|
|
8
8
|
@include mat.table-theme($theme);
|
|
9
9
|
|
|
10
10
|
.mat-mdc-table {
|
|
11
|
+
th.cdk-column-check {
|
|
12
|
+
width: 50px;
|
|
13
|
+
.mat-mdc-checkbox {
|
|
14
|
+
.mdc-checkbox {
|
|
15
|
+
padding: 6px;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
}
|
|
11
19
|
th.mat-mdc-header-cell {
|
|
12
20
|
font-weight: 600;
|
|
13
21
|
border-bottom: 2px solid µ.grayscale($theme, 200);
|
|
@@ -110,6 +118,9 @@
|
|
|
110
118
|
tr {
|
|
111
119
|
&:nth-child(even) {
|
|
112
120
|
background-color: µ.primary($theme, 50);
|
|
121
|
+
a {
|
|
122
|
+
color: µ.primary($theme, 700);
|
|
123
|
+
}
|
|
113
124
|
}
|
|
114
125
|
}
|
|
115
126
|
}
|
package/package.json
CHANGED
package/utilities/_fonts.scss
CHANGED
|
@@ -20,34 +20,30 @@
|
|
|
20
20
|
$typography: map.get($onemrva-theme, 'typography');
|
|
21
21
|
|
|
22
22
|
h1 {
|
|
23
|
-
|
|
24
|
-
color: µ.grayscale($onemrva-theme, 900);
|
|
23
|
+
@include mat.typography-level($typography, 'headline-4');
|
|
25
24
|
}
|
|
26
25
|
h2 {
|
|
27
|
-
|
|
28
|
-
color: µ.grayscale($onemrva-theme, 900);
|
|
26
|
+
@include mat.typography-level($typography, 'headline-5');
|
|
29
27
|
}
|
|
30
28
|
h3 {
|
|
31
|
-
|
|
32
|
-
color: µ.grayscale($onemrva-theme, 900);
|
|
29
|
+
@include mat.typography-level($typography, 'headline-6');
|
|
33
30
|
}
|
|
34
31
|
h4 {
|
|
35
32
|
@include mat.typography-level($typography, 'mat-h4');
|
|
36
|
-
font-family: mat.font-family($typography, 'mat-h4');
|
|
37
33
|
color: µ.grayscale($onemrva-theme, 900);
|
|
38
34
|
}
|
|
39
35
|
h5 {
|
|
40
|
-
font-family: mat.font-family($typography,
|
|
41
|
-
font-weight: 600;
|
|
36
|
+
font-family: mat.font-family($typography, 'mat-h4');
|
|
42
37
|
font-size: 18px;
|
|
38
|
+
font-style: normal;
|
|
39
|
+
font-weight: 600;
|
|
43
40
|
line-height: 32px;
|
|
44
|
-
color: µ.grayscale($onemrva-theme, 900);
|
|
45
41
|
}
|
|
46
42
|
h6 /* always the case bu makes this rule more specific than the default one */ {
|
|
47
|
-
font-family: mat.font-family($typography,
|
|
48
|
-
font-weight: 600;
|
|
43
|
+
font-family: mat.font-family($typography, 'mat-h4');
|
|
49
44
|
font-size: 16px;
|
|
50
|
-
|
|
51
|
-
|
|
45
|
+
font-style: normal;
|
|
46
|
+
font-weight: 600;
|
|
47
|
+
line-height: 28px; /* 175% */
|
|
52
48
|
}
|
|
53
49
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
@use
|
|
2
|
-
@use
|
|
3
|
-
@use
|
|
1
|
+
@use 'sass:map';
|
|
2
|
+
@use '@angular/material' as mat;
|
|
3
|
+
@use 'palettes';
|
|
4
4
|
|
|
5
5
|
$onemrva-accent-gradient: transparent
|
|
6
6
|
linear-gradient(90deg, #de2174 0%, #eb142a 100%) 0% 0% no-repeat padding-box;
|
|
@@ -11,9 +11,18 @@ $box-shadow: 0px 3px 3px #312f3a29;
|
|
|
11
11
|
$gap: 8px;
|
|
12
12
|
|
|
13
13
|
$spacer: 8px !default;
|
|
14
|
-
$spacers:
|
|
15
|
-
|
|
16
|
-
|
|
14
|
+
$spacers:
|
|
15
|
+
'-0' 0,
|
|
16
|
+
'-2xs' $spacer * 0.25,
|
|
17
|
+
'-xs' $spacer * 0.5,
|
|
18
|
+
'-s' $spacer,
|
|
19
|
+
'' $spacer,
|
|
20
|
+
'-m' $spacer * 2,
|
|
21
|
+
'-l' $spacer * 3,
|
|
22
|
+
'-xl' $spacer * 4,
|
|
23
|
+
'-2xl' $spacer * 5,
|
|
24
|
+
'-3xl' $spacer * 7,
|
|
25
|
+
'-auto' 'auto';
|
|
17
26
|
|
|
18
27
|
$breakpoints: (
|
|
19
28
|
xsmall: (
|
|
@@ -55,10 +64,10 @@ $onemrva-typography: mat.define-typography-config(
|
|
|
55
64
|
mat.define-typography-level(29px, 51px, 600, $font-family: Poppins),
|
|
56
65
|
// Section heading corresponding to the <h1> tag. CSS: .mat-h1 or .mat-headline-5 Native element: <h1>
|
|
57
66
|
$headline-5:
|
|
58
|
-
mat.define-typography-level(
|
|
67
|
+
mat.define-typography-level(26px, 46px, 600, $font-family: Poppins),
|
|
59
68
|
// Section heading corresponding to the <h2> tag. CSS: .mat-h2 or .mat-headline-6 Native element: <h2>
|
|
60
69
|
$headline-6:
|
|
61
|
-
mat.define-typography-level(
|
|
70
|
+
mat.define-typography-level(23px, 40px, 600, $font-family: Poppins),
|
|
62
71
|
// Section heading corresponding to the <h3> tag. CSS: .mat-h3 or .mat-subtitle-1 Native element: <h3>
|
|
63
72
|
$subtitle-1:
|
|
64
73
|
mat.define-typography-level(23px, 40px, 600, $font-family: Poppins),
|
|
@@ -68,7 +77,7 @@ $onemrva-typography: mat.define-typography-config(
|
|
|
68
77
|
16px,
|
|
69
78
|
26px,
|
|
70
79
|
600,
|
|
71
|
-
$font-family:
|
|
80
|
+
$font-family: 'Source Sans Pro'
|
|
72
81
|
),
|
|
73
82
|
// Why would angular map body-1 and h4 on the same typography??? Work around: mat-h4 (see below) CSS: .mat-h4 or .mat-body-1 Native element: <h4>
|
|
74
83
|
$body-1:
|
|
@@ -76,7 +85,7 @@ $onemrva-typography: mat.define-typography-config(
|
|
|
76
85
|
16px,
|
|
77
86
|
26px,
|
|
78
87
|
400,
|
|
79
|
-
$font-family:
|
|
88
|
+
$font-family: 'Source Sans Pro'
|
|
80
89
|
),
|
|
81
90
|
// Bolder body text. CSS: .mat-body or .mat-body-2
|
|
82
91
|
$body-2:
|
|
@@ -84,7 +93,7 @@ $onemrva-typography: mat.define-typography-config(
|
|
|
84
93
|
16px,
|
|
85
94
|
26px,
|
|
86
95
|
400,
|
|
87
|
-
$font-family:
|
|
96
|
+
$font-family: 'Source Sans Pro'
|
|
88
97
|
),
|
|
89
98
|
// Smaller body and hint text. CSS: .mat-small or .mat-caption
|
|
90
99
|
$caption:
|
|
@@ -92,16 +101,10 @@ $onemrva-typography: mat.define-typography-config(
|
|
|
92
101
|
14px,
|
|
93
102
|
21px,
|
|
94
103
|
400,
|
|
95
|
-
$font-family:
|
|
104
|
+
$font-family: 'Source Sans Pro'
|
|
96
105
|
),
|
|
97
106
|
// Buttons and anchors.
|
|
98
|
-
$button:
|
|
99
|
-
mat.define-typography-level(
|
|
100
|
-
14px,
|
|
101
|
-
21px,
|
|
102
|
-
500,
|
|
103
|
-
$font-family: "Poppins"
|
|
104
|
-
)
|
|
107
|
+
$button: mat.define-typography-level(14px, 21px, 500, $font-family: 'Poppins')
|
|
105
108
|
);
|
|
106
109
|
|
|
107
110
|
$onemrva-typography: map.merge(
|