diff --git a/apps/red-ui/src/app/components/status-bar/status-bar.component.scss b/apps/red-ui/src/app/components/status-bar/status-bar.component.scss index 6e071c74c..8acab4c5a 100644 --- a/apps/red-ui/src/app/components/status-bar/status-bar.component.scss +++ b/apps/red-ui/src/app/components/status-bar/status-bar.component.scss @@ -4,6 +4,7 @@ flex: 1; display: flex; width: 100%; + min-width: 12px; &.small { .rectangle { diff --git a/apps/red-ui/src/app/icons/icons.module.ts b/apps/red-ui/src/app/icons/icons.module.ts index a4567806a..0e45e19d7 100644 --- a/apps/red-ui/src/app/icons/icons.module.ts +++ b/apps/red-ui/src/app/icons/icons.module.ts @@ -1,7 +1,7 @@ -import {NgModule} from '@angular/core'; -import {CommonModule} from '@angular/common'; -import {MatIconModule, MatIconRegistry} from '@angular/material/icon'; -import {DomSanitizer} from '@angular/platform-browser'; +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { MatIconModule, MatIconRegistry } from '@angular/material/icon'; +import { DomSanitizer } from '@angular/platform-browser'; @NgModule({ imports: [CommonModule, MatIconModule], @@ -13,145 +13,23 @@ export class IconsModule { private iconRegistry: MatIconRegistry, private sanitizer: DomSanitizer ) { - iconRegistry.addSvgIconInNamespace( - 'red', - 'calendar', - sanitizer.bypassSecurityTrustResourceUrl('/assets/icons/general/calendar.svg') - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'files', - sanitizer.bypassSecurityTrustResourceUrl('/assets/icons/general/files.svg') - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'user', - sanitizer.bypassSecurityTrustResourceUrl('/assets/icons/general/user.svg') - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'stats', - sanitizer.bypassSecurityTrustResourceUrl('/assets/icons/general/stats.svg') - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'drop-down', - sanitizer.bypassSecurityTrustResourceUrl('/assets/icons/general/drop-down-arrow.svg') - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'plus', - sanitizer.bypassSecurityTrustResourceUrl('/assets/icons/general/plus_icon.svg') - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'close', - sanitizer.bypassSecurityTrustResourceUrl('/assets/icons/general/close_icon.svg') - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'edit', - sanitizer.bypassSecurityTrustResourceUrl('/assets/icons/general/edit_icon.svg') - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'delete', - sanitizer.bypassSecurityTrustResourceUrl('/assets/icons/general/trash_icon.svg') - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'logout', - sanitizer.bypassSecurityTrustResourceUrl('/assets/icons/general/logout_icon.svg') - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'preview', - sanitizer.bypassSecurityTrustResourceUrl('/assets/icons/general/preview_icon.svg') - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'sort-asc', - sanitizer.bypassSecurityTrustResourceUrl('/assets/icons/general/sort-ascending.svg') - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'sort-desc', - sanitizer.bypassSecurityTrustResourceUrl('/assets/icons/general/sort-descending.svg') - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'menu', - sanitizer.bypassSecurityTrustResourceUrl('/assets/icons/general/menu.svg') - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'chevron-right', - sanitizer.bypassSecurityTrustResourceUrl('/assets/icons/general/double-chevron-right.svg') - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'info', - sanitizer.bypassSecurityTrustResourceUrl('/assets/icons/general/info.svg') - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'refresh', - sanitizer.bypassSecurityTrustResourceUrl('/assets/icons/general/refresh.svg') - ); - - iconRegistry.addSvgIconInNamespace( - 'red', - 'arrow-down', - sanitizer.bypassSecurityTrustResourceUrl('/assets/icons/general/arrow_down.svg') - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'arrow-up', - sanitizer.bypassSecurityTrustResourceUrl('/assets/icons/general/arrow_up.svg') - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'error', - sanitizer.bypassSecurityTrustResourceUrl( - '/assets/icons/general/error_icon.svg' - ) - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'check', - sanitizer.bypassSecurityTrustResourceUrl( - '/assets/icons/general/check_icon.svg' - ) - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'idea', - sanitizer.bypassSecurityTrustResourceUrl( - '/assets/icons/general/idea.svg' - ) - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'secret', - sanitizer.bypassSecurityTrustResourceUrl( - '/assets/icons/general/secret.svg' - ) - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'pages', - sanitizer.bypassSecurityTrustResourceUrl( - '/assets/icons/general/pages.svg' - ) - ); - iconRegistry.addSvgIconInNamespace( - 'red', - 'bar-chart', - sanitizer.bypassSecurityTrustResourceUrl( - '/assets/icons/general/bar_chart.svg' - ) - ); + const icons = [ + 'add', 'analyse', 'arrow-down', 'arrow-up', 'assign', 'calendar', 'check', + 'close', 'document', 'double-chevron-right', 'download', 'drop-down-arrow', + 'edit', 'error', 'folder', 'info', 'lightning', 'logout', 'menu', 'pages', + 'plus', 'preview', 'refresh', 'report', 'secret', 'sort-asc', 'sort-desc', + 'status', 'trash', 'user' + ]; + for (const icon of icons) { + iconRegistry.addSvgIconInNamespace( + 'red', + icon, + sanitizer.bypassSecurityTrustResourceUrl( + `/assets/icons/general/${icon}.svg` + ) + ); + } } diff --git a/apps/red-ui/src/app/screens/base-screen/base-screen.component.html b/apps/red-ui/src/app/screens/base-screen/base-screen.component.html index 457ccdc1c..4ee93847d 100644 --- a/apps/red-ui/src/app/screens/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/screens/base-screen/base-screen.component.html @@ -20,14 +20,14 @@ {{appStateService.activeProject.project.projectName}} @@ -43,7 +43,7 @@
{{user?.name}} - +
diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html index 6c014418b..b5a729533 100644 --- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html +++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html @@ -118,7 +118,7 @@
@@ -145,7 +145,7 @@ {{appStateService.activeFile.numberOfPages}}
- + {{annotations.length}}
diff --git a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html index 91cb48dd9..62c49abe6 100644 --- a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html +++ b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html @@ -1,11 +1,24 @@
- + {{documentCount(pw)}}
@@ -67,18 +80,22 @@ >
-
-
- - - -
+
+ + + + + +
@@ -93,7 +110,7 @@
- +
{{totalPages}}
diff --git a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.scss b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.scss index eb738bf55..d542b2092 100644 --- a/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.scss +++ b/apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.scss @@ -1,13 +1,5 @@ @import "../../../assets/styles/red-mixins"; -.stats-subtitle { - margin-top: 6px; -} - -.stats-bar { - width: 160px; -} - .add-project-btn { mat-icon { width: 14px; @@ -16,6 +8,23 @@ } } +.left-container { + width: calc(100vw - #{$right-container-width} - 130px); + + .table-item:hover { + .stats-bar { + display: none; + } + } + + .stats-subtitle { + margin-top: 6px; + } + + .stats-bar, .action-buttons { + width: 160px; + } +} .right-fixed-container { display: flex; @@ -31,7 +40,7 @@ .project-stats-container { width: fit-content; - + .project-stats-item { display: flex; width: fit-content; @@ -44,13 +53,8 @@ mat-icon { height: 16px; - width: 16px; margin-top: 2px; } } } } - -.left-container { - width: calc(100vw - #{$right-container-width} - 130px); -} diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html index 762f2c0e9..3797dd911 100644 --- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html +++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html @@ -2,14 +2,27 @@ [innerHTML]="'project-overview.no-project.label' | translate:{projectId: projectId}" class="heading-l">
-