From 7acdad90d5a403dbd77b77486b2a4e478451093e Mon Sep 17 00:00:00 2001 From: Vito Albano Date: Tue, 15 Aug 2023 12:44:40 +0100 Subject: [PATCH] At least it builds --- demo-shell/src/custom-style-dev.scss | 5 ++++- lib/core/src/lib/styles/_index.scss | 16 +++++++-------- lib/core/src/lib/styles/_typography.scss | 26 +++++++++++------------- package-lock.json | 4 ++-- package.json | 4 ++-- 5 files changed, 28 insertions(+), 27 deletions(-) diff --git a/demo-shell/src/custom-style-dev.scss b/demo-shell/src/custom-style-dev.scss index 7249e1c884..8df41a2fe9 100644 --- a/demo-shell/src/custom-style-dev.scss +++ b/demo-shell/src/custom-style-dev.scss @@ -17,10 +17,13 @@ $theme: mat.define-light-theme( ) ); +$typography: map-get($theme, typography); + @include mat.all-component-themes($theme); +@include mat.all-legacy-component-themes($theme); +// @include mat.all-component-typographies($typography); @include alfresco-material-theme($theme); -$typography: map-get($theme, typography); body, html { diff --git a/lib/core/src/lib/styles/_index.scss b/lib/core/src/lib/styles/_index.scss index 63e23e3fa0..c32dbb8c8e 100644 --- a/lib/core/src/lib/styles/_index.scss +++ b/lib/core/src/lib/styles/_index.scss @@ -78,16 +78,16 @@ --theme-body-1-font-size: mat.font-size($typography, body-1), --theme-body-2-font-size: mat.font-size($typography, body-2), --theme-body-1-line-height: mat.line-height($typography, body-1), - --theme-display-1-font-size: mat.font-size($typography, display-1), - --theme-display-3-font-size: mat.font-size($typography, display-3), - --theme-display-4-font-size: mat.font-size($typography, display-4), + --theme-display-1-font-size: mat.font-size($typography, headline-1), + --theme-display-3-font-size: mat.font-size($typography, headline-3), + --theme-display-4-font-size: mat.font-size($typography, headline-4), --theme-caption-font-size: mat.font-size($typography, caption), - --theme-title-font-size: mat.font-size($typography, title), - --theme-subheading-1-font-size: mat.font-size($typography, subheading-1), - --theme-subheading-2-font-size: mat.font-size($typography, subheading-2), + --theme-title-font-size: mat.font-size($typography, headline-1), + --theme-subheading-1-font-size: mat.font-size($typography, subtitle-1), + --theme-subheading-2-font-size: mat.font-size($typography, subtitle-2), --theme-button-font-size: mat.font-size($typography, button), - --theme-headline-font-size: mat.font-size($typography, headline), - --theme-headline-line-height: mat.line-height($typography, headline), + --theme-headline-font-size: mat.font-size($typography, headline-1), + --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-picture-1-font-size: map-get($custom-css-variables, 'theme-adf-picture-1-font-size'), diff --git a/lib/core/src/lib/styles/_typography.scss b/lib/core/src/lib/styles/_typography.scss index 43b6244fa0..448a80178e 100644 --- a/lib/core/src/lib/styles/_typography.scss +++ b/lib/core/src/lib/styles/_typography.scss @@ -2,18 +2,16 @@ $alfresco-typography: mat.define-typography-config( $font-family: 'Muli, Roboto, "Helvetica Neue", sans-serif', - $display-4: mat.define-typography-level(112px, 112px, 300), - $display-3: mat.define-typography-level(56px, 56px, 400), - $display-2: mat.define-typography-level(45px, 48px, 400), - $display-1: mat.define-typography-level(34px, 40px, 400), - $headline: mat.define-typography-level(24px, 32px, 400), - $title: mat.define-typography-level(20px, 32px, 500), - $subheading-2: mat.define-typography-level(16px, 28px, 400), - $subheading-1: mat.define-typography-level(15px, 24px, 400), - $body-2: mat.define-typography-level(14px, 24px, 500), - $body-1: mat.define-typography-level(14px, 20px, 400), - $caption: mat.define-typography-level(12px, 20px, 400), - $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) + $headline-6: mat.define-typography-level(112px, 112px, 300), + $headline-5: mat.define-typography-level(56px, 56px, 400), + $headline-4: mat.define-typography-level(45px, 48px, 400), + $headline-3: mat.define-typography-level(34px, 40px, 400), + $headline-2: mat.define-typography-level(24px, 32px, 400), + $headline-1: mat.define-typography-level(20px, 32px, 500), + $subtitle-2: mat.define-typography-level(16px, 28px, 400), + $subtitle-1: mat.define-typography-level(15px, 24px, 400), + $body-2: mat.define-typography-level(14px, 24px, 500), + $body-1: mat.define-typography-level(14px, 20px, 400), + $caption: mat.define-typography-level(12px, 20px, 400), + $button: mat.define-typography-level(14px, 14px, 500) ); diff --git a/package-lock.json b/package-lock.json index b2720ee645..f318bc1df3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -144,8 +144,8 @@ "tsconfig-paths": "^4.1.1", "typescript": "5.1.6", "webdriver-manager": "12.1.8", - "webpack": "^5.81.0", - "webpack-cli": "^5.1.2" + "webpack": "5.88.2", + "webpack-cli": "5.1.4" }, "engines": { "node": ">=6.0.0" diff --git a/package.json b/package.json index 7f0defa09a..7d19e804e5 100644 --- a/package.json +++ b/package.json @@ -187,8 +187,8 @@ "tsconfig-paths": "^4.1.1", "typescript": "5.1.6", "webdriver-manager": "12.1.8", - "webpack": "^5.81.0", - "webpack-cli": "^5.1.2", + "webpack": "5.88.2", + "webpack-cli": "5.1.4", "@nx/angular": "16.6.0" }, "license": "Apache-2.0",