Skip to content

Commit f1af232

Browse files
Update material mdc migration typography (#2537)
* ng update @angular/material@16 * update-material-mdc-migration-typography * update-material-mdc-migration-typography --------- Co-authored-by: Angel Montenegro <a.montenegro@orcid.org>
1 parent 4751766 commit f1af232

67 files changed

Lines changed: 243 additions & 169 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,18 @@
3434
"lighthouse": "ts-node -P scripts/tsconfig.json scripts/lighthouse/main.ts",
3535
"build:browserslist": "ts-node -P scripts/tsconfig.json scripts/browserlist.prebuild.ts",
3636
"build:fetchCombineWordpressCss": "ts-node -P scripts/tsconfig.json scripts/fetch-combine-wordpress-css.prebuild"
37-
3837
},
3938
"private": true,
4039
"dependencies": {
4140
"@angular-devkit/core": "^16.2.6",
4241
"@angular/animations": "^16.2.8",
43-
"@angular/cdk": "^16.2.8",
42+
"@angular/cdk": "^16.2.14",
4443
"@angular/common": "^16.2.8",
4544
"@angular/compiler": "^16.2.8",
4645
"@angular/core": "^16.2.8",
4746
"@angular/forms": "^16.2.8",
4847
"@angular/localize": "^16.2.8",
49-
"@angular/material": "^16.2.8",
48+
"@angular/material": "^16.2.14",
5049
"@angular/platform-browser": "^16.2.8",
5150
"@angular/platform-browser-dynamic": "^16.2.8",
5251
"@angular/router": "^16.2.8",
@@ -127,4 +126,4 @@
127126
"tslint-config-prettier": "^1.18.0",
128127
"typescript": "~5.1.6"
129128
}
130-
}
129+
}

src/app/account-settings/pages/account-settings/account-settings.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
width: 100%;
55
}
66

7-
.mat-headline {
7+
.mat-headline-5 {
88
margin-bottom: $spacing-large;
99
}
1010
main#main {

src/app/account-trusted-parties/pages/account-trusted-parties/account-trusted-parties.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
width: 100%;
55
}
66

