diff --git a/src/app/components/navigation/navbar/navbar.component.scss b/src/app/components/navigation/navbar/navbar.component.scss index 8d7998e2..b45ae0c8 100644 --- a/src/app/components/navigation/navbar/navbar.component.scss +++ b/src/app/components/navigation/navbar/navbar.component.scss @@ -138,7 +138,7 @@ img.account-image { justify-content: center; align-items: center; //background-color: green !important; - font-size: 16px; + font-size: 14px; width: 40px !important; height: 40px !important; vertical-align: middle; diff --git a/src/app/components/selection/selection-tab/selection-tab.component.html b/src/app/components/selection/selection-tab/selection-tab.component.html index b1bd0f12..dc8d21ff 100644 --- a/src/app/components/selection/selection-tab/selection-tab.component.html +++ b/src/app/components/selection/selection-tab/selection-tab.component.html @@ -1,7 +1,7 @@ @if (selectionService.isSelectionMode()) {

{{ selectionService.selectedElements().length }} {{ 'selected' | translate }} diff --git a/src/app/components/selection/selection-tab/selection-tab.component.scss b/src/app/components/selection/selection-tab/selection-tab.component.scss index acbbc532..a8321f6c 100644 --- a/src/app/components/selection/selection-tab/selection-tab.component.scss +++ b/src/app/components/selection/selection-tab/selection-tab.component.scss @@ -29,6 +29,8 @@ mat-icon { font-size: 24px; + width: 24px; + height: 24px; text-align: center; } } @@ -52,12 +54,6 @@ font-weight: 400; border-radius: 25px; letter-spacing: normal; - - .mat-icon { - font-size: 24px; - width: 24px; - height: 24px; - } } .disabled { diff --git a/src/app/components/upload/upload.component.html b/src/app/components/upload/upload.component.html index 8dd73a7f..83f74913 100644 --- a/src/app/components/upload/upload.component.html +++ b/src/app/components/upload/upload.component.html @@ -19,13 +19,13 @@

{{ 'Please consider switching to a different browser!' | translate }}

>{{ 'Also supported' | translate }}: - expand_more + expand_more
- language + language {{ '3D objects' | translate }}
.glb @@ -150,7 +150,7 @@

{{ 'Please consider switching to a different browser!' | translate }}

>warning } @else if (item.checksum) { - draft + draft } @else { } @@ -239,7 +239,7 @@

{{ 'Maximum file size exceeded' | translate }}

(click)="fileRef.click()" [matTooltip]="'Select one or multiple files' | translate" > - description + description {{ 'Select file(s)' | translate }} @@ -257,7 +257,7 @@

{{ 'Maximum file size exceeded' | translate }}

