From 3b0da4c2c6904cc6fe1c5b0077b74bb648acc7b2 Mon Sep 17 00:00:00 2001 From: eksrha <58111764+eksrha@users.noreply.github.com> Date: Sun, 12 Feb 2023 22:49:40 +0100 Subject: [PATCH 1/2] fix: extract theming to styles folder --- projects/ng-mat-components/README.md | 14 +++++++++++++- projects/ng-mat-components/_theming.scss | 4 ++-- projects/ng-mat-components/ng-package.json | 6 +++++- projects/ng-mat-components/package.json | 5 +---- .../{src => styles}/fs-calendar/_index.scss | 0 .../{src => styles}/fs-calendar/_theming.scss | 0 .../{src => styles}/fs-nav-frame/_index.scss | 0 .../{src => styles}/fs-nav-frame/_theming.scss | 0 8 files changed, 21 insertions(+), 8 deletions(-) rename projects/ng-mat-components/{src => styles}/fs-calendar/_index.scss (100%) rename projects/ng-mat-components/{src => styles}/fs-calendar/_theming.scss (100%) rename projects/ng-mat-components/{src => styles}/fs-nav-frame/_index.scss (100%) rename projects/ng-mat-components/{src => styles}/fs-nav-frame/_theming.scss (100%) diff --git a/projects/ng-mat-components/README.md b/projects/ng-mat-components/README.md index 8df9073..b272ad9 100644 --- a/projects/ng-mat-components/README.md +++ b/projects/ng-mat-components/README.md @@ -1,4 +1,16 @@ -# ng-mat-components +# @fullstack-devops/ng-mat-components + +[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/fullstack-devops/ng-mat-components/release.yml?logo=GitHub%20Actions)](#) +[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/fullstack-devops/ng-mat-components)](https://github.com/fullstack-devops/ng-mat-components/releases) + +**Downloads:** + +[![GitHub release (latest by date)](https://img.shields.io/github/downloads/fullstack-devops/ng-mat-components/latest/total?style=flat&label=GitHub%20downloads%40latest&logo=GitHub)](https://github.com/fullstack-devops/ng-mat-components/pkgs/npm/ng-mat-components) +[![npm](https://img.shields.io/npm/dw/@fullstack-devops/ng-mat-components?style=flat&label=npm%20downloads&logo=npm)](https://www.npmjs.com/package/@fullstack-devops/ng-mat-components) + +**License:** + +[![GitHub](https://img.shields.io/github/license/fullstack-devops/ng-mat-components?style=flat)](#) Components for @angular/material diff --git a/projects/ng-mat-components/_theming.scss b/projects/ng-mat-components/_theming.scss index 66d7485..b44e936 100644 --- a/projects/ng-mat-components/_theming.scss +++ b/projects/ng-mat-components/_theming.scss @@ -1,5 +1,5 @@ -@use 'src/fs-calendar'; -@use 'src/fs-nav-frame'; +@use 'styles/fs-calendar'; +@use 'styles/fs-nav-frame'; @mixin all-component-themes($theme) { // Extract whichever individual palettes you need from the theme. diff --git a/projects/ng-mat-components/ng-package.json b/projects/ng-mat-components/ng-package.json index 503364d..37018bc 100644 --- a/projects/ng-mat-components/ng-package.json +++ b/projects/ng-mat-components/ng-package.json @@ -8,6 +8,10 @@ "assets": [ "_index.scss", "_theming.scss", - "./styles/fonts/_roboto.scss" + "./styles/fonts/_roboto.scss", + "./styles/fs-calendar/_index.scss", + "./styles/fs-calendar/_theming.scss", + "./styles/fs-nav-frame/_index.scss", + "./styles/fs-nav-frame/_theming.scss" ] } \ No newline at end of file diff --git a/projects/ng-mat-components/package.json b/projects/ng-mat-components/package.json index 8b21a7b..f682db1 100644 --- a/projects/ng-mat-components/package.json +++ b/projects/ng-mat-components/package.json @@ -36,10 +36,7 @@ "./theming": { "sass": "./_theming.scss" }, - "./_theming": { - "sass": "./_theming.scss" - }, - "./fonts/roboto": { + "./styles/fonts/roboto": { "sass": "./styles/fonts/_roboto.scss" } } diff --git a/projects/ng-mat-components/src/fs-calendar/_index.scss b/projects/ng-mat-components/styles/fs-calendar/_index.scss similarity index 100% rename from projects/ng-mat-components/src/fs-calendar/_index.scss rename to projects/ng-mat-components/styles/fs-calendar/_index.scss diff --git a/projects/ng-mat-components/src/fs-calendar/_theming.scss b/projects/ng-mat-components/styles/fs-calendar/_theming.scss similarity index 100% rename from projects/ng-mat-components/src/fs-calendar/_theming.scss rename to projects/ng-mat-components/styles/fs-calendar/_theming.scss diff --git a/projects/ng-mat-components/src/fs-nav-frame/_index.scss b/projects/ng-mat-components/styles/fs-nav-frame/_index.scss similarity index 100% rename from projects/ng-mat-components/src/fs-nav-frame/_index.scss rename to projects/ng-mat-components/styles/fs-nav-frame/_index.scss diff --git a/projects/ng-mat-components/src/fs-nav-frame/_theming.scss b/projects/ng-mat-components/styles/fs-nav-frame/_theming.scss similarity index 100% rename from projects/ng-mat-components/src/fs-nav-frame/_theming.scss rename to projects/ng-mat-components/styles/fs-nav-frame/_theming.scss From e6fe0f0b15fdc6b0eaaebf62937254af308005aa Mon Sep 17 00:00:00 2001 From: eksrha <58111764+eksrha@users.noreply.github.com> Date: Sun, 12 Feb 2023 23:29:26 +0100 Subject: [PATCH 2/2] removed tailwindcss --- package.json | 3 +-- projects/lib-workspace/src/app/app.component.html | 11 +++++------ projects/lib-workspace/src/styles.scss | 3 --- tailwind.config.js | 8 -------- 4 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 tailwind.config.js diff --git a/package.json b/package.json index 91fb196..99ed713 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,6 @@ "material-icons": "^1.13.1", "postcss": "^8.4.20", "rxjs": "^7.8.0", - "tailwindcss": "^3.2.4", "tslib": "^2.4.0", "zone.js": "~0.11.7" }, @@ -65,4 +64,4 @@ "sass": "^1.57.1", "typescript": "~4.8.4" } -} +} \ No newline at end of file diff --git a/projects/lib-workspace/src/app/app.component.html b/projects/lib-workspace/src/app/app.component.html index 5eedff4..6296468 100644 --- a/projects/lib-workspace/src/app/app.component.html +++ b/projects/lib-workspace/src/app/app.component.html @@ -16,12 +16,11 @@ -
- +
+ + Search + +
diff --git a/projects/lib-workspace/src/styles.scss b/projects/lib-workspace/src/styles.scss index eaa83fe..c66cf6e 100644 --- a/projects/lib-workspace/src/styles.scss +++ b/projects/lib-workspace/src/styles.scss @@ -39,9 +39,6 @@ $light-theme: mat.define-light-theme((color: (primary: mat.define-palette(palett @include fsc.all-component-themes($light-theme); } -@tailwind components; -@tailwind utilities; - html * { font-family: 'Roboto-local'; } \ No newline at end of file diff --git a/tailwind.config.js b/tailwind.config.js deleted file mode 100644 index ae4a2b5..0000000 --- a/tailwind.config.js +++ /dev/null @@ -1,8 +0,0 @@ -/** @type {import('tailwindcss').Config} */ -module.exports = { - content: ['./projects/lib-workspace/src/**/*.{html,ts}'], - theme: { - extend: {}, - }, - plugins: [], -};