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 e1708d2f4a
commit 6d3c1c35bc
7 changed files with 252 additions and 534 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"
}
],
"stylePreprocessorOptions": {
"includePaths": [
"node_modules"
]
},
"styles": [
"node_modules/bootstrap/dist/css/bootstrap.css",
"node_modules/typeface-exo/index.css",

763
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

4
package.json
View file

@ -31,13 +31,13 @@
},
"dependencies": {
"@angular/animations": "^13.3.12",
"@angular/cdk": "12.1.0",
"@angular/cdk": "13.3.9",
"@angular/common": "^13.3.12",
"@angular/compiler": "^13.3.12",
"@angular/core": "^13.3.12",
"@angular/forms": "^13.3.12",
"@angular/google-maps": "^12.2.13",
"@angular/material": "^12.1.0",
"@angular/material": "^13.3.9",
"@angular/platform-browser": "^13.3.12",
"@angular/platform-browser-dynamic": "^13.3.12",
"@angular/router": "^13.3.12",

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() {
@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.
*/
@import '~@nebular/theme/styles/core/functions';
@import '~@nebular/theme/styles/core/mixins';
@import '@nebular/theme/styles/core/functions';
@import '@nebular/theme/styles/core/mixins';
$theme: (
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.
*/
@import '~@nebular/theme/styles/core/functions';
@import '~@nebular/theme/styles/core/mixins';
@import '@nebular/theme/styles/core/functions';
@import '@nebular/theme/styles/core/mixins';
$theme: (
color-primary-100: #e8cbfe,

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

@ -10,7 +10,7 @@
</div>
<input type="password" nbInput fullWidth placeholder="Password">
<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="round" placeholder="Rounded border">
</ng-container>