(click)="fileInput.click()" [matTooltip]="'If your 3D object includes folders, choose this option' | translate" > - folder + folder {{ 'Select folder' | translate }}
diff --git a/src/app/components/upload/upload.component.scss b/src/app/components/upload/upload.component.scss index f076dc04..1d116e25 100644 --- a/src/app/components/upload/upload.component.scss +++ b/src/app/components/upload/upload.component.scss @@ -141,7 +141,7 @@ div.queue-item-list { } button { - font-size: 16px; + font-size: 14px; font-weight: 400; border-radius: 25px; letter-spacing: normal; diff --git a/src/app/pages/explore/explore-filter-sidenav/explore-filter-sidenav.component.html b/src/app/pages/explore/explore-filter-sidenav/explore-filter-sidenav.component.html index b7f94e3b..58060f89 100644 --- a/src/app/pages/explore/explore-filter-sidenav/explore-filter-sidenav.component.html +++ b/src/app/pages/explore/explore-filter-sidenav/explore-filter-sidenav.component.html @@ -71,7 +71,7 @@ style="align-self: flex-start" (click)="closeSidenav()" > - arrow_forward + arrow_forward {{ 'Show results' | translate }} @if (service.resultCount() >= 0) { ({{ service.resultCount() }}) @@ -85,7 +85,7 @@ (click)="clearAllFilterOptions()" [disabled]="numFilterOptions() === 0" > - refresh + refresh {{ 'Clear all' | translate }}
diff --git a/src/app/pages/explore/explore.component.html b/src/app/pages/explore/explore.component.html index 070ecbad..aa8877a0 100644 --- a/src/app/pages/explore/explore.component.html +++ b/src/app/pages/explore/explore.component.html @@ -17,7 +17,10 @@

{{ 'Explore' | translate }}

[disabled]="!isAuthenticated()" (click)="quickAddToCompilation()" > - library_add @@ -28,7 +31,7 @@

{{ 'Explore' | translate }}

color="primary" [matMenuTriggerFor]="getMenuForSelected()" > - more_horiz + more_horiz @@ -56,7 +59,7 @@

{{ 'Explore' | translate }}

[disabled]="!selectionService().singleSelected()" [routerLink]="['/compilation', selectionService().singleSelectedCompilation()?._id]" > - open_run + open_run {{ 'Open' | translate }} @@ -81,7 +84,7 @@

{{ 'Explore' | translate }}

" (click)="openFilterSidenav()" > - tune + tune @if (numFilterOptions() > 0) { {{ numFilterOptions() }} @@ -156,12 +159,12 @@

{{ 'Explore' | translate }}

(click)="selectObjectId = element._id" (menuClosed)="selectObjectId = ''" > - more_horiz + more_horiz } - open_run + open_run {{ 'Open' | translate }} @if (selectedTab() === 'objects') { @@ -172,7 +175,7 @@

{{ 'Explore' | translate }}

[class.pseudo-disabled]="!isAuthenticated()" [disabled]="!isAuthenticated()" > - library_add + library_add {{ 'Add to collection' | translate }} } @@ -215,9 +218,9 @@

{{ 'Explore' | translate }}

} diff --git a/src/app/pages/profile-page/profile-page-header/profile-page-header.component.html b/src/app/pages/profile-page/profile-page-header/profile-page-header.component.html index d6ca89be..06708c38 100644 --- a/src/app/pages/profile-page/profile-page-header/profile-page-header.component.html +++ b/src/app/pages/profile-page/profile-page-header/profile-page-header.component.html @@ -12,7 +12,7 @@

{{ availableName() }}

diff --git a/src/app/pages/profile-page/profile-page-header/profile-page-header.component.scss b/src/app/pages/profile-page/profile-page-header/profile-page-header.component.scss index d4d3f67d..dd4e4f07 100644 --- a/src/app/pages/profile-page/profile-page-header/profile-page-header.component.scss +++ b/src/app/pages/profile-page/profile-page-header/profile-page-header.component.scss @@ -1,3 +1,5 @@ +@use 'src/assets/fonts/MaterialSymbols/MaterialSymbolsOutlined' as materialSymbols; + .profile-header { display: flex; align-items: center; @@ -51,7 +53,6 @@ .profile-data h1 { margin: 0; - color: var(--brand-color); } @@ -69,8 +70,7 @@ } .text-icon { - width: 1em; - height: 1em; + @include materialSymbols.material-symbols-filled(1em); margin-right: 8px; border-radius: 50%; } diff --git a/src/assets/fonts/MaterialSymbols/MaterialSymbolsOutlined.scss b/src/assets/fonts/MaterialSymbols/MaterialSymbolsOutlined.scss index fa36d7f5..0e17e6cb 100644 --- a/src/assets/fonts/MaterialSymbols/MaterialSymbolsOutlined.scss +++ b/src/assets/fonts/MaterialSymbols/MaterialSymbolsOutlined.scss @@ -12,6 +12,8 @@ font-weight: normal; font-style: normal; font-size: $size; + width: $size; + height: $size; line-height: 1; letter-spacing: normal; text-transform: none; @@ -27,8 +29,8 @@ 'opsz' 48; } -.material-symbols-outlined { - @include material-symbols(); +@mixin material-symbols-outlined($size: 24px) { + @include material-symbols($size); font-variation-settings: 'FILL' 0, 'wght' 400, @@ -36,11 +38,19 @@ 'opsz' 48; } -.material-symbols-filled { - @include material-symbols(); +@mixin material-symbols-filled($size: 24px) { + @include material-symbols($size); font-variation-settings: 'FILL' 1, 'wght' 400, 'GRAD' 200, 'opsz' 48; } + +.material-symbols-outlined { + @include material-symbols-outlined(); +} + +.material-symbols-filled { + @include material-symbols-filled(); +}