Skip to content

Commit 064c692

Browse files
authored
Merge branch 'main' into lmendoza/PD-3822-qa
2 parents 3463350 + 7b34f7b commit 064c692

33 files changed

+530
-30
lines changed

.postcssrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{ "plugins": { "@tailwindcss/postcss": {} } }

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ dist
55
.vscode/*
66
.angular/*
77
.github/*
8+
src/assets/css/tailwind.css

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## v2.127.0 - 2025-12-17
2+
3+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.126.11...v2.127.0)
4+
5+
## v2.126.11 - 2025-12-17
6+
7+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.126.10...v2.126.11)
8+
9+
- [#2695](https://github.com/ORCID/orcid-angular/pull/2695): Transifex: update properties
10+
111
## v2.126.10 - 2025-12-15
212

313
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.126.9...v2.126.10)

angular.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,11 @@
127127
}
128128
],
129129
"styles": [
130+
{
131+
"input": "src/assets/css/tailwind.css",
132+
"bundleName": "tailwind",
133+
"inject": true
134+
},
130135
"src/assets/scss/noto-sans.scss",
131136
"src/assets/scss/material.scss",
132137
"projects/orcid-tokens/tokens.css",

package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,10 @@
5656
"@angular/router": "^20.1.6",
5757
"@angular/service-worker": "^20.1.6",
5858
"@orcid/bibtex-parse-js": "0.0.25",
59+
"@tailwindcss/postcss": "^4.1.18",
60+
"bowser": "^2.11.0",
5961
"browserslist": "^4.28.0",
6062
"browserslist-useragent-regexp": "^4.1.3",
61-
"bowser": "^2.11.0",
6263
"core-js": "^3.6.5",
6364
"del": "^6.0.0",
6465
"gulp-clean": "^0.4.0",
@@ -67,9 +68,11 @@
6768
"karma-jasmine-html-reporter": "^1.7.0",
6869
"lodash": "^4.17.20",
6970
"ngx-cookie-service": "^20",
71+
"postcss": "^8.5.6",
7072
"properties-to-json": "^0.1.4",
7173
"rxjs": "~7.8.0",
7274
"stream": "0.0.2",
75+
"tailwindcss": "^4.1.18",
7376
"timers": "^0.1.1",
7477
"tslib": "^2.3.0",
7578
"xml2js": "^0.5.0",
@@ -110,4 +113,4 @@
110113
"typescript": "~5.8.3",
111114
"update-browserslist-db": "^1.1.3"
112115
}
113-
}
116+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ <h1 class="mat-headline-4 modal-title">
4141
</tr>
4242
</table>
4343
</div>
44-
<div class="fixed">
44+
<div class="fixed-container">
4545
<button
4646
mat-button
4747
color="primary"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616
}
1717

18-
.fixed {
18+
.fixed-container {
1919
display: flex;
2020
justify-content: flex-end;
2121
flex-shrink: 0;
@@ -63,7 +63,7 @@ a:hover {
6363

6464
:host.columns-8,
6565
:host.columns-4 {
66-
.fixed {
66+
.fixed-container {
6767
flex-direction: column;
6868
}
6969
}

src/app/home/components/news/news.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ <h1 i18n="@@home.latest_news" class="mat-headline-4" id="latest-news">
4141
{{ new.title }}
4242
</p>
4343
<button
44-
class="col l-auto m-auto s-auto space-around"
44+
class="col l-auto w-auto s-auto space-around"
4545
mat-raised-button
4646
(click)="navigate(new.link)"
4747
color="primary"

src/app/inbox/components/notification/notification.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<button
2626
mat-icon-button
2727
(click)="archive(); $event.stopPropagation()"
28-
[ngClass]="{ hidden: archived }"
28+
[ngClass]="{ hide: archived }"
2929
[attr.aria-label]="ariaLabelArchived"
3030
[matTooltip]="ariaLabelArchived"
3131
>

src/app/inbox/components/notification/notification.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ button[mat-icon-button] {
113113
flex-shrink: 0;
114114
}
115115

116-
.hidden {
116+
.hide {
117117
visibility: hidden;
118118
}
119119

0 commit comments

Comments
 (0)