From 83cc27d1f0213b2da175f2cad421b8dafe7ca663 Mon Sep 17 00:00:00 2001 From: Myrta Sakellariou Date: Tue, 5 Nov 2024 11:20:52 +0100 Subject: [PATCH 01/20] feat(styles): create blockquote component --- packages/styles/index.html | 36 ++- packages/styles/src/components/_index.scss | 1 + .../styles/src/components/blockquote.scss | 19 ++ .../styles/src/placeholders/_blockquote.scss | 15 + packages/styles/src/placeholders/_index.scss | 1 + pnpm-lock.yaml | 272 ++++++------------ 6 files changed, 150 insertions(+), 194 deletions(-) create mode 100644 packages/styles/src/components/blockquote.scss create mode 100644 packages/styles/src/placeholders/_blockquote.scss diff --git a/packages/styles/index.html b/packages/styles/index.html index 53ef398d94..91211d46d4 100644 --- a/packages/styles/index.html +++ b/packages/styles/index.html @@ -29,8 +29,40 @@

Styles package playground

- - +
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante. Lorem + ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante. + +
+ Author + Source +
+
+ +
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante. Lorem + ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante. +
+ Author + Source +
+
+ +
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante. Lorem + ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante. + +
+ Author + Source +
+
diff --git a/packages/styles/src/components/_index.scss b/packages/styles/src/components/_index.scss index b146f756fe..c4b5772d18 100644 --- a/packages/styles/src/components/_index.scss +++ b/packages/styles/src/components/_index.scss @@ -6,6 +6,7 @@ @use 'avatar'; @use 'badge'; @use 'breadcrumb'; +@use 'blockquote'; @use 'button'; @use 'button-group'; @use 'card'; diff --git a/packages/styles/src/components/blockquote.scss b/packages/styles/src/components/blockquote.scss new file mode 100644 index 0000000000..6ddb528a97 --- /dev/null +++ b/packages/styles/src/components/blockquote.scss @@ -0,0 +1,19 @@ +@use '../tokens/components'; +@use '../functions/tokens'; +@use './../placeholders/blockquote' as blockquote-ph; + +tokens.$default-map: components.$post-quote; + +.blockquote { + @extend %lead; + margin: tokens.get('post-quote-margin-block') tokens.get('post-quote-margin-inline'); + border-inline-start: tokens.get('post-quote-border-width-left') solid + tokens.get('post-quote-border-left-color'); + padding: 0 tokens.get('post-quote-padding-inline-end') 0 + tokens.get('post-quote-padding-inline-start'); + + .blockquote-footer { + margin-top: tokens.get('post-quote-gap-inline'); + @extend %body; + } +} diff --git a/packages/styles/src/placeholders/_blockquote.scss b/packages/styles/src/placeholders/_blockquote.scss new file mode 100644 index 0000000000..772a5402db --- /dev/null +++ b/packages/styles/src/placeholders/_blockquote.scss @@ -0,0 +1,15 @@ +@use '../tokens/components'; +@use '../tokens/elements'; +@use '../functions/tokens'; + +tokens.$default-map: components.$post-lead; + +%lead { + font-size: tokens.get('post-lead-font-size'); + font-weight: tokens.get('post-lead-font-weight'); +} + +%body { + font-size: tokens.get('post-body-font-size', elements.$post-body); + font-weight: tokens.get('post-body-font-weight', elements.$post-body); +} diff --git a/packages/styles/src/placeholders/_index.scss b/packages/styles/src/placeholders/_index.scss index 639bb6ad75..c467b10154 100644 --- a/packages/styles/src/placeholders/_index.scss +++ b/packages/styles/src/placeholders/_index.scss @@ -4,3 +4,4 @@ @use './color'; @use './dropdown'; @use './text'; +@use './blockquote'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5b6df7bb00..ffa74dd6d6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -167,7 +167,7 @@ importers: devDependencies: '@angular-devkit/build-angular': specifier: 18.2.11 - version: 18.2.11(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/localize@18.2.10(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8))))(@types/node@22.7.9)(chokidar@3.6.0)(jest-environment-jsdom@29.7.0)(jest@29.7.0(@types/node@22.7.9)(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)))(karma@6.4.4)(ng-packagr@18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)))(tslib@2.6.3)(typescript@5.5.4))(tailwindcss@3.4.7(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)))(typescript@5.5.4) + version: 18.2.11(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/localize@18.2.10(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8))))(@types/node@22.7.9)(chokidar@3.6.0)(jest-environment-jsdom@29.7.0)(jest@29.7.0(@types/node@22.7.9))(karma@6.4.4)(ng-packagr@18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7)(tslib@2.6.3)(typescript@5.5.4))(tailwindcss@3.4.7)(typescript@5.5.4) '@angular-eslint/builder': specifier: 18.4.0 version: 18.4.0(eslint@8.57.0)(typescript@5.5.4) @@ -218,7 +218,7 @@ importers: version: 2.1.0(jasmine-core@5.2.0)(karma-jasmine@5.1.0(karma@6.4.4))(karma@6.4.4) ng-packagr: specifier: 18.1.0 - version: 18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)))(tslib@2.6.3)(typescript@5.5.4) + version: 18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7)(tslib@2.6.3)(typescript@5.5.4) typescript: specifier: 5.5.4 version: 5.5.4 @@ -670,7 +670,7 @@ importers: devDependencies: '@angular-devkit/build-angular': specifier: 18.2.11 - version: 18.2.11(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/localize@18.2.10(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8))))(@types/node@20.14.14)(chokidar@3.6.0)(jest-environment-jsdom@29.7.0)(jest@29.7.0(@types/node@20.14.14)(ts-node@10.9.2(@types/node@20.14.14)(typescript@5.5.4)))(karma@6.4.4)(ng-packagr@18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7(ts-node@10.9.2(@types/node@20.14.14)(typescript@5.5.4)))(tslib@2.6.3)(typescript@5.5.4))(tailwindcss@3.4.7(ts-node@10.9.2(@types/node@20.14.14)(typescript@5.5.4)))(typescript@5.5.4) + version: 18.2.11(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/localize@18.2.10(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8))))(@types/node@20.14.14)(chokidar@3.6.0)(jest-environment-jsdom@29.7.0)(jest@29.7.0(@types/node@20.14.14))(karma@6.4.4)(ng-packagr@18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7)(tslib@2.6.3)(typescript@5.5.4))(tailwindcss@3.4.7)(typescript@5.5.4) '@angular-eslint/builder': specifier: 18.4.0 version: 18.4.0(eslint@8.57.0)(typescript@5.5.4) @@ -724,7 +724,7 @@ importers: version: 2.1.0(jasmine-core@5.2.0)(karma-jasmine@5.1.0(karma@6.4.4))(karma@6.4.4) ng-packagr: specifier: 18.1.0 - version: 18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7(ts-node@10.9.2(@types/node@20.14.14)(typescript@5.5.4)))(tslib@2.6.3)(typescript@5.5.4) + version: 18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7)(tslib@2.6.3)(typescript@5.5.4) npm-run-all2: specifier: 5.0.0 version: 5.0.0 @@ -986,7 +986,7 @@ importers: devDependencies: '@angular-devkit/build-angular': specifier: 18.2.11 - version: 18.2.11(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/localize@18.2.10(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8))))(@types/node@22.7.9)(chokidar@3.6.0)(jest-environment-jsdom@29.7.0)(jest@29.7.0(@types/node@22.7.9)(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)))(karma@6.4.4)(ng-packagr@18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)))(tslib@2.6.3)(typescript@5.5.4))(tailwindcss@3.4.7(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)))(typescript@5.5.4) + version: 18.2.11(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/localize@18.2.10(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8))))(@types/node@22.7.9)(chokidar@3.6.0)(jest-environment-jsdom@29.7.0)(jest@29.7.0(@types/node@22.7.9))(karma@6.4.4)(ng-packagr@18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7)(tslib@2.6.3)(typescript@5.5.4))(tailwindcss@3.4.7)(typescript@5.5.4) '@angular/cli': specifier: 18.2.11 version: 18.2.11(chokidar@3.6.0) @@ -1016,7 +1016,7 @@ importers: version: 2.1.0(jasmine-core@5.2.0)(karma-jasmine@5.1.0(karma@6.4.4))(karma@6.4.4) ng-packagr: specifier: 18.1.0 - version: 18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)))(tslib@2.6.3)(typescript@5.5.4) + version: 18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7)(tslib@2.6.3)(typescript@5.5.4) npm-run-all2: specifier: 7.0.0 version: 7.0.0 @@ -11143,13 +11143,13 @@ snapshots: transitivePeerDependencies: - chokidar - '@angular-devkit/build-angular@18.2.11(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/localize@18.2.10(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8))))(@types/node@20.14.14)(chokidar@3.6.0)(jest-environment-jsdom@29.7.0)(jest@29.7.0(@types/node@20.14.14)(ts-node@10.9.2(@types/node@20.14.14)(typescript@5.5.4)))(karma@6.4.4)(ng-packagr@18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7(ts-node@10.9.2(@types/node@20.14.14)(typescript@5.5.4)))(tslib@2.6.3)(typescript@5.5.4))(tailwindcss@3.4.7(ts-node@10.9.2(@types/node@20.14.14)(typescript@5.5.4)))(typescript@5.5.4)': + '@angular-devkit/build-angular@18.2.11(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/localize@18.2.10(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8))))(@types/node@20.14.14)(chokidar@3.6.0)(jest-environment-jsdom@29.7.0)(jest@29.7.0(@types/node@20.14.14))(karma@6.4.4)(ng-packagr@18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7)(tslib@2.6.3)(typescript@5.5.4))(tailwindcss@3.4.7)(typescript@5.5.4)': dependencies: '@ampproject/remapping': 2.3.0 '@angular-devkit/architect': 0.1802.11(chokidar@3.6.0) '@angular-devkit/build-webpack': 0.1802.11(chokidar@3.6.0)(webpack-dev-server@5.0.4(webpack@5.94.0(esbuild@0.23.0)))(webpack@5.94.0(esbuild@0.23.0)) '@angular-devkit/core': 18.2.11(chokidar@3.6.0) - '@angular/build': 18.2.11(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/localize@18.2.10(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8))))(@types/node@20.14.14)(chokidar@3.6.0)(less@4.2.0)(postcss@8.4.41)(tailwindcss@3.4.7(ts-node@10.9.2(@types/node@20.14.14)(typescript@5.5.4)))(terser@5.31.6)(typescript@5.5.4) + '@angular/build': 18.2.11(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/localize@18.2.10(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8))))(@types/node@20.14.14)(chokidar@3.6.0)(less@4.2.0)(postcss@8.4.41)(tailwindcss@3.4.7)(terser@5.31.6)(typescript@5.5.4) '@angular/compiler-cli': 18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4) '@babel/core': 7.25.2 '@babel/generator': 7.25.0 @@ -11165,7 +11165,7 @@ snapshots: '@vitejs/plugin-basic-ssl': 1.1.0(vite@5.4.6(@types/node@20.14.14)(less@4.2.0)(sass@1.77.6)(terser@5.31.6)) ansi-colors: 4.1.3 autoprefixer: 10.4.20(postcss@8.4.41) - babel-loader: 9.1.3(@babel/core@7.25.2)(webpack@5.94.0) + babel-loader: 9.1.3(@babel/core@7.25.2)(webpack@5.94.0(esbuild@0.23.0)) browserslist: 4.24.2 copy-webpack-plugin: 12.0.2(webpack@5.94.0(esbuild@0.23.0)) critters: 0.0.24 @@ -11212,10 +11212,10 @@ snapshots: optionalDependencies: '@angular/localize': 18.2.10(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8))) esbuild: 0.23.0 - jest: 29.7.0(@types/node@20.14.14)(ts-node@10.9.2(@types/node@20.14.14)(typescript@5.5.4)) + jest: 29.7.0(@types/node@20.14.14) jest-environment-jsdom: 29.7.0 karma: 6.4.4 - ng-packagr: 18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7(ts-node@10.9.2(@types/node@20.14.14)(typescript@5.5.4)))(tslib@2.6.3)(typescript@5.5.4) + ng-packagr: 18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7)(tslib@2.6.3)(typescript@5.5.4) tailwindcss: 3.4.7(ts-node@10.9.2(@types/node@20.14.14)(typescript@5.5.4)) transitivePeerDependencies: - '@rspack/core' @@ -11235,13 +11235,13 @@ snapshots: - utf-8-validate - webpack-cli - '@angular-devkit/build-angular@18.2.11(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/localize@18.2.10(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8))))(@types/node@22.7.9)(chokidar@3.6.0)(jest-environment-jsdom@29.7.0)(jest@29.7.0(@types/node@22.7.9)(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)))(karma@6.4.4)(ng-packagr@18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)))(tslib@2.6.3)(typescript@5.5.4))(tailwindcss@3.4.7(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)))(typescript@5.5.4)': + '@angular-devkit/build-angular@18.2.11(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/localize@18.2.10(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8))))(@types/node@22.7.9)(chokidar@3.6.0)(jest-environment-jsdom@29.7.0)(jest@29.7.0(@types/node@22.7.9))(karma@6.4.4)(ng-packagr@18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7)(tslib@2.6.3)(typescript@5.5.4))(tailwindcss@3.4.7)(typescript@5.5.4)': dependencies: '@ampproject/remapping': 2.3.0 '@angular-devkit/architect': 0.1802.11(chokidar@3.6.0) '@angular-devkit/build-webpack': 0.1802.11(chokidar@3.6.0)(webpack-dev-server@5.0.4(webpack@5.94.0(esbuild@0.23.0)))(webpack@5.94.0(esbuild@0.23.0)) '@angular-devkit/core': 18.2.11(chokidar@3.6.0) - '@angular/build': 18.2.11(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/localize@18.2.10(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8))))(@types/node@22.7.9)(chokidar@3.6.0)(less@4.2.0)(postcss@8.4.41)(tailwindcss@3.4.7(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)))(terser@5.31.6)(typescript@5.5.4) + '@angular/build': 18.2.11(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/localize@18.2.10(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8))))(@types/node@22.7.9)(chokidar@3.6.0)(less@4.2.0)(postcss@8.4.41)(tailwindcss@3.4.7)(terser@5.31.6)(typescript@5.5.4) '@angular/compiler-cli': 18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4) '@babel/core': 7.25.2 '@babel/generator': 7.25.0 @@ -11257,7 +11257,7 @@ snapshots: '@vitejs/plugin-basic-ssl': 1.1.0(vite@5.4.6(@types/node@22.7.9)(less@4.2.0)(sass@1.77.6)(terser@5.31.6)) ansi-colors: 4.1.3 autoprefixer: 10.4.20(postcss@8.4.41) - babel-loader: 9.1.3(@babel/core@7.25.2)(webpack@5.94.0) + babel-loader: 9.1.3(@babel/core@7.25.2)(webpack@5.94.0(esbuild@0.23.0)) browserslist: 4.24.2 copy-webpack-plugin: 12.0.2(webpack@5.94.0(esbuild@0.23.0)) critters: 0.0.24 @@ -11304,11 +11304,11 @@ snapshots: optionalDependencies: '@angular/localize': 18.2.10(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8))) esbuild: 0.23.0 - jest: 29.7.0(@types/node@22.7.9)(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)) + jest: 29.7.0(@types/node@22.7.9) jest-environment-jsdom: 29.7.0 karma: 6.4.4 - ng-packagr: 18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)))(tslib@2.6.3)(typescript@5.5.4) - tailwindcss: 3.4.7(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)) + ng-packagr: 18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7)(tslib@2.6.3)(typescript@5.5.4) + tailwindcss: 3.4.7(ts-node@10.9.2(@types/node@20.14.14)(typescript@5.5.4)) transitivePeerDependencies: - '@rspack/core' - '@swc/core' @@ -11434,7 +11434,7 @@ snapshots: tslib: 2.6.3 optional: true - '@angular/build@18.2.11(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/localize@18.2.10(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8))))(@types/node@20.14.14)(chokidar@3.6.0)(less@4.2.0)(postcss@8.4.41)(tailwindcss@3.4.7(ts-node@10.9.2(@types/node@20.14.14)(typescript@5.5.4)))(terser@5.31.6)(typescript@5.5.4)': + '@angular/build@18.2.11(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/localize@18.2.10(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8))))(@types/node@20.14.14)(chokidar@3.6.0)(less@4.2.0)(postcss@8.4.41)(tailwindcss@3.4.7)(terser@5.31.6)(typescript@5.5.4)': dependencies: '@ampproject/remapping': 2.3.0 '@angular-devkit/architect': 0.1802.11(chokidar@3.6.0) @@ -11478,7 +11478,7 @@ snapshots: - supports-color - terser - '@angular/build@18.2.11(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/localize@18.2.10(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8))))(@types/node@22.7.9)(chokidar@3.6.0)(less@4.2.0)(postcss@8.4.41)(tailwindcss@3.4.7(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)))(terser@5.31.6)(typescript@5.5.4)': + '@angular/build@18.2.11(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/localize@18.2.10(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8))))(@types/node@22.7.9)(chokidar@3.6.0)(less@4.2.0)(postcss@8.4.41)(tailwindcss@3.4.7)(terser@5.31.6)(typescript@5.5.4)': dependencies: '@ampproject/remapping': 2.3.0 '@angular-devkit/architect': 0.1802.11(chokidar@3.6.0) @@ -11511,7 +11511,7 @@ snapshots: '@angular/localize': 18.2.10(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8))) less: 4.2.0 postcss: 8.4.41 - tailwindcss: 3.4.7(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)) + tailwindcss: 3.4.7(ts-node@10.9.2(@types/node@20.14.14)(typescript@5.5.4)) transitivePeerDependencies: - '@types/node' - chokidar @@ -13457,42 +13457,6 @@ snapshots: - supports-color - ts-node - '@jest/core@29.7.0(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4))': - dependencies: - '@jest/console': 29.7.0 - '@jest/reporters': 29.7.0 - '@jest/test-result': 29.7.0 - '@jest/transform': 29.7.0 - '@jest/types': 29.6.3 - '@types/node': 20.14.14 - ansi-escapes: 4.3.2 - chalk: 4.1.2 - ci-info: 3.9.0 - exit: 0.1.2 - graceful-fs: 4.2.11 - jest-changed-files: 29.7.0 - jest-config: 29.7.0(@types/node@20.14.14)(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)) - jest-haste-map: 29.7.0 - jest-message-util: 29.7.0 - jest-regex-util: 29.6.3 - jest-resolve: 29.7.0 - jest-resolve-dependencies: 29.7.0 - jest-runner: 29.7.0 - jest-runtime: 29.7.0 - jest-snapshot: 29.7.0 - jest-util: 29.7.0 - jest-validate: 29.7.0 - jest-watcher: 29.7.0 - micromatch: 4.0.8 - pretty-format: 29.7.0 - slash: 3.0.0 - strip-ansi: 6.0.1 - transitivePeerDependencies: - - babel-plugin-macros - - supports-color - - ts-node - optional: true - '@jest/environment@29.7.0': dependencies: '@jest/fake-timers': 29.7.0 @@ -15558,13 +15522,20 @@ snapshots: transitivePeerDependencies: - supports-color - babel-loader@9.1.3(@babel/core@7.25.2)(webpack@5.94.0): + babel-loader@9.1.3(@babel/core@7.25.2)(webpack@5.94.0(esbuild@0.23.0)): dependencies: '@babel/core': 7.25.2 find-cache-dir: 4.0.0 schema-utils: 4.0.1 webpack: 5.94.0(esbuild@0.23.0) + babel-loader@9.1.3(@babel/core@7.25.2)(webpack@5.94.0): + dependencies: + '@babel/core': 7.25.2 + find-cache-dir: 4.0.0 + schema-utils: 4.0.1 + webpack: 5.94.0 + babel-plugin-istanbul@6.1.1: dependencies: '@babel/helper-plugin-utils': 7.25.9 @@ -16178,13 +16149,13 @@ snapshots: - supports-color - ts-node - create-jest@29.7.0(@types/node@22.7.9)(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)): + create-jest@29.7.0(@types/node@22.7.9): dependencies: '@jest/types': 29.6.3 chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.11 - jest-config: 29.7.0(@types/node@22.7.9)(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)) + jest-config: 29.7.0(@types/node@22.7.9) jest-util: 29.7.0 prompts: 2.4.2 transitivePeerDependencies: @@ -18799,16 +18770,16 @@ snapshots: - supports-color - ts-node - jest-cli@29.7.0(@types/node@22.7.9)(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)): + jest-cli@29.7.0(@types/node@22.7.9): dependencies: - '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)) + '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@20.14.14)(typescript@5.5.4)) '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 chalk: 4.1.2 - create-jest: 29.7.0(@types/node@22.7.9)(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)) + create-jest: 29.7.0(@types/node@22.7.9) exit: 0.1.2 import-local: 3.2.0 - jest-config: 29.7.0(@types/node@22.7.9)(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)) + jest-config: 29.7.0(@types/node@22.7.9) jest-util: 29.7.0 jest-validate: 29.7.0 yargs: 17.7.2 @@ -18850,39 +18821,7 @@ snapshots: - babel-plugin-macros - supports-color - jest-config@29.7.0(@types/node@20.14.14)(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)): - dependencies: - '@babel/core': 7.25.2 - '@jest/test-sequencer': 29.7.0 - '@jest/types': 29.6.3 - babel-jest: 29.7.0(@babel/core@7.25.2) - chalk: 4.1.2 - ci-info: 3.9.0 - deepmerge: 4.3.1 - glob: 7.2.3 - graceful-fs: 4.2.11 - jest-circus: 29.7.0 - jest-environment-node: 29.7.0 - jest-get-type: 29.6.3 - jest-regex-util: 29.6.3 - jest-resolve: 29.7.0 - jest-runner: 29.7.0 - jest-util: 29.7.0 - jest-validate: 29.7.0 - micromatch: 4.0.8 - parse-json: 5.2.0 - pretty-format: 29.7.0 - slash: 3.0.0 - strip-json-comments: 3.1.1 - optionalDependencies: - '@types/node': 20.14.14 - ts-node: 10.9.2(@types/node@22.7.9)(typescript@5.5.4) - transitivePeerDependencies: - - babel-plugin-macros - - supports-color - optional: true - - jest-config@29.7.0(@types/node@22.7.9)(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)): + jest-config@29.7.0(@types/node@22.7.9): dependencies: '@babel/core': 7.25.2 '@jest/test-sequencer': 29.7.0 @@ -18908,7 +18847,6 @@ snapshots: strip-json-comments: 3.1.1 optionalDependencies: '@types/node': 22.7.9 - ts-node: 10.9.2(@types/node@22.7.9)(typescript@5.5.4) transitivePeerDependencies: - babel-plugin-macros - supports-color @@ -19174,12 +19112,12 @@ snapshots: - supports-color - ts-node - jest@29.7.0(@types/node@22.7.9)(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)): + jest@29.7.0(@types/node@22.7.9): dependencies: - '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)) + '@jest/core': 29.7.0(ts-node@10.9.2(@types/node@20.14.14)(typescript@5.5.4)) '@jest/types': 29.6.3 import-local: 3.2.0 - jest-cli: 29.7.0(@types/node@22.7.9)(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)) + jest-cli: 29.7.0(@types/node@22.7.9) transitivePeerDependencies: - '@types/node' - babel-plugin-macros @@ -20307,7 +20245,7 @@ snapshots: - '@babel/core' - babel-plugin-macros - ng-packagr@18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7(ts-node@10.9.2(@types/node@20.14.14)(typescript@5.5.4)))(tslib@2.6.3)(typescript@5.5.4): + ng-packagr@18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7)(tslib@2.6.3)(typescript@5.5.4): dependencies: '@angular/compiler-cli': 18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4) '@rollup/plugin-json': 6.1.0(rollup@4.18.1) @@ -20340,39 +20278,6 @@ snapshots: transitivePeerDependencies: - supports-color - ng-packagr@18.1.0(@angular/compiler-cli@18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4))(tailwindcss@3.4.7(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)))(tslib@2.6.3)(typescript@5.5.4): - dependencies: - '@angular/compiler-cli': 18.2.10(@angular/compiler@18.2.10(@angular/core@18.2.10(rxjs@7.8.1)(zone.js@0.14.8)))(typescript@5.5.4) - '@rollup/plugin-json': 6.1.0(rollup@4.18.1) - '@rollup/plugin-node-resolve': 15.2.3(rollup@4.18.1) - '@rollup/wasm-node': 4.18.1 - ajv: 8.16.0 - ansi-colors: 4.1.3 - browserslist: 4.23.0 - cacache: 18.0.0 - chokidar: 3.6.0 - commander: 12.0.0 - convert-source-map: 2.0.0 - dependency-graph: 1.0.0 - esbuild: 0.23.0 - fast-glob: 3.3.2 - find-cache-dir: 3.3.2 - injection-js: 2.4.0 - jsonc-parser: 3.3.1 - less: 4.2.0 - ora: 5.4.1 - piscina: 4.6.1 - postcss: 8.4.39 - rxjs: 7.8.1 - sass: 1.78.0 - tslib: 2.6.3 - typescript: 5.5.4 - optionalDependencies: - rollup: 4.18.1 - tailwindcss: 3.4.7(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)) - transitivePeerDependencies: - - supports-color - nice-napi@1.0.2: dependencies: node-addon-api: 3.2.1 @@ -21049,15 +20954,6 @@ snapshots: postcss: 8.4.40 ts-node: 10.9.2(@types/node@20.14.14)(typescript@5.5.4) - postcss-load-config@4.0.2(postcss@8.4.40)(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)): - dependencies: - lilconfig: 3.1.2 - yaml: 2.5.0 - optionalDependencies: - postcss: 8.4.40 - ts-node: 10.9.2(@types/node@22.7.9)(typescript@5.5.4) - optional: true - postcss-load-config@5.1.0(jiti@1.21.6)(postcss@8.4.40): dependencies: lilconfig: 3.1.2 @@ -22801,34 +22697,6 @@ snapshots: transitivePeerDependencies: - ts-node - tailwindcss@3.4.7(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)): - dependencies: - '@alloc/quick-lru': 5.2.0 - arg: 5.0.2 - chokidar: 3.6.0 - didyoumean: 1.2.2 - dlv: 1.1.3 - fast-glob: 3.3.2 - glob-parent: 6.0.2 - is-glob: 4.0.3 - jiti: 1.21.6 - lilconfig: 2.1.0 - micromatch: 4.0.7 - normalize-path: 3.0.0 - object-hash: 3.0.0 - picocolors: 1.0.1 - postcss: 8.4.40 - postcss-import: 15.1.0(postcss@8.4.40) - postcss-js: 4.0.1(postcss@8.4.40) - postcss-load-config: 4.0.2(postcss@8.4.40)(ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4)) - postcss-nested: 6.2.0(postcss@8.4.40) - postcss-selector-parser: 6.1.1 - resolve: 1.22.8 - sucrase: 3.35.0 - transitivePeerDependencies: - - ts-node - optional: true - tapable@2.2.1: {} tar@6.1.14: @@ -22863,7 +22731,7 @@ snapshots: term-size@2.2.1: {} - terser-webpack-plugin@5.3.10(esbuild@0.23.0)(webpack@5.94.0): + terser-webpack-plugin@5.3.10(esbuild@0.23.0)(webpack@5.94.0(esbuild@0.23.0)): dependencies: '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 @@ -22874,6 +22742,15 @@ snapshots: optionalDependencies: esbuild: 0.23.0 + terser-webpack-plugin@5.3.10(webpack@5.94.0): + dependencies: + '@jridgewell/trace-mapping': 0.3.25 + jest-worker: 27.5.1 + schema-utils: 3.3.0 + serialize-javascript: 6.0.2 + terser: 5.31.6 + webpack: 5.94.0 + terser@5.31.6: dependencies: '@jridgewell/source-map': 0.3.3 @@ -23041,25 +22918,6 @@ snapshots: v8-compile-cache-lib: 3.0.1 yn: 3.1.1 - ts-node@10.9.2(@types/node@22.7.9)(typescript@5.5.4): - dependencies: - '@cspotcode/source-map-support': 0.8.1 - '@tsconfig/node10': 1.0.9 - '@tsconfig/node12': 1.0.11 - '@tsconfig/node14': 1.0.3 - '@tsconfig/node16': 1.0.4 - '@types/node': 22.7.9 - acorn: 8.9.0 - acorn-walk: 8.2.0 - arg: 4.1.3 - create-require: 1.1.1 - diff: 4.0.2 - make-error: 1.3.6 - typescript: 5.5.4 - v8-compile-cache-lib: 3.0.1 - yn: 3.1.1 - optional: true - tsconfig-paths@3.15.0: dependencies: '@types/json5': 0.0.29 @@ -23665,6 +23523,36 @@ snapshots: webpack-virtual-modules@0.5.0: {} + webpack@5.94.0: + dependencies: + '@types/estree': 1.0.6 + '@webassemblyjs/ast': 1.12.1 + '@webassemblyjs/wasm-edit': 1.12.1 + '@webassemblyjs/wasm-parser': 1.12.1 + acorn: 8.11.3 + acorn-import-attributes: 1.9.5(acorn@8.11.3) + browserslist: 4.24.2 + chrome-trace-event: 1.0.3 + enhanced-resolve: 5.17.1 + es-module-lexer: 1.5.3 + eslint-scope: 5.1.1 + events: 3.3.0 + glob-to-regexp: 0.4.1 + graceful-fs: 4.2.11 + json-parse-even-better-errors: 2.3.1 + loader-runner: 4.3.0 + mime-types: 2.1.35 + neo-async: 2.6.2 + schema-utils: 3.3.0 + tapable: 2.2.1 + terser-webpack-plugin: 5.3.10(webpack@5.94.0) + watchpack: 2.4.1 + webpack-sources: 3.2.3 + transitivePeerDependencies: + - '@swc/core' + - esbuild + - uglify-js + webpack@5.94.0(esbuild@0.23.0): dependencies: '@types/estree': 1.0.6 @@ -23687,7 +23575,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 3.3.0 tapable: 2.2.1 - terser-webpack-plugin: 5.3.10(esbuild@0.23.0)(webpack@5.94.0) + terser-webpack-plugin: 5.3.10(esbuild@0.23.0)(webpack@5.94.0(esbuild@0.23.0)) watchpack: 2.4.1 webpack-sources: 3.2.3 transitivePeerDependencies: From f4d2f10069087c28420c3f4b71f048e702ef9f70 Mon Sep 17 00:00:00 2001 From: Myrta Sakellariou Date: Tue, 5 Nov 2024 14:23:34 +0100 Subject: [PATCH 02/20] updated html structure and css --- packages/styles/index.html | 12 +++++----- .../styles/src/components/blockquote.scss | 23 +++++++++++++++---- .../tests/components/blockquote.test.scss | 7 ++++++ 3 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 packages/styles/tests/components/blockquote.test.scss diff --git a/packages/styles/index.html b/packages/styles/index.html index 91211d46d4..a07b60a12f 100644 --- a/packages/styles/index.html +++ b/packages/styles/index.html @@ -32,8 +32,8 @@

