Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -65,4 +64,4 @@
"sass": "^1.57.1",
"typescript": "~4.8.4"
}
}
}
11 changes: 5 additions & 6 deletions projects/lib-workspace/src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@
</fs-nav-frame-toolbar-center>

<fs-nav-frame-toolbar-end>
<div>
<input
type="search"
id="dummy-search"
class="block w-full p-2 pl-4 text-sm text-gray-900 border border-gray-300 rounded-lg"
placeholder="Dummy Search" />
<div style="font-size: 12px">
<mat-form-field appearance="outline">
<mat-label>Search</mat-label>
<input matInput placeholder="Searching..." />
</mat-form-field>
</div>
</fs-nav-frame-toolbar-end>
</fs-nav-frame-toolbar>
Expand Down
3 changes: 0 additions & 3 deletions projects/lib-workspace/src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
14 changes: 13 additions & 1 deletion projects/ng-mat-components/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions projects/ng-mat-components/_theming.scss
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
6 changes: 5 additions & 1 deletion projects/ng-mat-components/ng-package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
5 changes: 1 addition & 4 deletions projects/ng-mat-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,7 @@
"./theming": {
"sass": "./_theming.scss"
},
"./_theming": {
"sass": "./_theming.scss"
},
"./fonts/roboto": {
"./styles/fonts/roboto": {
"sass": "./styles/fonts/_roboto.scss"
}
}
Expand Down
8 changes: 0 additions & 8 deletions tailwind.config.js

This file was deleted.