@enigmatry/entry-components 1.15.1-preview.27 → 1.15.1-preview.28
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/package.json +1 -1
- package/styles/_generator.scss +2 -0
- package/styles/modules/_default-theme.scss +6 -1
- package/styles/modules/components/buttons/_generator.scss +8 -0
- package/styles/modules/vendors/angular-material/_generator.scss +13 -11
- package/styles/modules/vendors/angular-material/_typography-generator.scss +5 -4
- package/styles/partials/generator-test.scss +8 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@enigmatry/entry-components",
|
|
3
|
-
"version": "1.15.1-preview.
|
|
3
|
+
"version": "1.15.1-preview.28",
|
|
4
4
|
"author": "Enigmatry",
|
|
5
5
|
"description": "Enigmatry entry angular material components",
|
|
6
6
|
"homepage": "https://github.com/enigmatry/entry-angular-building-blocks/tree/master/libs/entry-components#readme",
|
package/styles/_generator.scss
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
@use 'modules/components/forms/generator' as forms;
|
|
3
3
|
@use 'modules/components/search-filter/generator' as search-filter;
|
|
4
4
|
@use 'modules/components/tables/generator' as table;
|
|
5
|
+
@use 'modules/components/buttons/generator' as buttons;
|
|
5
6
|
@use 'modules/default-theme' as default;
|
|
6
7
|
@use 'modules/vendors/angular-material/generator' as material-theme;
|
|
7
8
|
@use 'sass:map';
|
|
@@ -11,6 +12,7 @@
|
|
|
11
12
|
$merged-theme: map.deep-merge(default.$theme, $custom-theme);
|
|
12
13
|
|
|
13
14
|
@include material-theme.generate-from($merged-theme);
|
|
15
|
+
@include buttons.generate-from($merged-theme);
|
|
14
16
|
@include table.generate-from($merged-theme);
|
|
15
17
|
@include forms.generate-from($merged-theme);
|
|
16
18
|
@include search-filter.generate-from($merged-theme);
|
|
@@ -1,11 +1,16 @@
|
|
|
1
1
|
$theme: (
|
|
2
2
|
general: (
|
|
3
|
+
density: 0,
|
|
3
4
|
colors: (
|
|
4
5
|
primary-theme: null,
|
|
5
6
|
accent-theme: null,
|
|
6
7
|
primary: #2581C4,
|
|
7
8
|
accent: #EA518D,
|
|
8
|
-
font: #323232
|
|
9
|
+
font: #323232,
|
|
10
|
+
disabled: (
|
|
11
|
+
foreground: rgb(0 0 0 / .38),
|
|
12
|
+
background: rgb(0 0 0 / .12)
|
|
13
|
+
)
|
|
9
14
|
),
|
|
10
15
|
typography: null,
|
|
11
16
|
fonts: (
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/* stylelint-disable scss/no-duplicate-dollar-variables */
|
|
1
2
|
@use '@angular/material' as theming;
|
|
2
3
|
@use 'palette-generator';
|
|
3
4
|
@use 'typography-generator';
|
|
@@ -5,31 +6,32 @@
|
|
|
5
6
|
@use '../../typography/fonts';
|
|
6
7
|
|
|
7
8
|
/* stylelint-disable scss/function-no-unknown */
|
|
8
|
-
@mixin generate-from($theme) {
|
|
9
|
+
@mixin generate-from($entry-theme) {
|
|
9
10
|
@include theming.core();
|
|
10
|
-
$body-font: map.get($theme, 'general', 'fonts', 'body', 'family');
|
|
11
|
+
$body-font: map.get($entry-theme, 'general', 'fonts', 'body', 'family');
|
|
11
12
|
|
|
12
13
|
@if $body-font == '' {
|
|
13
14
|
@include fonts.generate-default-font();
|
|
14
15
|
}
|
|
15
16
|
|
|
16
|
-
$primary-palette: theming.define-palette(-get-material-palette-for('primary', $theme));
|
|
17
|
-
$accent-palette: theming.define-palette(-get-material-palette-for('accent', $theme));
|
|
17
|
+
$primary-palette: theming.define-palette(-get-material-palette-for('primary', $entry-theme));
|
|
18
|
+
$accent-palette: theming.define-palette(-get-material-palette-for('accent', $entry-theme));
|
|
18
19
|
$warn-palette: theming.define-palette(theming.$red-palette);
|
|
19
20
|
|
|
20
|
-
$typography: typography-generator.generate-from($theme);
|
|
21
|
+
$typography: typography-generator.generate-from($entry-theme);
|
|
21
22
|
@include theming.typography-hierarchy($typography);
|
|
22
23
|
|
|
23
|
-
$
|
|
24
|
+
$material-theme: theming.define-light-theme((
|
|
24
25
|
color: (
|
|
25
26
|
primary: $primary-palette,
|
|
26
27
|
accent: $accent-palette,
|
|
27
|
-
warn: $warn-palette
|
|
28
|
+
warn: $warn-palette,
|
|
28
29
|
),
|
|
29
|
-
typography: $typography
|
|
30
|
+
typography: $typography,
|
|
31
|
+
density: map.get($entry-theme, 'general', 'density')
|
|
30
32
|
));
|
|
31
|
-
|
|
32
|
-
@include theming.all-component-themes($
|
|
33
|
+
|
|
34
|
+
@include theming.all-component-themes($material-theme);
|
|
33
35
|
}
|
|
34
36
|
|
|
35
37
|
@function -get-material-palette-for($key, $theme) {
|
|
@@ -41,4 +43,4 @@
|
|
|
41
43
|
|
|
42
44
|
$color: map.get($theme, 'general', 'colors', $key);
|
|
43
45
|
@return palette-generator.generate-from($color);
|
|
44
|
-
}
|
|
46
|
+
}
|
|
@@ -17,9 +17,10 @@
|
|
|
17
17
|
$typography: theming.define-typography-config();
|
|
18
18
|
|
|
19
19
|
$typography: -set-font-size-for('body', $typography, $fonts, ('body-1', 'body-2'));
|
|
20
|
-
$typography: -set-font-size-for('buttons', $typography, $fonts, ('
|
|
21
|
-
$typography: -set-font-size-for('hero-titles'
|
|
22
|
-
|
|
20
|
+
$typography: -set-font-size-for('buttons', $typography, $fonts, ('button'));
|
|
21
|
+
$typography: -set-font-size-for('hero-titles',$typography,$fonts,('headline-1', 'headline-2',
|
|
22
|
+
'headline-3', 'headline-4', 'headline-5', 'headline-6'));
|
|
23
|
+
$typography: -set-font-size-for('titles', $typography, $fonts, ('subtitle-1', 'subtitle-2'));
|
|
23
24
|
$typography: -set-font-family($typography, $fonts);
|
|
24
25
|
|
|
25
26
|
@return $typography;
|
|
@@ -81,7 +82,7 @@
|
|
|
81
82
|
@function -generate-defaults-from($typography) {
|
|
82
83
|
// Return Roboto (default Angular Material's font (for now).
|
|
83
84
|
// $typography: -set-text-groups-for($typography, 'OpenSans-normal', 'OpenSans-bold');
|
|
84
|
-
// $typography: -set-typography-group($typography,('headline-1', 'headline-2', 'headline-3',
|
|
85
|
+
// $typography: -set-typography-group($typography,('headline-1', 'headline-2', 'headline-3',
|
|
85
86
|
// 'headline-4', 'headline-5', 'headline-6', 'subtitle-1', 'subtitle-2'),'Montserrat-bold');
|
|
86
87
|
@return $typography;
|
|
87
88
|
}
|
|
@@ -3,12 +3,19 @@
|
|
|
3
3
|
$custom-theme: (
|
|
4
4
|
general: (
|
|
5
5
|
colors: (
|
|
6
|
-
primary: #FAE3C1
|
|
6
|
+
primary: #FAE3C1,
|
|
7
|
+
disabled: (
|
|
8
|
+
foreground: cyan,
|
|
9
|
+
background: magenta
|
|
10
|
+
)
|
|
7
11
|
),
|
|
8
12
|
fonts: (
|
|
9
13
|
body: (
|
|
10
14
|
family: 'My-Font',
|
|
11
15
|
size: 41px
|
|
16
|
+
),
|
|
17
|
+
buttons: (
|
|
18
|
+
size: 26px
|
|
12
19
|
)
|
|
13
20
|
)
|
|
14
21
|
),
|