Styles package playground

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante. Lorem - ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.Lorem ipsum dolor sit amet consectetur adipiscing elit. Integer posuere erat a ante. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
@@ -44,8 +44,8 @@

Styles package playground

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante. Lorem - ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.Lorem ipsum dolor sit amet consectetur adipiscing elit. Integer posuere erat a ante. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
Author @@ -55,8 +55,8 @@

Styles package playground

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante. Lorem - ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.Lorem ipsum dolor sit amet consectetur adipiscing elit. Integer posuere erat a ante. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
diff --git a/packages/styles/src/components/blockquote.scss b/packages/styles/src/components/blockquote.scss index 6ddb528a97..118fde60f7 100644 --- a/packages/styles/src/components/blockquote.scss +++ b/packages/styles/src/components/blockquote.scss @@ -5,15 +5,30 @@ tokens.$default-map: components.$post-quote; .blockquote { - @extend %lead; + font-size: tokens.get('post-quote-font-size'); + font-weight: tokens.get('post-quote-font-weight'); margin: tokens.get('post-quote-margin-block') tokens.get('post-quote-margin-inline'); + padding: 0 tokens.get('post-quote-padding-inline-end') 0 + tokens.get('post-quote-padding-inline-start'); border-inline-start: tokens.get('post-quote-border-width-left') solid tokens.get('post-quote-border-left-color'); +} + +figure:has(.blockquote) { + margin: tokens.get('post-quote-margin-block') tokens.get('post-quote-margin-inline'); padding: 0 tokens.get('post-quote-padding-inline-end') 0 tokens.get('post-quote-padding-inline-start'); + border-inline-start: tokens.get('post-quote-border-width-left') solid + tokens.get('post-quote-border-left-color'); - .blockquote-footer { - margin-top: tokens.get('post-quote-gap-inline'); - @extend %body; + .blockquote { + margin: 0; + padding: 0; + border: none; } } + +.blockquote-footer { + @extend %body; + margin-top: tokens.get('post-quote-gap-inline'); +} diff --git a/packages/styles/tests/components/blockquote.test.scss b/packages/styles/tests/components/blockquote.test.scss new file mode 100644 index 0000000000..51f96e2892 --- /dev/null +++ b/packages/styles/tests/components/blockquote.test.scss @@ -0,0 +1,7 @@ +@use 'sass:map'; +@use 'sass:meta'; +@use 'tests/jest'; +@use 'src/components/blockquote'; + +// Check if component forwards options +@include jest.true(map.has-key(meta.module-variables('blockquote'), 'font-base-path')); From ca4bd5dacbb0d2313b79bb3811f94ff54acbc7e3 Mon Sep 17 00:00:00 2001 From: Myrta Sakellariou Date: Tue, 5 Nov 2024 15:34:31 +0100 Subject: [PATCH 03/20] review comments update --- packages/styles/index.html | 49 +++++++++++-------- .../styles/src/components/blockquote.scss | 4 +- .../styles/src/placeholders/_blockquote.scss | 15 ------ 3 files changed, 29 insertions(+), 39 deletions(-) delete mode 100644 packages/styles/src/placeholders/_blockquote.scss diff --git a/packages/styles/index.html b/packages/styles/index.html index a07b60a12f..679abc6031 100644 --- a/packages/styles/index.html +++ b/packages/styles/index.html @@ -29,40 +29,47 @@

Styles package playground

- -
- Lorem ipsum dolor sit amet consectetur adipiscing elit. Integer posuere erat a ante. - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante. + +
+
+ Lorem ipsum dolor sit amet consectetur adipiscing elit. Integer posuere erat a + ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a + ante. +
Author Source
-
+ -
- Lorem ipsum dolor sit amet consectetur adipiscing elit. Integer posuere erat a ante. - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante. +
+
+ Lorem ipsum dolor sit amet consectetur adipiscing elit. Integer posuere erat a + ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a + ante. +
Author Source
-
- -
- Lorem ipsum dolor sit amet consectetur adipiscing elit. Integer posuere erat a ante. - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante. - + +
+
+ Lorem ipsum dolor sit amet consectetur adipiscing elit. Integer posuere erat a + ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a + ante. +
Author Source
-
+ diff --git a/packages/styles/src/components/blockquote.scss b/packages/styles/src/components/blockquote.scss index 118fde60f7..15d84cbe2d 100644 --- a/packages/styles/src/components/blockquote.scss +++ b/packages/styles/src/components/blockquote.scss @@ -1,6 +1,5 @@ @use '../tokens/components'; @use '../functions/tokens'; -@use './../placeholders/blockquote' as blockquote-ph; tokens.$default-map: components.$post-quote; @@ -28,7 +27,6 @@ figure:has(.blockquote) { } } -.blockquote-footer { - @extend %body; +figcaption .blockquote-footer { margin-top: tokens.get('post-quote-gap-inline'); } diff --git a/packages/styles/src/placeholders/_blockquote.scss b/packages/styles/src/placeholders/_blockquote.scss deleted file mode 100644 index 772a5402db..0000000000 --- a/packages/styles/src/placeholders/_blockquote.scss +++ /dev/null @@ -1,15 +0,0 @@ -@use '../tokens/components'; -@use '../tokens/elements'; -@use '../functions/tokens'; - -tokens.$default-map: components.$post-lead; - -%lead { - font-size: tokens.get('post-lead-font-size'); - font-weight: tokens.get('post-lead-font-weight'); -} - -%body { - font-size: tokens.get('post-body-font-size', elements.$post-body); - font-weight: tokens.get('post-body-font-weight', elements.$post-body); -} From bb7a6cd7682bbf679622c86451e4cd80ac2629f9 Mon Sep 17 00:00:00 2001 From: Myrta Sakellariou Date: Tue, 5 Nov 2024 15:57:17 +0100 Subject: [PATCH 04/20] test --- packages/styles/tests/components/blockquote.test.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/styles/tests/components/blockquote.test.scss b/packages/styles/tests/components/blockquote.test.scss index 51f96e2892..c8978b66eb 100644 --- a/packages/styles/tests/components/blockquote.test.scss +++ b/packages/styles/tests/components/blockquote.test.scss @@ -4,4 +4,4 @@ @use 'src/components/blockquote'; // Check if component forwards options -@include jest.true(map.has-key(meta.module-variables('blockquote'), 'font-base-path')); +@include jest.true(map.has-key(meta.module-variables('quote'), 'font-base-path')); From ded5eadd8bc1e049c2276ad0eb10a9174806b6d1 Mon Sep 17 00:00:00 2001 From: Myrta Sakellariou Date: Tue, 5 Nov 2024 16:22:02 +0100 Subject: [PATCH 05/20] minor --- packages/styles/src/components/blockquote.scss | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/styles/src/components/blockquote.scss b/packages/styles/src/components/blockquote.scss index 15d84cbe2d..8c37c8f012 100644 --- a/packages/styles/src/components/blockquote.scss +++ b/packages/styles/src/components/blockquote.scss @@ -9,7 +9,7 @@ tokens.$default-map: components.$post-quote; margin: tokens.get('post-quote-margin-block') tokens.get('post-quote-margin-inline'); padding: 0 tokens.get('post-quote-padding-inline-end') 0 tokens.get('post-quote-padding-inline-start'); - border-inline-start: tokens.get('post-quote-border-width-left') solid + border-inline-start: tokens.get('post-quote-border-width-left') tokens.get('post-quote-border-left-color'); tokens.get('post-quote-border-left-color'); } @@ -17,13 +17,15 @@ figure:has(.blockquote) { margin: tokens.get('post-quote-margin-block') tokens.get('post-quote-margin-inline'); padding: 0 tokens.get('post-quote-padding-inline-end') 0 tokens.get('post-quote-padding-inline-start'); - border-inline-start: tokens.get('post-quote-border-width-left') solid - tokens.get('post-quote-border-left-color'); + border-inline-start: tokens.get('post-quote-border-width-left') + tokens.get('post-quote-border-left-style') tokens.get('post-quote-border-left-color'); .blockquote { margin: 0; padding: 0; - border: none; + border-width: 0; + border-style: none; + border-color: transparent; } } From 09d321dcf8260de3975a2c7a197f342caebdb04d Mon Sep 17 00:00:00 2001 From: Myrta Sakellariou Date: Tue, 5 Nov 2024 16:32:08 +0100 Subject: [PATCH 06/20] fixed error --- packages/styles/src/components/blockquote.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/styles/src/components/blockquote.scss b/packages/styles/src/components/blockquote.scss index 8c37c8f012..9ef83aad43 100644 --- a/packages/styles/src/components/blockquote.scss +++ b/packages/styles/src/components/blockquote.scss @@ -9,8 +9,8 @@ tokens.$default-map: components.$post-quote; margin: tokens.get('post-quote-margin-block') tokens.get('post-quote-margin-inline'); padding: 0 tokens.get('post-quote-padding-inline-end') 0 tokens.get('post-quote-padding-inline-start'); - border-inline-start: tokens.get('post-quote-border-width-left') tokens.get('post-quote-border-left-color'); - tokens.get('post-quote-border-left-color'); + border-inline-start: tokens.get('post-quote-border-width-left') + tokens.get('post-quote-border-left-color') tokens.get('post-quote-border-left-color'); } figure:has(.blockquote) { From 530ed75ff1551a619b9c898556867c63c3f5b86d Mon Sep 17 00:00:00 2001 From: Myrta Sakellariou Date: Tue, 5 Nov 2024 16:43:23 +0100 Subject: [PATCH 07/20] remove test --- packages/styles/tests/components/blockquote.test.scss | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 packages/styles/tests/components/blockquote.test.scss diff --git a/packages/styles/tests/components/blockquote.test.scss b/packages/styles/tests/components/blockquote.test.scss deleted file mode 100644 index c8978b66eb..0000000000 --- a/packages/styles/tests/components/blockquote.test.scss +++ /dev/null @@ -1,7 +0,0 @@ -@use 'sass:map'; -@use 'sass:meta'; -@use 'tests/jest'; -@use 'src/components/blockquote'; - -// Check if component forwards options -@include jest.true(map.has-key(meta.module-variables('quote'), 'font-base-path')); From 155ca681898b44e860845f673a270b0d3dfa0a69 Mon Sep 17 00:00:00 2001 From: Myrta Sakellariou Date: Tue, 5 Nov 2024 16:45:53 +0100 Subject: [PATCH 08/20] add dark scheme attr --- .../components/blockquote/blockquote.snapshot.stories.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/documentation/src/stories/components/blockquote/blockquote.snapshot.stories.ts b/packages/documentation/src/stories/components/blockquote/blockquote.snapshot.stories.ts index a327f0df89..7714671dc7 100644 --- a/packages/documentation/src/stories/components/blockquote/blockquote.snapshot.stories.ts +++ b/packages/documentation/src/stories/components/blockquote/blockquote.snapshot.stories.ts @@ -16,9 +16,12 @@ export const Blockquote: Story = { render: (_args: Args, context: StoryContext) => { return html`
- ${['bg-white', 'bg-dark'].map( + ${['white', 'dark'].map( bg => html` -
+
${bombArgs({ text: [ 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Vero mollitia magnam quo quam saepe. Aliquam tempore non deleniti culpa reprehenderit.', From 9d721503ae3df04da5e9b034b1c77720ab139eb3 Mon Sep 17 00:00:00 2001 From: Myrta Sakellariou Date: Mon, 11 Nov 2024 09:54:54 +0100 Subject: [PATCH 09/20] discussion updates --- .../components/blockquote/blockquote.docs.mdx | 5 +++-- .../blockquote/blockquote.stories.ts | 4 ++-- packages/styles/index.html | 19 ++++++------------- .../styles/src/components/blockquote.scss | 7 +++++-- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/packages/documentation/src/stories/components/blockquote/blockquote.docs.mdx b/packages/documentation/src/stories/components/blockquote/blockquote.docs.mdx index 4e14e45b63..56953765b0 100644 --- a/packages/documentation/src/stories/components/blockquote/blockquote.docs.mdx +++ b/packages/documentation/src/stories/components/blockquote/blockquote.docs.mdx @@ -15,7 +15,7 @@ import StylesPackageImport from '@/shared/styles-package-import.mdx';
For quoting blocks of content from another source within your document. Wrap `
` around any HTML as the quote. + class="blockquote"> with a ` around any HTML as the quote.
@@ -24,7 +24,7 @@ import StylesPackageImport from '@/shared/styles-package-import.mdx';
- + ## Concrete Examples of Application @@ -33,6 +33,7 @@ The following examples show the different characteristics of the component. Thes ### Nested To add simple quote characters around any nested text within your blockquote, you can wrap it with a + <q> tag. diff --git a/packages/documentation/src/stories/components/blockquote/blockquote.stories.ts b/packages/documentation/src/stories/components/blockquote/blockquote.stories.ts index 1495405491..5e4aaa430e 100644 --- a/packages/documentation/src/stories/components/blockquote/blockquote.stories.ts +++ b/packages/documentation/src/stories/components/blockquote/blockquote.stories.ts @@ -17,7 +17,7 @@ const meta: MetaComponent = { args: { text: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.', language: 'en', - caption: false, + caption: true, captionAuthor: 'Author', captionSource: 'Source', }, @@ -34,7 +34,7 @@ const meta: MetaComponent = { }, language: { name: 'Language', - description: 'The documents language.', + description: "The document's language.", control: { type: 'radio', labels: { diff --git a/packages/styles/index.html b/packages/styles/index.html index 679abc6031..4ffe93a09d 100644 --- a/packages/styles/index.html +++ b/packages/styles/index.html @@ -58,18 +58,11 @@

Styles package playground

Source
-
-
- Lorem ipsum dolor sit amet consectetur adipiscing elit. Integer posuere erat a - ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a - ante. -
-
- Author - Source -
-
+
+ Lorem ipsum dolor sit amet consectetur adipiscing elit. Integer posuere erat a ante. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante. +
diff --git a/packages/styles/src/components/blockquote.scss b/packages/styles/src/components/blockquote.scss index 9ef83aad43..36a9e4cdbb 100644 --- a/packages/styles/src/components/blockquote.scss +++ b/packages/styles/src/components/blockquote.scss @@ -10,7 +10,7 @@ tokens.$default-map: components.$post-quote; padding: 0 tokens.get('post-quote-padding-inline-end') 0 tokens.get('post-quote-padding-inline-start'); border-inline-start: tokens.get('post-quote-border-width-left') - tokens.get('post-quote-border-left-color') tokens.get('post-quote-border-left-color'); + tokens.get('post-quote-border-left-style') tokens.get('post-quote-border-left-color'); } figure:has(.blockquote) { @@ -29,6 +29,9 @@ figure:has(.blockquote) { } } -figcaption .blockquote-footer { +figcaption.blockquote-footer { margin-top: tokens.get('post-quote-gap-inline'); + cite { + font-style: normal; + } } From d866a5d2fa441c2f9083ead628f3854bc3120925 Mon Sep 17 00:00:00 2001 From: Myrta Sakellariou Date: Mon, 11 Nov 2024 09:58:00 +0100 Subject: [PATCH 10/20] fix lint error --- packages/styles/src/components/blockquote.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/styles/src/components/blockquote.scss b/packages/styles/src/components/blockquote.scss index 36a9e4cdbb..4db27897b6 100644 --- a/packages/styles/src/components/blockquote.scss +++ b/packages/styles/src/components/blockquote.scss @@ -31,6 +31,7 @@ figure:has(.blockquote) { figcaption.blockquote-footer { margin-top: tokens.get('post-quote-gap-inline'); + cite { font-style: normal; } From f01a2ae0b3dfde33c2adda51fd8cc1fcd73b7fee Mon Sep 17 00:00:00 2001 From: Myrta Sakellariou Date: Mon, 11 Nov 2024 11:29:58 +0100 Subject: [PATCH 11/20] token rename update --- .../components/blockquote/blockquote.docs.mdx | 2 +- .../styles/src/components/blockquote.scss | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/documentation/src/stories/components/blockquote/blockquote.docs.mdx b/packages/documentation/src/stories/components/blockquote/blockquote.docs.mdx index 56953765b0..30af7f7162 100644 --- a/packages/documentation/src/stories/components/blockquote/blockquote.docs.mdx +++ b/packages/documentation/src/stories/components/blockquote/blockquote.docs.mdx @@ -15,7 +15,7 @@ import StylesPackageImport from '@/shared/styles-package-import.mdx';
For quoting blocks of content from another source within your document. Wrap `
with a ` around any HTML as the quote. + class="blockquote">` along with a `` around any HTML as the quote.
diff --git a/packages/styles/src/components/blockquote.scss b/packages/styles/src/components/blockquote.scss index 4db27897b6..68814192ba 100644 --- a/packages/styles/src/components/blockquote.scss +++ b/packages/styles/src/components/blockquote.scss @@ -1,24 +1,24 @@ @use '../tokens/components'; @use '../functions/tokens'; -tokens.$default-map: components.$post-quote; +tokens.$default-map: components.$post-blockquote; .blockquote { - font-size: tokens.get('post-quote-font-size'); - font-weight: tokens.get('post-quote-font-weight'); - margin: tokens.get('post-quote-margin-block') tokens.get('post-quote-margin-inline'); - padding: 0 tokens.get('post-quote-padding-inline-end') 0 - tokens.get('post-quote-padding-inline-start'); - border-inline-start: tokens.get('post-quote-border-width-left') - tokens.get('post-quote-border-left-style') tokens.get('post-quote-border-left-color'); + font-size: tokens.get('post-blockquote-font-size'); + font-weight: tokens.get('post-blockquote-font-weight'); + margin: tokens.get('post-blockquote-margin-block') tokens.get('post-blockquote-margin-inline'); + padding: 0 tokens.get('post-blockquote-padding-inline-end') 0 + tokens.get('post-blockquote-padding-inline-start'); + border-inline-start: tokens.get('post-blockquote-border-width-left') + tokens.get('post-blockquote-border-left-style') tokens.get('post-blockquote-border-left-color'); } figure:has(.blockquote) { - margin: tokens.get('post-quote-margin-block') tokens.get('post-quote-margin-inline'); - padding: 0 tokens.get('post-quote-padding-inline-end') 0 - tokens.get('post-quote-padding-inline-start'); - border-inline-start: tokens.get('post-quote-border-width-left') - tokens.get('post-quote-border-left-style') tokens.get('post-quote-border-left-color'); + margin: tokens.get('post-blockquote-margin-block') tokens.get('post-blockquote-margin-inline'); + padding: 0 tokens.get('post-blockquote-padding-inline-end') 0 + tokens.get('post-blockquote-padding-inline-start'); + border-inline-start: tokens.get('post-blockquote-border-width-left') + tokens.get('post-blockquote-border-left-style') tokens.get('post-blockquote-border-left-color'); .blockquote { margin: 0; @@ -30,7 +30,7 @@ figure:has(.blockquote) { } figcaption.blockquote-footer { - margin-top: tokens.get('post-quote-gap-inline'); + margin-top: tokens.get('post-blockquote-gap-inline'); cite { font-style: normal; From 3a6256cd55d5185e114b69906dc3aad169a07bcf Mon Sep 17 00:00:00 2001 From: Myrta Sakellariou Date: Mon, 11 Nov 2024 11:34:12 +0100 Subject: [PATCH 12/20] revert index.html --- packages/styles/index.html | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/packages/styles/index.html b/packages/styles/index.html index 4ffe93a09d..ff745d2ce6 100644 --- a/packages/styles/index.html +++ b/packages/styles/index.html @@ -29,40 +29,6 @@

Styles package playground

- -
-
- Lorem ipsum dolor sit amet consectetur adipiscing elit. Integer posuere erat a - ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a - ante. -
-
- Author - Source -
-
- -
-
- Lorem ipsum dolor sit amet consectetur adipiscing elit. Integer posuere erat a - ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a - ante. -
-
- Author - Source -
-
-
- Lorem ipsum dolor sit amet consectetur adipiscing elit. Integer posuere erat a ante. - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante. -
From 46323afdb28f584c438e9169fb4ce5b7f15e58ab Mon Sep 17 00:00:00 2001 From: Myrta Sakellariou Date: Mon, 11 Nov 2024 11:43:54 +0100 Subject: [PATCH 13/20] error fix --- packages/styles/src/placeholders/_index.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/styles/src/placeholders/_index.scss b/packages/styles/src/placeholders/_index.scss index c467b10154..639bb6ad75 100644 --- a/packages/styles/src/placeholders/_index.scss +++ b/packages/styles/src/placeholders/_index.scss @@ -4,4 +4,3 @@ @use './color'; @use './dropdown'; @use './text'; -@use './blockquote'; From c6851d6fecbe3f51f96b238e07c90ad158ffe1d9 Mon Sep 17 00:00:00 2001 From: Myrta Sakellariou Date: Tue, 12 Nov 2024 08:14:52 +0100 Subject: [PATCH 14/20] Revert "revert index.html" This reverts commit 3a6256cd55d5185e114b69906dc3aad169a07bcf. --- packages/styles/index.html | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/packages/styles/index.html b/packages/styles/index.html index ff745d2ce6..4ffe93a09d 100644 --- a/packages/styles/index.html +++ b/packages/styles/index.html @@ -29,6 +29,40 @@

Styles package playground

+ +
+
+ Lorem ipsum dolor sit amet consectetur adipiscing elit. Integer posuere erat a + ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a + ante. +
+
+ Author + Source +
+
+ +
+
+ Lorem ipsum dolor sit amet consectetur adipiscing elit. Integer posuere erat a + ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a + ante. +
+
+ Author + Source +
+
+
+ Lorem ipsum dolor sit amet consectetur adipiscing elit. Integer posuere erat a ante. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante. +
From 82c36328bc7b2798f0bdff53ab9c0a4ec03231e4 Mon Sep 17 00:00:00 2001 From: Myrta Sakellariou Date: Tue, 12 Nov 2024 08:16:14 +0100 Subject: [PATCH 15/20] review comments update --- .../components/blockquote/blockquote.docs.mdx | 2 +- .../blockquote/blockquote.snapshot.stories.ts | 48 ++++++++++--------- .../styles/src/components/blockquote.scss | 2 +- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/packages/documentation/src/stories/components/blockquote/blockquote.docs.mdx b/packages/documentation/src/stories/components/blockquote/blockquote.docs.mdx index 30af7f7162..36118a18b5 100644 --- a/packages/documentation/src/stories/components/blockquote/blockquote.docs.mdx +++ b/packages/documentation/src/stories/components/blockquote/blockquote.docs.mdx @@ -15,7 +15,7 @@ import StylesPackageImport from '@/shared/styles-package-import.mdx';
For quoting blocks of content from another source within your document. Wrap `
` along with a `` around any HTML as the quote. + className="blockquote">` along with a `` around any HTML as the quote.
diff --git a/packages/documentation/src/stories/components/blockquote/blockquote.snapshot.stories.ts b/packages/documentation/src/stories/components/blockquote/blockquote.snapshot.stories.ts index 7714671dc7..70dd1b49f1 100644 --- a/packages/documentation/src/stories/components/blockquote/blockquote.snapshot.stories.ts +++ b/packages/documentation/src/stories/components/blockquote/blockquote.snapshot.stories.ts @@ -16,29 +16,31 @@ export const Blockquote: Story = { render: (_args: Args, context: StoryContext) => { return html`
- ${['white', 'dark'].map( - bg => html` -
- ${bombArgs({ - text: [ - 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Vero mollitia magnam quo quam saepe. Aliquam tempore non deleniti culpa reprehenderit.', - 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Voluptatem maxime eius aut quae ducimus dignissimos pariatur suscipit distinctio, accusamus laudantium, sint quibusdam nisi optio? Ut quae obcaecati, harum ullam quos beatae, ipsam enim, placeat eligendi dolores excepturi. Quia quod eligendi ab voluptas modi id distinctio iure vel possimus deserunt, amet, dolores laboriosam quas qui aut laborum? Et numquam esse laboriosam totam quod sapiente recusandae consectetur optio, quaerat quia. Sequi excepturi quia voluptate nesciunt cum veritatis? Quas molestias nostrum temporibus saepe porro facilis tempora natus non modi fugiat, vitae facere quos placeat maiores incidunt illo itaque sequi dolore! Temporibus recusandae, veritatis eos vitae optio porro magni rem culpa enim provident sed. Libero blanditiis delectus voluptatibus, temporibus alias laudantium ad tempora iure, sunt minima maiores qui ut? Aliquam quis obcaecati id, officiis accusamus voluptas rerum magnam, est a culpa voluptatum tenetur ab, asperiores vel dolor ipsum alias tempore sint aliquid? Eum architecto laboriosam dolor inventore deleniti? Repellat perferendis ratione dolorem, amet deleniti minima repudiandae eos iure maiores, dicta sequi architecto ipsa sit ab laudantium praesentium maxime asperiores molestiae ad nulla ullam est saepe vero. Qui ratione vero dicta nisi molestiae rem consectetur, natus ipsam facilis repellendus animi ullam debitis temporibus sapiente quam.', - ], - language: context.argTypes.language.options, - caption: [false, true], - captionAuthor: ['Author'], - captionSource: ['Source'], - }) - .map((args: Args) => ({ - ...args, - text: `${args.language.toUpperCase()}: ${args.text}`, - })) - .map((args: Args) => meta.render?.({ ...context.args, ...args }, context))} -
- `, + ${['light', 'dark'].map(scheme => + ['white', 'dark'].map( + bg => html` +
+ ${bombArgs({ + text: [ + 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Vero mollitia magnam quo quam saepe. Aliquam tempore non deleniti culpa reprehenderit.', + 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Voluptatem maxime eius aut quae ducimus dignissimos pariatur suscipit distinctio, accusamus laudantium, sint quibusdam nisi optio? Ut quae obcaecati, harum ullam quos beatae, ipsam enim, placeat eligendi dolores excepturi. Quia quod eligendi ab voluptas modi id distinctio iure vel possimus deserunt, amet, dolores laboriosam quas qui aut laborum? Et numquam esse laboriosam totam quod sapiente recusandae consectetur optio, quaerat quia. Sequi excepturi quia voluptate nesciunt cum veritatis? Quas molestias nostrum temporibus saepe porro facilis tempora natus non modi fugiat, vitae facere quos placeat maiores incidunt illo itaque sequi dolore! Temporibus recusandae, veritatis eos vitae optio porro magni rem culpa enim provident sed. Libero blanditiis delectus voluptatibus, temporibus alias laudantium ad tempora iure, sunt minima maiores qui ut? Aliquam quis obcaecati id, officiis accusamus voluptas rerum magnam, est a culpa voluptatum tenetur ab, asperiores vel dolor ipsum alias tempore sint aliquid? Eum architecto laboriosam dolor inventore deleniti? Repellat perferendis ratione dolorem, amet deleniti minima repudiandae eos iure maiores, dicta sequi architecto ipsa sit ab laudantium praesentium maxime asperiores molestiae ad nulla ullam est saepe vero. Qui ratione vero dicta nisi molestiae rem consectetur, natus ipsam facilis repellendus animi ullam debitis temporibus sapiente quam.', + ], + language: context.argTypes.language.options, + caption: [false, true], + captionAuthor: ['Author'], + captionSource: ['Source'], + }) + .map((args: Args) => ({ + ...args, + text: `${args.language.toUpperCase()}: ${args.text}`, + })) + .map((args: Args) => meta.render?.({ ...context.args, ...args }, context))} +
+ `, + ), )}
`; diff --git a/packages/styles/src/components/blockquote.scss b/packages/styles/src/components/blockquote.scss index 68814192ba..56791c7f40 100644 --- a/packages/styles/src/components/blockquote.scss +++ b/packages/styles/src/components/blockquote.scss @@ -33,6 +33,6 @@ figcaption.blockquote-footer { margin-top: tokens.get('post-blockquote-gap-inline'); cite { - font-style: normal; + font-style: inherit; } } From 9dbbd0bbb37b2e20d186becb7d7750b1de5309b6 Mon Sep 17 00:00:00 2001 From: Myrta Sakellariou Date: Tue, 12 Nov 2024 08:25:32 +0100 Subject: [PATCH 16/20] Reapply "revert index.html" This reverts commit c6851d6fecbe3f51f96b238e07c90ad158ffe1d9. --- packages/styles/index.html | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/packages/styles/index.html b/packages/styles/index.html index 4ffe93a09d..ff745d2ce6 100644 --- a/packages/styles/index.html +++ b/packages/styles/index.html @@ -29,40 +29,6 @@

Styles package playground

- -
-
- Lorem ipsum dolor sit amet consectetur adipiscing elit. Integer posuere erat a - ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a - ante. -
-
- Author - Source -
-
- -
-
- Lorem ipsum dolor sit amet consectetur adipiscing elit. Integer posuere erat a - ante. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a - ante. -
-
- Author - Source -
-
-
- Lorem ipsum dolor sit amet consectetur adipiscing elit. Integer posuere erat a ante. - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante. -
From e97e5f53fd35d498a5b787a99375955765024a42 Mon Sep 17 00:00:00 2001 From: Myrta Sakellariou Date: Tue, 12 Nov 2024 08:37:03 +0100 Subject: [PATCH 17/20] Revert changes to index.html --- packages/styles/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/styles/index.html b/packages/styles/index.html index ff745d2ce6..53ef398d94 100644 --- a/packages/styles/index.html +++ b/packages/styles/index.html @@ -29,6 +29,8 @@

Styles package playground

+ + From 13b36305d8ecb1f73eee954048a253104420ba92 Mon Sep 17 00:00:00 2001 From: Myrta Sakellariou Date: Tue, 12 Nov 2024 08:43:48 +0100 Subject: [PATCH 18/20] test correction --- .../blockquote/blockquote.snapshot.stories.ts | 51 ++++++++++--------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/packages/documentation/src/stories/components/blockquote/blockquote.snapshot.stories.ts b/packages/documentation/src/stories/components/blockquote/blockquote.snapshot.stories.ts index 70dd1b49f1..c4828fcb8a 100644 --- a/packages/documentation/src/stories/components/blockquote/blockquote.snapshot.stories.ts +++ b/packages/documentation/src/stories/components/blockquote/blockquote.snapshot.stories.ts @@ -16,31 +16,32 @@ export const Blockquote: Story = { render: (_args: Args, context: StoryContext) => { return html`
- ${['light', 'dark'].map(scheme => - ['white', 'dark'].map( - bg => html` -
- ${bombArgs({ - text: [ - 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Vero mollitia magnam quo quam saepe. Aliquam tempore non deleniti culpa reprehenderit.', - 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Voluptatem maxime eius aut quae ducimus dignissimos pariatur suscipit distinctio, accusamus laudantium, sint quibusdam nisi optio? Ut quae obcaecati, harum ullam quos beatae, ipsam enim, placeat eligendi dolores excepturi. Quia quod eligendi ab voluptas modi id distinctio iure vel possimus deserunt, amet, dolores laboriosam quas qui aut laborum? Et numquam esse laboriosam totam quod sapiente recusandae consectetur optio, quaerat quia. Sequi excepturi quia voluptate nesciunt cum veritatis? Quas molestias nostrum temporibus saepe porro facilis tempora natus non modi fugiat, vitae facere quos placeat maiores incidunt illo itaque sequi dolore! Temporibus recusandae, veritatis eos vitae optio porro magni rem culpa enim provident sed. Libero blanditiis delectus voluptatibus, temporibus alias laudantium ad tempora iure, sunt minima maiores qui ut? Aliquam quis obcaecati id, officiis accusamus voluptas rerum magnam, est a culpa voluptatum tenetur ab, asperiores vel dolor ipsum alias tempore sint aliquid? Eum architecto laboriosam dolor inventore deleniti? Repellat perferendis ratione dolorem, amet deleniti minima repudiandae eos iure maiores, dicta sequi architecto ipsa sit ab laudantium praesentium maxime asperiores molestiae ad nulla ullam est saepe vero. Qui ratione vero dicta nisi molestiae rem consectetur, natus ipsam facilis repellendus animi ullam debitis temporibus sapiente quam.', - ], - language: context.argTypes.language.options, - caption: [false, true], - captionAuthor: ['Author'], - captionSource: ['Source'], - }) - .map((args: Args) => ({ - ...args, - text: `${args.language.toUpperCase()}: ${args.text}`, - })) - .map((args: Args) => meta.render?.({ ...context.args, ...args }, context))} -
- `, - ), + ${[ + { scheme: 'light', bg: 'white' }, + { scheme: 'dark', bg: 'dark' }, + ].map( + ({ scheme, bg }) => html` +
+ ${bombArgs({ + text: [ + 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Vero mollitia magnam quo quam saepe. Aliquam tempore non deleniti culpa reprehenderit.', + 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Voluptatem maxime eius aut quae ducimus dignissimos pariatur suscipit distinctio, accusamus laudantium, sint quibusdam nisi optio? Ut quae obcaecati, harum ullam quos beatae, ipsam enim, placeat eligendi dolores excepturi. Quia quod eligendi ab voluptas modi id distinctio iure vel possimus deserunt, amet, dolores laboriosam quas qui aut laborum? Et numquam esse laboriosam totam quod sapiente recusandae consectetur optio, quaerat quia. Sequi excepturi quia voluptate nesciunt cum veritatis? Quas molestias nostrum temporibus saepe porro facilis tempora natus non modi fugiat, vitae facere quos placeat maiores incidunt illo itaque sequi dolore! Temporibus recusandae, veritatis eos vitae optio porro magni rem culpa enim provident sed. Libero blanditiis delectus voluptatibus, temporibus alias laudantium ad tempora iure, sunt minima maiores qui ut? Aliquam quis obcaecati id, officiis accusamus voluptas rerum magnam, est a culpa voluptatum tenetur ab, asperiores vel dolor ipsum alias tempore sint aliquid? Eum architecto laboriosam dolor inventore deleniti? Repellat perferendis ratione dolorem, amet deleniti minima repudiandae eos iure maiores, dicta sequi architecto ipsa sit ab laudantium praesentium maxime asperiores molestiae ad nulla ullam est saepe vero. Qui ratione vero dicta nisi molestiae rem consectetur, natus ipsam facilis repellendus animi ullam debitis temporibus sapiente quam.', + ], + language: context.argTypes.language.options, + caption: [false, true], + captionAuthor: ['Author'], + captionSource: ['Source'], + }) + .map((args: Args) => ({ + ...args, + text: `${args.language.toUpperCase()}: ${args.text}`, + })) + .map((args: Args) => meta.render?.({ ...context.args, ...args }, context))} +
+ `, )}
`; From 6f1a773dc6575849c932d0eef5614701cb3a25c6 Mon Sep 17 00:00:00 2001 From: Myrta Sakellariou Date: Tue, 12 Nov 2024 12:48:41 +0100 Subject: [PATCH 19/20] add changeset --- .changeset/twenty-items-drum.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/twenty-items-drum.md diff --git a/.changeset/twenty-items-drum.md b/.changeset/twenty-items-drum.md new file mode 100644 index 0000000000..e1072886e9 --- /dev/null +++ b/.changeset/twenty-items-drum.md @@ -0,0 +1,6 @@ +--- +'@swisspost/design-system-documentation': minor +'@swisspost/design-system-styles': minor +--- + +implement blockquote component From bdbb0db44044c6855053666fa3cf377daf73ce9d Mon Sep 17 00:00:00 2001 From: Myrta Sakellariou <66249294+myrta2302@users.noreply.github.com> Date: Thu, 14 Nov 2024 08:06:41 +0100 Subject: [PATCH 20/20] Update .changeset/twenty-items-drum.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alizé Debray <33580481+alizedebray@users.noreply.github.com> --- .changeset/twenty-items-drum.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.changeset/twenty-items-drum.md b/.changeset/twenty-items-drum.md index e1072886e9..8541010598 100644 --- a/.changeset/twenty-items-drum.md +++ b/.changeset/twenty-items-drum.md @@ -1,6 +1,6 @@ --- -'@swisspost/design-system-documentation': minor -'@swisspost/design-system-styles': minor +'@swisspost/design-system-documentation': patch +'@swisspost/design-system-styles': patch --- -implement blockquote component +Updated the blockquote styles to match the new Post design.