Skip to content

Commit bf5272e

Browse files
authored
fix: extract theming to styles folder (#39)
1 parent edaf4b6 commit bf5272e

File tree

12 files changed

+27
-27
lines changed

12 files changed

+27
-27
lines changed

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"material-icons": "^1.13.1",
3535
"postcss": "^8.4.20",
3636
"rxjs": "^7.8.0",
37-
"tailwindcss": "^3.2.4",
3837
"tslib": "^2.4.0",
3938
"zone.js": "~0.11.7"
4039
},
@@ -65,4 +64,4 @@
6564
"sass": "^1.57.1",
6665
"typescript": "~4.8.4"
6766
}
68-
}
67+
}

projects/lib-workspace/src/app/app.component.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@
1616
</fs-nav-frame-toolbar-center>
1717

1818
<fs-nav-frame-toolbar-end>
19-
<div>
20-
<input
21-
type="search"
22-
id="dummy-search"
23-
class="block w-full p-2 pl-4 text-sm text-gray-900 border border-gray-300 rounded-lg"
24-
placeholder="Dummy Search" />
19+
<div style="font-size: 12px">
20+
<mat-form-field appearance="outline">
21+
<mat-label>Search</mat-label>
22+
<input matInput placeholder="Searching..." />
23+
</mat-form-field>
2524
</div>
2625
</fs-nav-frame-toolbar-end>
2726
</fs-nav-frame-toolbar>

projects/lib-workspace/src/styles.scss

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ $light-theme: mat.define-light-theme((color: (primary: mat.define-palette(palett
3939
@include fsc.all-component-themes($light-theme);
4040
}
4141

42-
@tailwind components;
43-
@tailwind utilities;
44-
4542
html * {
4643
font-family: 'Roboto-local';
4744
}

projects/ng-mat-components/README.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
# ng-mat-components
1+
# @fullstack-devops/ng-mat-components
2+
3+
[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/fullstack-devops/ng-mat-components/release.yml?logo=GitHub%20Actions)](#)
4+
[![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)
5+
6+
**Downloads:**
7+
8+
[![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)
9+
[![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)
10+
11+
**License:**
12+
13+
[![GitHub](https://img.shields.io/github/license/fullstack-devops/ng-mat-components?style=flat)](#)
214

315
Components for @angular/material
416

projects/ng-mat-components/_theming.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@use 'src/fs-calendar';
2-
@use 'src/fs-nav-frame';
1+
@use 'styles/fs-calendar';
2+
@use 'styles/fs-nav-frame';
33

44
@mixin all-component-themes($theme) {
55
// Extract whichever individual palettes you need from the theme.

projects/ng-mat-components/ng-package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
"assets": [
99
"_index.scss",
1010
"_theming.scss",
11-
"./styles/fonts/_roboto.scss"
11+
"./styles/fonts/_roboto.scss",
12+
"./styles/fs-calendar/_index.scss",
13+
"./styles/fs-calendar/_theming.scss",
14+
"./styles/fs-nav-frame/_index.scss",
15+
"./styles/fs-nav-frame/_theming.scss"
1216
]
1317
}

projects/ng-mat-components/package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@
3636
"./theming": {
3737
"sass": "./_theming.scss"
3838
},
39-
"./_theming": {
40-
"sass": "./_theming.scss"
41-
},
42-
"./fonts/roboto": {
39+
"./styles/fonts/roboto": {
4340
"sass": "./styles/fonts/_roboto.scss"
4441
}
4542
}

0 commit comments

Comments
 (0)