inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2026-09-09 18:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

At least it builds

Browse Source
This commit is contained in:
Vito Albano
2023-08-15 12:44:40 +01:00
parent 3346ccb15c
commit 7acdad90d5
5 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
demo-shell/src/custom-style-dev.scss
+4 -1
View File
@@ -17,10 +17,13 @@ $theme: mat.define-light-theme(
) )
); );
$typography: map-get($theme, typography);
@include mat.all-component-themes($theme); @include mat.all-component-themes($theme);
@include mat.all-legacy-component-themes($theme);
// @include mat.all-component-typographies($typography);
@include alfresco-material-theme($theme); @include alfresco-material-theme($theme);
$typography: map-get($theme, typography);
body, body,
html { html {
lib/core/src/lib/styles/_index.scss
+8 -8
View File
@@ -78,16 +78,16 @@
--theme-body-1-font-size: mat.font-size($typography, body-1), --theme-body-1-font-size: mat.font-size($typography, body-1),
--theme-body-2-font-size: mat.font-size($typography, body-2), --theme-body-2-font-size: mat.font-size($typography, body-2),
--theme-body-1-line-height: mat.line-height($typography, body-1), --theme-body-1-line-height: mat.line-height($typography, body-1),
--theme-display-1-font-size: mat.font-size($typography, display-1), --theme-display-1-font-size: mat.font-size($typography, headline-1),
--theme-display-3-font-size: mat.font-size($typography, display-3), --theme-display-3-font-size: mat.font-size($typography, headline-3),
--theme-display-4-font-size: mat.font-size($typography, display-4), --theme-display-4-font-size: mat.font-size($typography, headline-4),
--theme-caption-font-size: mat.font-size($typography, caption), --theme-caption-font-size: mat.font-size($typography, caption),
--theme-title-font-size: mat.font-size($typography, title), --theme-title-font-size: mat.font-size($typography, headline-1),
--theme-subheading-1-font-size: mat.font-size($typography, subheading-1), --theme-subheading-1-font-size: mat.font-size($typography, subtitle-1),
--theme-subheading-2-font-size: mat.font-size($typography, subheading-2), --theme-subheading-2-font-size: mat.font-size($typography, subtitle-2),
--theme-button-font-size: mat.font-size($typography, button), --theme-button-font-size: mat.font-size($typography, button),
--theme-headline-font-size: mat.font-size($typography, headline), --theme-headline-font-size: mat.font-size($typography, headline-1),
--theme-headline-line-height: mat.line-height($typography, headline), --theme-headline-line-height: mat.line-height($typography, headline-1),
--theme-adf-icon-1-font-size: map-get($custom-css-variables, 'theme-adf-icon-1-font-size'), --theme-adf-icon-1-font-size: map-get($custom-css-variables, 'theme-adf-icon-1-font-size'),
--theme-adf-picture-1-font-size: map-get($custom-css-variables, 'theme-adf-picture-1-font-size'), --theme-adf-picture-1-font-size: map-get($custom-css-variables, 'theme-adf-picture-1-font-size'),
lib/core/src/lib/styles/_typography.scss
+12 -14
View File
@@ -2,18 +2,16 @@
$alfresco-typography: mat.define-typography-config( $alfresco-typography: mat.define-typography-config(
$font-family: 'Muli, Roboto, "Helvetica Neue", sans-serif', $font-family: 'Muli, Roboto, "Helvetica Neue", sans-serif',
$display-4: mat.define-typography-level(112px, 112px, 300), $headline-6: mat.define-typography-level(112px, 112px, 300),
$display-3: mat.define-typography-level(56px, 56px, 400), $headline-5: mat.define-typography-level(56px, 56px, 400),
$display-2: mat.define-typography-level(45px, 48px, 400), $headline-4: mat.define-typography-level(45px, 48px, 400),
$display-1: mat.define-typography-level(34px, 40px, 400), $headline-3: mat.define-typography-level(34px, 40px, 400),
$headline: mat.define-typography-level(24px, 32px, 400), $headline-2: mat.define-typography-level(24px, 32px, 400),
$title: mat.define-typography-level(20px, 32px, 500), $headline-1: mat.define-typography-level(20px, 32px, 500),
$subheading-2: mat.define-typography-level(16px, 28px, 400), $subtitle-2: mat.define-typography-level(16px, 28px, 400),
$subheading-1: mat.define-typography-level(15px, 24px, 400), $subtitle-1: mat.define-typography-level(15px, 24px, 400),
$body-2: mat.define-typography-level(14px, 24px, 500), $body-2: mat.define-typography-level(14px, 24px, 500),
$body-1: mat.define-typography-level(14px, 20px, 400), $body-1: mat.define-typography-level(14px, 20px, 400),
$caption: mat.define-typography-level(12px, 20px, 400), $caption: mat.define-typography-level(12px, 20px, 400),
$button: mat.define-typography-level(14px, 14px, 500), $button: mat.define-typography-level(14px, 14px, 500)
// Line-height must be unit-less fraction of the font-size.
$input: mat.define-typography-level(16px, 1.25, 400)
); );
package-lock.json
Generated
+2 -2
View File
@@ -144,8 +144,8 @@
"tsconfig-paths": "^4.1.1", "tsconfig-paths": "^4.1.1",
"typescript": "5.1.6", "typescript": "5.1.6",
"webdriver-manager": "12.1.8", "webdriver-manager": "12.1.8",
"webpack": "^5.81.0", "webpack": "5.88.2",
"webpack-cli": "^5.1.2" "webpack-cli": "5.1.4"
}, },
"engines": { "engines": {
"node": ">=6.0.0" "node": ">=6.0.0"
package.json
+2 -2
View File
@@ -187,8 +187,8 @@
"tsconfig-paths": "^4.1.1", "tsconfig-paths": "^4.1.1",
"typescript": "5.1.6", "typescript": "5.1.6",
"webdriver-manager": "12.1.8", "webdriver-manager": "12.1.8",
"webpack": "^5.81.0", "webpack": "5.88.2",
"webpack-cli": "^5.1.2", "webpack-cli": "5.1.4",
"@nx/angular": "16.6.0" "@nx/angular": "16.6.0"
}, },
"license": "Apache-2.0", "license": "Apache-2.0",