7-
.mat-headline {
7+
.mat-headline-5 {
88
margin-bottom: $spacing-large;
99
}
1010
main#main {

src/app/authorize/components/form-authorize/form-authorize.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ <h1 class="orc-font-heading-small" i18n="@@authorize.authorize">
3636
<div class="col l9 user-wrapper">
3737
<div class="row">
3838
<div class="m-b-8">
39-
<div class="mat-body-2">
39+
<div class="mat-subtitle-2">
4040
<strong id="user-name">{{ userName }}</strong>
4141
</div>
4242
<span>{{ orcidUrl }}</span>
@@ -68,13 +68,13 @@ <h1 class="orc-font-heading-small" i18n="@@authorize.authorize">
6868
></app-info-drop-down>
6969

7070
<p
71-
class="mat-body-1 m-t-16 m-b-16"
71+
class="mat-body-2 m-t-16 m-b-16"
7272
i18n="@@authorize.organizationAskedFollowingAccess"
7373
>
7474
This organization has asked for the following access to your ORCID record:
7575
</p>
7676

77-
<ul class="mat-body-1 m-t-base">
77+
<ul class="mat-body-2 m-t-base">
7878
<ng-container
7979
*ngFor="let scope of this.oauthRequest.scopes; let last = last"
8080
>

src/app/authorize/components/oauth-error/oauth-error.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
</div>
131131
</mat-card-content>
132132

133-
<p class="mat-body-1 mat-caption">
133+
<p class="mat-body-2 mat-caption">
134134
{{ error }} /
135135
{{ errorDescription }}
136136
</p>

src/app/cdk/banner/banner.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<section class="alert alert-banner mat-body-1" [attr.aria-label]="ariaLabel">
1+
<section class="alert alert-banner mat-body-2" [attr.aria-label]="ariaLabel">
22
<p><ng-content></ng-content></p>
33
<button
44
*ngIf="canDismiss"

src/app/cdk/banner/banner.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ button {
1616
flex-shrink: 0;
1717
}
1818

19-
.mat-body-1 p {
19+
.mat-body-2 p {
2020
margin: 0;
2121
}
2222
.columns-12 :host {

src/app/cdk/is-this-you/is-this-you.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="container" *ngIf="data && data.duplicateRecords">
2-
<h1 class="mat-display-1 modal-title">{{ data.titleLabel || titleLabel }}</h1>
2+
<h1 class="mat-headline-4 modal-title">{{ data.titleLabel || titleLabel }}</h1>
33
<div class="non-fixed">
4-
<p class="mat-body-1">
4+
<p class="mat-body-2">
55
{{ data.bodyLabel || bodyLabel }}
66
<a
77
rel="noopener noreferrer"
@@ -12,7 +12,7 @@ <h1 class="mat-display-1 modal-title">{{ data.titleLabel || titleLabel }}</h1>
1212
</a>
1313
</p>
1414

15-
<table class="mat-subheading-2">
15+
<table class="mat-subtitle-1">
1616
<tr>
1717
<th>{{ data.firstNameLabel || firstNameLabel }}</th>
1818
<th>{{ data.lastNameLabel || lastNameLabel }}</th>

src/app/cdk/panel/panel-data-line/panel-data-line.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
<span>{{ title }}</span>
2020
<ng-container *ngIf="detail">&#x200E;({{ detail }})&#x200E;</ng-container>
2121
<p
22-
class="mat-body-1"
22+
class="mat-body-2"
2323
*ngIf="!url && copyOnClick"
2424
appCopyOnClick
2525
matTooltip="Click to Copy"
2626
[matTooltipPosition]="'above'"
2727
>
2828
{{ content }}
2929
</p>
30-
<p class="mat-body-1" *ngIf="!url && !copyOnClick">{{ content }}</p>
30+
<p class="mat-body-2" *ngIf="!url && !copyOnClick">{{ content }}</p>
3131

3232
<a
33-
class="underline mat-body-1"
33+
class="underline mat-body-2"
3434
href="{{ url }}"
3535
target="_blank"
3636
rel="noopener noreferrer"
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
// tslint:disable-next-line: max-line-length
2-
export const BROWSERLIST_REGEXP =
3-
/((CPU[ +]OS|iPhone[ +]OS|CPU[ +]iPhone|CPU IPhone OS)[ +]+(13[_.]4|13[_.]([5-9]|\d{2,})|13[_.]7|13[_.]([8-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})[_.]\d+|14[_.]0|14[_.]([1-9]|\d{2,})|14[_.]4|14[_.]([5-9]|\d{2,})|14[_.]8|14[_.](9|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})[_.]\d+|15[_.]0|15[_.]([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})[_.]\d+|16[_.]0|16[_.]([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})[_.]\d+|17[_.]0|17[_.]([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})[_.]\d+)(?:[_.]\d+)?)|((?:Chrome).*OPR\/(74|(7[5-9]|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Edge\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))(?:\.\d+)?)|((Chromium|Chrome)\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))\.\d+(?:\.\d+)?)|(Version\/(13\.1|13\.([2-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})\.\d+|14\.0|14\.([1-9]|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})\.\d+|15\.0|15\.([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})\.\d+|16\.0|16\.([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})\.\d+|17\.0|17\.([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})\.\d+)(?:\.\d+)? Safari\/)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+(pre|[ab]\d+[a-z]*)?)/
2+
export const BROWSERLIST_REGEXP = /((CPU[ +]OS|iPhone[ +]OS|CPU[ +]iPhone|CPU IPhone OS)[ +]+(13[_.]4|13[_.]([5-9]|\d{2,})|13[_.]7|13[_.]([8-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})[_.]\d+|14[_.]0|14[_.]([1-9]|\d{2,})|14[_.]4|14[_.]([5-9]|\d{2,})|14[_.]8|14[_.](9|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})[_.]\d+|15[_.]0|15[_.]([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})[_.]\d+|16[_.]0|16[_.]([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})[_.]\d+|17[_.]0|17[_.]([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})[_.]\d+)(?:[_.]\d+)?)|((?:Chrome).*OPR\/(74|(7[5-9]|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Edge\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))(?:\.\d+)?)|((Chromium|Chrome)\/(80|(8[1-9]|9\d|\d{3,})|83|(8[4-9]|9\d|\d{3,}))\.\d+(?:\.\d+)?)|(Version\/(13\.1|13\.([2-9]|\d{2,})|(1[4-9]|[2-9]\d|\d{3,})\.\d+|14\.0|14\.([1-9]|\d{2,})|(1[5-9]|[2-9]\d|\d{3,})\.\d+|15\.0|15\.([1-9]|\d{2,})|(1[6-9]|[2-9]\d|\d{3,})\.\d+|16\.0|16\.([1-9]|\d{2,})|(1[7-9]|[2-9]\d|\d{3,})\.\d+|17\.0|17\.([1-9]|\d{2,})|(1[8-9]|[2-9]\d|\d{3,})\.\d+)(?:\.\d+)? Safari\/)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+\.\d+)|(Firefox\/(78|(79|[8-9]\d|\d{3,}))\.\d+(pre|[ab]\d+[a-z]*)?)/

0 commit comments

Comments
 (0)