Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2025-12-16 15:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: update Angular Material 13

Browse source
This commit is contained in:
d.strigo 2023-02-09 20:08:11 +01:00
parent f40e0c463e
commit dcb6b8e646
5 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
angular.json
View file

@ -27,6 +27,11 @@
"output": "/assets/img/markers" "output": "/assets/img/markers"
} }
], ],
"stylePreprocessorOptions": {
"includePaths": [
"node_modules"
]
},
"styles": [ "styles": [
"node_modules/bootstrap/dist/css/bootstrap.css", "node_modules/bootstrap/dist/css/bootstrap.css",
"node_modules/typeface-exo/index.css", "node_modules/typeface-exo/index.css",

2
src/app/@theme/styles/material/_angular-material.scss
View file

@ -1,4 +1,4 @@
@use '~@angular/material' as mat; @use '@angular/material' as mat;
@mixin angular-material() { @mixin angular-material() {
@include mat.core(); @include mat.core();

4
src/app/@theme/styles/material/_material-dark.scss
View file

@ -4,8 +4,8 @@
* Licensed under the MIT License. See License.txt in the project root for license information. * Licensed under the MIT License. See License.txt in the project root for license information.
*/ */
@import '~@nebular/theme/styles/core/functions'; @import '@nebular/theme/styles/core/functions';
@import '~@nebular/theme/styles/core/mixins'; @import '@nebular/theme/styles/core/mixins';
$theme: ( $theme: (
color-primary-100: #fff2f7, color-primary-100: #fff2f7,

4
src/app/@theme/styles/material/_material-light.scss
View file

@ -4,8 +4,8 @@
* Licensed under the MIT License. See License.txt in the project root for license information. * Licensed under the MIT License. See License.txt in the project root for license information.
*/ */
@import '~@nebular/theme/styles/core/functions'; @import '@nebular/theme/styles/core/functions';
@import '~@nebular/theme/styles/core/mixins'; @import '@nebular/theme/styles/core/mixins';
$theme: ( $theme: (
color-primary-100: #e8cbfe, color-primary-100: #e8cbfe,

4
src/app/pages/forms/form-inputs/form-inputs.component.html
View file

@ -10,7 +10,7 @@
</div> </div>
<input type="password" nbInput fullWidth placeholder="Password"> <input type="password" nbInput fullWidth placeholder="Password">
<input type="text" nbInput fullWidth shape="rectangle" placeholder="Rectangle border"> <input type="text" nbInput fullWidth shape="rectangle" placeholder="Rectangle border">
<ng-container *ngIf="!(materialTheme$ | async)"> <ng-container *ngIf="(materialTheme$ | async) !== true">
<input type="text" nbInput fullWidth shape="semi-round" placeholder="Semi-round border"> <input type="text" nbInput fullWidth shape="semi-round" placeholder="Semi-round border">
<input type="text" nbInput fullWidth shape="round" placeholder="Rounded border"> <input type="text" nbInput fullWidth shape="round" placeholder="Rounded border">
</ng-container> </ng-container>
@ -91,4 +91,4 @@
<div class="col-lg-12"> <div class="col-lg-12">
<ngx-material-inputs></ngx-material-inputs> <ngx-material-inputs></ngx-material-inputs>
</div> </div>
</div> </div>