Skip to content

Commit 863886c

Browse files
committed
fix(project): upgraded angular material to v15
1 parent 4729ebd commit 863886c

File tree

9 files changed

+1687
-56
lines changed

9 files changed

+1687
-56
lines changed

demo/src/material_theme.scss

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,16 @@
55
// Include the common styles for Angular Material. We include this here so that you only
66
// have to load a single css file for Angular Material in your app.
77
// Be sure that you only ever include this mixin once!
8-
@include mat.core();
8+
// TODO(v15): As of v15 mat.legacy-core no longer includes default typography styles.
9+
// The following line adds:
10+
// 1. Default typography styles for all components
11+
// 2. Styles for typography hierarchy classes (e.g. .mat-headline-1)
12+
// If you specify typography styles for the components you use elsewhere, you should delete this line.
13+
// If you don't need the default component typographies but still want the hierarchy styles,
14+
// you can delete this line and instead use:
15+
// `@include mat.legacy-typography-hierarchy(mat.define-legacy-typography-config());`
16+
@include mat.all-legacy-component-typographies();
17+
@include mat.legacy-core();
918

1019
// Define the palettes for your theme using the Material Design palettes available in palette.scss
1120
// (imported above). For each palette, you can optionally specify a default, lighter, and darker
@@ -22,4 +31,4 @@ $candy-app-theme: mat.define-light-theme($candy-app-primary, $candy-app-accent,
2231
// Include theme styles for core and each component used in your app.
2332
// Alternatively, you can import and @include the theme mixins for each component
2433
// that you are using.
25-
@include mat.all-component-themes($candy-app-theme);
34+
@include mat.all-legacy-component-themes($candy-app-theme);

package-lock.json

Lines changed: 1654 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
"dependencies": {
3636
"@angular-material-extensions/pages": "^4.0.0",
3737
"@angular/animations": "^15.0.1",
38-
"@angular/cdk": "^14.2.5",
38+
"@angular/cdk": "^15.0.0",
3939
"@angular/common": "^15.0.1",
4040
"@angular/compiler": "^15.0.1",
4141
"@angular/core": "^15.0.1",
4242
"@angular/flex-layout": "^13.0.0-beta.36",
4343
"@angular/forms": "^15.0.1",
44-
"@angular/material": "^14.2.5",
44+
"@angular/material": "^15.0.0",
4545
"@angular/platform-browser": "^15.0.1",
4646
"@angular/platform-browser-dynamic": "^15.0.1",
4747
"@angular/platform-server": "^15.0.1",

projects/angular-material-extensions/password-strength/src/lib/mat-password-strength.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {CommonModule} from '@angular/common';
22
import {ModuleWithProviders, NgModule} from '@angular/core';
3-
import {MatProgressBarModule} from '@angular/material/progress-bar';
3+
import {MatLegacyProgressBarModule as MatProgressBarModule} from '@angular/material/legacy-progress-bar';
44
import {MatRippleModule} from '@angular/material/core';
5-
import {MatCardModule} from '@angular/material/card';
5+
import {MatLegacyCardModule as MatCardModule} from '@angular/material/legacy-card';
66
import {MatIconModule} from '@angular/material/icon';
77

88
import {MatPassToggleVisibilityComponent, MatPasswordStrengthComponent, MatPasswordStrengthInfoComponent} from './component';

src/app/app.module.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ import {NgModule} from '@angular/core';
44
import {AppRoutingModule} from './app-routing.module';
55
import {AppComponent} from './app.component';
66
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
7-
import {MatCardModule} from '@angular/material/card';
7+
import {MatLegacyCardModule as MatCardModule} from '@angular/material/legacy-card';
88
import {FlexLayoutModule} from '@angular/flex-layout';
99
import {MatToolbarModule} from '@angular/material/toolbar';
1010
import {MatIconModule} from '@angular/material/icon';
11-
import {MatTabsModule} from '@angular/material/tabs';
12-
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
11+
import {MatLegacyTabsModule as MatTabsModule} from '@angular/material/legacy-tabs';
12+
import {MatLegacySlideToggleModule as MatSlideToggleModule} from '@angular/material/legacy-slide-toggle';
1313
import {MatPasswordStrengthModule} from '@angular-material-extensions/password-strength';
14-
import {MatInputModule} from '@angular/material/input';
14+
import {MatLegacyInputModule as MatInputModule} from '@angular/material/legacy-input';
1515
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
16-
import {MatButtonModule} from '@angular/material/button';
16+
import {MatLegacyButtonModule as MatButtonModule} from '@angular/material/legacy-button';
1717
import {MarkdownModule} from 'ngx-markdown';
1818
import {HttpClient, HttpClientModule} from '@angular/common/http';
1919
import {TranslateHttpLoader} from '@ngx-translate/http-loader';

src/app/examples/examples.module.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import {ExamplesRoutingModule} from './examples-routing.module';
55
import {MarkdownModule} from 'ngx-markdown';
66
import {InfoCompExampleComponent} from './info-comp-example/info-comp-example.component';
77
import {TranslateLoader, TranslateModule} from '@ngx-translate/core';
8-
import {MatRadioModule} from '@angular/material/radio';
8+
import {MatLegacyRadioModule as MatRadioModule} from '@angular/material/legacy-radio';
99
import {HttpClient} from '@angular/common/http';
1010
import {createTranslateLoader} from '../app.module';
11-
import {MatCardModule} from '@angular/material/card';
12-
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
13-
import {MatInputModule} from '@angular/material/input';
11+
import {MatLegacyCardModule as MatCardModule} from '@angular/material/legacy-card';
12+
import {MatLegacySlideToggleModule as MatSlideToggleModule} from '@angular/material/legacy-slide-toggle';
13+
import {MatLegacyInputModule as MatInputModule} from '@angular/material/legacy-input';
1414
import {MatPasswordStrengthModule} from '@angular-material-extensions/password-strength';
1515
import {FormsModule} from '@angular/forms';
1616

src/app/examples/info-comp-example/info-comp-example.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Component} from '@angular/core';
22
import {TranslateService} from '@ngx-translate/core';
3-
import {MatRadioChange} from '@angular/material/radio';
3+
import {MatLegacyRadioChange as MatRadioChange} from '@angular/material/legacy-radio';
44

55
@Component({
66
selector: 'app-info-comp-example',

src/app/getting-started/getting-started.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {Component, OnInit, ViewEncapsulation} from '@angular/core';
22
import {Title} from '@angular/platform-browser';
3-
import {MatSlideToggleChange} from '@angular/material/slide-toggle';
4-
import {MatSnackBar} from '@angular/material/snack-bar';
3+
import {MatLegacySlideToggleChange as MatSlideToggleChange} from '@angular/material/legacy-slide-toggle';
4+
import {MatLegacySnackBar as MatSnackBar} from '@angular/material/legacy-snack-bar';
55

66

77
@Component({

src/app/getting-started/getting-started.module.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ import {CommonModule} from '@angular/common';
33
import {GettingStartedComponent} from './getting-started.component';
44
import {GettingStartedRoutingModule} from './getting-started-routing.module';
55
import {ClipboardModule} from 'ngx-clipboard';
6-
import {MatCardModule} from '@angular/material/card';
6+
import {MatLegacyCardModule as MatCardModule} from '@angular/material/legacy-card';
77
import {MatIconModule} from '@angular/material/icon';
88
import {MatPagesModule} from '@angular-material-extensions/pages';
99
import {HIGHLIGHT_OPTIONS, HighlightModule} from 'ngx-highlightjs';
1010
import {MatPasswordStrengthModule} from '@angular-material-extensions/password-strength';
11-
import {MatListModule} from '@angular/material/list';
12-
import {MatSlideToggleModule} from '@angular/material/slide-toggle';
13-
import {MatInputModule} from '@angular/material/input';
11+
import {MatLegacyListModule as MatListModule} from '@angular/material/legacy-list';
12+
import {MatLegacySlideToggleModule as MatSlideToggleModule} from '@angular/material/legacy-slide-toggle';
13+
import {MatLegacyInputModule as MatInputModule} from '@angular/material/legacy-input';
1414
import {FormsModule} from '@angular/forms';
15-
import {MatSnackBarModule} from '@angular/material/snack-bar';
16-
import {MatButtonModule} from '@angular/material/button';
15+
import {MatLegacySnackBarModule as MatSnackBarModule} from '@angular/material/legacy-snack-bar';
16+
import {MatLegacyButtonModule as MatButtonModule} from '@angular/material/legacy-button';
1717

1818

1919
/**

0 commit comments

Comments
 (0)