Skip to content

Commit f017ba6

Browse files
lyubov-voloshkolyubov-voloshko
authored
Merge pull request #1566 from rocket-admin/feat/migrate-material-icons-to-symbols
feat: migrate from Material Icons to Material Symbols
2 parents 1cb2ddb + dbc3524 commit f017ba6

31 files changed

Lines changed: 820 additions & 804 deletions

‎frontend/angular.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,14 @@
2929
"output": "./assets/monaco"
3030
}
3131
],
32-
"styles": ["src/custom-theme.scss", "src/styles.scss"],
32+
"styles": [
33+
"node_modules/@fontsource/noto-sans/300.css",
34+
"node_modules/@fontsource/noto-sans/400.css",
35+
"node_modules/@fontsource/noto-sans/500.css",
36+
"node_modules/@material-symbols/font-400/outlined.css",
37+
"src/custom-theme.scss",
38+
"src/styles.scss"
39+
],
3340
"stylePreprocessorOptions": {
3441
"includePaths": ["node_modules/@brumeilde/ngx-theme/presets/material"]
3542
},

‎frontend/package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
"@angular/platform-browser-dynamic": "~20.3.16",
2727
"@angular/router": "~20.3.16",
2828
"@brumeilde/ngx-theme": "^1.2.1",
29+
"@fontsource/noto-sans": "^5.2.10",
2930
"@jsonurl/jsonurl": "^1.1.8",
31+
"@material-symbols/font-400": "^0.40.2",
3032
"@ngstack/code-editor": "^9.0.0",
3133
"@sentry-internal/rrweb": "^2.31.0",
3234
"@sentry/angular": "^10.33.0",

‎frontend/src/app/app.component.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949
<div matListItemTitle>Zapier</div>
5050
</a>
5151
<a mat-list-item href="https://docs.rocketadmin.com/" target="_blank">
52-
<mat-icon matListItemIcon class="connection-navigation__icon" fontSet="material-icons-outlined">help_outlined</mat-icon>
52+
<mat-icon matListItemIcon class="connection-navigation__icon" fontSet="material-symbols-outlined">help</mat-icon>
5353
<div matListItemTitle>Help center</div>
5454
</a>
5555
<mat-list-item (click)="logOut()" data-testid="logout-button-account-menu">
56-
<mat-icon matListItemIcon class="connection-navigation__icon">exit_to_app</mat-icon>
56+
<mat-icon matListItemIcon class="connection-navigation__icon">logout</mat-icon>
5757
<div matListItemTitle>Log out</div>
5858
</mat-list-item>
5959
</mat-nav-list>
@@ -195,11 +195,11 @@
195195
<span>Zapier</span>
196196
</a>
197197
<a mat-menu-item href="https://docs.rocketadmin.com/" target="_blank">
198-
<mat-icon fontSet="material-icons-outlined">help_outlined</mat-icon>
198+
<mat-icon fontSet="material-symbols-outlined">help</mat-icon>
199199
<span>Help center</span>
200200
</a>
201201
<button mat-menu-item (click)="logOut()" data-testid="logout-button-account-menu">
202-
<mat-icon>exit_to_app</mat-icon>
202+
<mat-icon>logout</mat-icon>
203203
<span>Log out</span>
204204
</button>
205205
</mat-menu>

‎frontend/src/app/components/company/company.component.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ <h2 class="heading-2 tableHeader__heading">Members <span *ngIf="currentPlan ===
8080
[disabled]="currentPlan === 'free' && usersCount >= 3 && isSaas">
8181
Invite member
8282
<mat-icon *ngIf="currentPlan === 'free' && usersCount >= 3 && isSaas">
83-
info_outline
83+
info
8484
</mat-icon>
8585
</button>
8686
</div>
@@ -101,7 +101,7 @@ <h2 class="heading-2 tableHeader__heading">Members <span *ngIf="currentPlan ===
101101
<mat-icon *ngIf="element.externalRegistrationProvider === null"
102102
class="company-member-cell_email-icon"
103103
matTooltip="Email registration">
104-
mail_outline
104+
mail
105105
</mat-icon>
106106
<mat-icon *ngIf="element.externalRegistrationProvider !== null"
107107
class="company-member-cell_email-icon"
@@ -236,8 +236,8 @@ <h2 class="heading-2 tableHeader__heading">Members <span *ngIf="currentPlan ===
236236
<td mat-cell *matCellDef="let element; let i = index"
237237
data-label="Access"
238238
class="company-member-cell company-member-cell_content-center">
239-
<mat-icon *ngIf="element.has_groups" class="company-member-cell_accessed" fontSet="material-icons-outlined">check_circle</mat-icon>
240-
<mat-icon *ngIf="!element.has_groups" class="company-member-cell_not-accessed" fontSet="material-icons-outlined">cancel</mat-icon>
239+
<mat-icon *ngIf="element.has_groups" class="company-member-cell_accessed" fontSet="material-symbols-outlined">check_circle</mat-icon>
240+
<mat-icon *ngIf="!element.has_groups" class="company-member-cell_not-accessed" fontSet="material-symbols-outlined">cancel</mat-icon>
241241
</td>
242242
</ng-container>
243243

@@ -324,7 +324,7 @@ <h2 class="heading-2 tableHeader__heading">Branding</h2>
324324
<form #uploadLogoForm="ngForm" class="upload-logo-form">
325325
<div class="file-uploader-appearance">
326326
<button mat-stroked-button type="button" (click)="logoInput.click()">
327-
<mat-icon fontSet="material-icons-outlined">upload</mat-icon>
327+
<mat-icon fontSet="material-symbols-outlined">upload</mat-icon>
328328
Company logo
329329
</button>
330330
<input #logoInput type="file" class="file-input" name="company-logo-uploader" (change)="onCompanyLogoSelected($event)" hidden>
@@ -338,7 +338,7 @@ <h2 class="heading-2 tableHeader__heading">Branding</h2>
338338
<form #uploadFaviconForm="ngForm" class="upload-logo-form">
339339
<div class="file-uploader-appearance">
340340
<button mat-stroked-button type="button" (click)="faviconInput.click()">
341-
<mat-icon fontSet="material-icons-outlined">upload</mat-icon>
341+
<mat-icon fontSet="material-symbols-outlined">upload</mat-icon>
342342
Favicon
343343
</button>
344344
<input #faviconInput type="file" class="file-input" name="company-favicon-uploader" (change)="onFaviconSelected($event)" hidden>

‎frontend/src/app/components/dashboard/db-table-view/db-table-row-view/db-table-row-view.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h2 class="mat-heading-2 row-preview-sidebar__title">Preview</h2>
1515
[queryParams]="getDedicatedPageLinkParams()"
1616
matTooltip="Open the record"
1717
(click)="stashUrlParams()">
18-
<mat-icon fontSet="material-icons-outlined">create</mat-icon>
18+
<mat-icon fontSet="material-symbols-outlined">create</mat-icon>
1919
</a>
2020
</div>
2121
<button mat-icon-button (click)="handleClose()">

‎frontend/src/app/components/dashboard/db-table-view/db-table-view.component.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ <h2 class="mat-h2 table-name">{{ displayName }}</h2>
9696
<button *ngIf="tableData.displayedColumns && tableData.columns" mat-button [matMenuTriggerFor]="menu"
9797
angulartics2On="click"
9898
angularticsAction="Dashboard: columns multiselect is clicked">
99-
<mat-icon fontSet="material-icons-outlined">view_week</mat-icon>
99+
<mat-icon fontSet="material-symbols-outlined">view_week</mat-icon>
100100
Columns
101101
<span class="db-table-manage-columns-button__count">
102102
({{ tableData.displayedDataColumns.length }}
@@ -334,7 +334,7 @@ <h2 class="mat-h2 table-name">{{ displayName }}</h2>
334334
class="db-table-cell-action-button"
335335
[matTooltip]="action.title"
336336
(click)="handleAction($event, action, element)">
337-
<mat-icon fontSet="material-icons-outlined">
337+
<mat-icon fontSet="material-symbols-outlined">
338338
{{action.icon}}
339339
</mat-icon>
340340
</button>
@@ -350,7 +350,7 @@ <h2 class="mat-h2 table-name">{{ displayName }}</h2>
350350
angularticsAction="Dashboard: edit row is clicked"
351351
matTooltip="Edit row"
352352
(click)="stashUrlParams()">
353-
<mat-icon fontSet="material-icons-outlined">create</mat-icon>
353+
<mat-icon fontSet="material-symbols-outlined">create</mat-icon>
354354
</a>
355355
<a mat-icon-button *ngIf="tableData.permissions.add"
356356
routerLink="/dashboard/{{connectionID}}/{{name}}/entry"
@@ -363,7 +363,7 @@ <h2 class="mat-h2 table-name">{{ displayName }}</h2>
363363
angularticsAction="Dashboard: duplicate row is clicked"
364364
matTooltip="Duplicate row"
365365
(click)="stashUrlParams()">
366-
<mat-icon fontSet="material-icons-outlined">difference</mat-icon>
366+
<mat-icon fontSet="material-symbols-outlined">difference</mat-icon>
367367
</a>
368368
<button type="button" mat-icon-button *ngIf="tableData.permissions.delete && tableData.canDelete"
369369
class="db-table-cell-action-button"
@@ -372,7 +372,7 @@ <h2 class="mat-h2 table-name">{{ displayName }}</h2>
372372
angularticsAction="Dashboard: delete row is clicked"
373373
matTooltip="Delete row"
374374
(click)="handleDeleteRow($event, element)">
375-
<mat-icon fontSet="material-icons-outlined">delete</mat-icon>
375+
<mat-icon fontSet="material-symbols-outlined">delete</mat-icon>
376376
</button>
377377
</mat-cell>
378378
</ng-container>

‎frontend/src/app/components/dashboard/db-table-view/db-table-widgets/widget/widget.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,5 @@
5555
<button mat-icon-button type="button" class="widget-delete-button"
5656
matTooltip="Delete widget"
5757
(click)="onWidgetDelete.emit(widget.field_name)">
58-
<mat-icon>delete_outline</mat-icon>
58+
<mat-icon>delete</mat-icon>
5959
</button>

‎frontend/src/app/components/dashboard/db-table-view/saved-filters-panel/saved-filters-panel.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@
4040
</mat-chip-listbox>
4141
<mat-menu #filterMenu="matMenu">
4242
<button mat-menu-item (click)="handleEditFilter(currentFilterForMenu)">
43-
<mat-icon fontSet="material-icons-outlined">create</mat-icon>
43+
<mat-icon fontSet="material-symbols-outlined">create</mat-icon>
4444
<span>Edit</span>
4545
</button>
4646
<button mat-menu-item (click)="handleDeleteFilter(currentFilterForMenu)">
47-
<mat-icon fontSet="material-icons-outlined">delete</mat-icon>
47+
<mat-icon fontSet="material-symbols-outlined">delete</mat-icon>
4848
<span>Delete</span>
4949
</button>
5050
</mat-menu>

0 commit comments

Comments
 (0)