diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 214051c99..58b91609d 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -47,7 +47,7 @@ import { LogoComponent } from './logo/logo.component'; import { CompositeRouteGuard } from './utils/composite-route.guard'; import { AppStateGuard } from './state/app-state.guard'; import { SimpleDoughnutChartComponent } from './components/simple-doughnut-chart/simple-doughnut-chart.component'; -import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MAT_CHECKBOX_CLICK_ACTION, MatCheckboxModule } from '@angular/material/checkbox'; import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { AnnotationIconComponent } from './components/annotation-icon/annotation-icon.component'; import { AuthGuard } from './auth/auth.guard'; @@ -253,7 +253,8 @@ export function HttpLoaderFactory(httpClient: HttpClient) { multi: true, useFactory: languageInitializer, deps: [LanguageService] - } + }, + { provide: MAT_CHECKBOX_CLICK_ACTION, useValue: 'noop' } ], bootstrap: [AppComponent] }) diff --git a/apps/red-ui/src/app/common/file-actions/file-actions.component.html b/apps/red-ui/src/app/common/file-actions/file-actions.component.html index 2e7c7a797..1cca30fb9 100644 --- a/apps/red-ui/src/app/common/file-actions/file-actions.component.html +++ b/apps/red-ui/src/app/common/file-actions/file-actions.component.html @@ -46,7 +46,7 @@ *ngIf="permissionsService.canAssignReviewer(fileStatus)" [tooltipPosition]="tooltipPosition" [tooltip]="permissionsService.isManagerAndOwner() ? 'project-overview.assign' : 'project-overview.assign-me'" - [icon]="permissionsService.isManagerAndOwner() ? 'red:assign' : 'red-assign-me'" + [icon]="permissionsService.isManagerAndOwner() ? 'red:assign' : 'red:assign-me'" [type]="buttonType" > diff --git a/apps/red-ui/src/app/common/filter/filter.component.html b/apps/red-ui/src/app/common/filter/filter.component.html index 960ef0382..6c3d07c01 100644 --- a/apps/red-ui/src/app/common/filter/filter.component.html +++ b/apps/red-ui/src/app/common/filter/filter.component.html @@ -25,8 +25,7 @@ @@ -37,8 +36,7 @@
diff --git a/apps/red-ui/src/app/common/filter/filter.component.scss b/apps/red-ui/src/app/common/filter/filter.component.scss index 529547668..159c5b65d 100644 --- a/apps/red-ui/src/app/common/filter/filter.component.scss +++ b/apps/red-ui/src/app/common/filter/filter.component.scss @@ -3,7 +3,7 @@ .filter-menu-header { display: flex; justify-content: space-between; - padding: 7px 15px 15px; + padding: 8px 16px 16px 16px; width: 350px; .actions { diff --git a/apps/red-ui/src/app/common/filter/filter.component.ts b/apps/red-ui/src/app/common/filter/filter.component.ts index ed8062031..16b01844c 100644 --- a/apps/red-ui/src/app/common/filter/filter.component.ts +++ b/apps/red-ui/src/app/common/filter/filter.component.ts @@ -29,6 +29,9 @@ export class FilterComponent { if (parent) { handleCheckedValue(parent); } else { + if (filter.indeterminate) { + filter.checked = false; + } filter.indeterminate = false; filter.filters?.forEach((f) => (f.checked = filter.checked)); } diff --git a/apps/red-ui/src/app/components/table-col-name/table-col-name.component.html b/apps/red-ui/src/app/components/table-col-name/table-col-name.component.html index b4807f83a..4c9ece356 100644 --- a/apps/red-ui/src/app/components/table-col-name/table-col-name.component.html +++ b/apps/red-ui/src/app/components/table-col-name/table-col-name.component.html @@ -1,7 +1,7 @@
- -
- - + +
+ +
diff --git a/apps/red-ui/src/app/components/table-col-name/table-col-name.component.scss b/apps/red-ui/src/app/components/table-col-name/table-col-name.component.scss index 24380c470..9d530967d 100644 --- a/apps/red-ui/src/app/components/table-col-name/table-col-name.component.scss +++ b/apps/red-ui/src/app/components/table-col-name/table-col-name.component.scss @@ -3,21 +3,37 @@ :host { display: flex; border-bottom: 1px solid $separator; + height: 30px; > div { align-items: center; - text-transform: uppercase; display: flex; - font-weight: 600; + width: 100%; + line-height: 11px; gap: 8px; - padding: 8px 24px; + padding: 0 24px; + } + + .flex-end { + min-width: 58px; } .sort-arrows-container { + display: none; + color: $primary; mat-icon { - display: block; + height: 14px; width: 6px; - height: 11px; } } + + &:hover { + .sort-arrows-container { + display: initial; + } + } + + .sort-arrows-container.force-display { + display: initial; + } } diff --git a/apps/red-ui/src/app/components/table-col-name/table-col-name.component.ts b/apps/red-ui/src/app/components/table-col-name/table-col-name.component.ts index 915491e58..52e8a9b52 100644 --- a/apps/red-ui/src/app/components/table-col-name/table-col-name.component.ts +++ b/apps/red-ui/src/app/components/table-col-name/table-col-name.component.ts @@ -17,10 +17,4 @@ export class TableColNameComponent implements OnInit { constructor() {} ngOnInit(): void {} - - public get arrowColor(): { up: string; down: string } { - const up = this.activeSortingOption.order === 'desc' && this.activeSortingOption.column === this.column ? 'primary' : 'accent'; - const down = this.activeSortingOption.order === 'asc' && this.activeSortingOption.column === this.column ? 'primary' : 'accent'; - return { up, down }; - } } 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 9cc053663..34c47dbcd 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 @@ -2,28 +2,28 @@ @@ -169,7 +174,7 @@
- + diff --git a/apps/red-ui/src/app/screens/file/page-indicator/page-indicator.component.scss b/apps/red-ui/src/app/screens/file/page-indicator/page-indicator.component.scss index 0be88c00d..61792a685 100644 --- a/apps/red-ui/src/app/screens/file/page-indicator/page-indicator.component.scss +++ b/apps/red-ui/src/app/screens/file/page-indicator/page-indicator.component.scss @@ -5,14 +5,14 @@ position: relative; padding: 12px; cursor: pointer; - border-left: 1px solid transparent; + border-left: 2px solid transparent; &:hover { - background-color: $grey-6; + background-color: $grey-2; } &.active { - border-left: 1px solid $red-1; + border-left: 2px solid $red-1; } mat-icon { @@ -28,12 +28,17 @@ display: flex; justify-content: center; align-items: center; - font-size: 14px; + font-size: 11px; + line-height: 11px; position: absolute; background: transparent; } &.read { color: $grey-5; + + .text { + color: $grey-1; + } } } diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index a47ff28c4..9ab765545 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -245,7 +245,8 @@ "reviewer": "Assigned to", "unassigned": "Unassigned", "assign-reviewer": "Assign Reviewer", - "assign-me": "Assign to me" + "assign-me": "Assign to me", + "last-reviewer": "Last Reviewed by:" }, "annotation-actions": { "message": { diff --git a/apps/red-ui/src/assets/icons/general/arrow-right.svg b/apps/red-ui/src/assets/icons/general/arrow-right.svg index c6aecfcd4..507e88575 100644 --- a/apps/red-ui/src/assets/icons/general/arrow-right.svg +++ b/apps/red-ui/src/assets/icons/general/arrow-right.svg @@ -1,3 +1,7 @@ - - - + + + right_expandable + + + + diff --git a/apps/red-ui/src/assets/icons/general/arrow-up.svg b/apps/red-ui/src/assets/icons/general/arrow-up.svg index b4d9d527d..11a03f1f9 100644 --- a/apps/red-ui/src/assets/icons/general/arrow-up.svg +++ b/apps/red-ui/src/assets/icons/general/arrow-up.svg @@ -1,3 +1,7 @@ - - - + + + sort-up + + + + diff --git a/apps/red-ui/src/assets/icons/general/right.svg b/apps/red-ui/src/assets/icons/general/right.svg new file mode 100644 index 000000000..0390cde02 --- /dev/null +++ b/apps/red-ui/src/assets/icons/general/right.svg @@ -0,0 +1,9 @@ + + + right + + + + + + \ No newline at end of file diff --git a/apps/red-ui/src/assets/icons/general/sort-asc.svg b/apps/red-ui/src/assets/icons/general/sort-asc.svg index 9f6c1017a..e4f16d061 100644 --- a/apps/red-ui/src/assets/icons/general/sort-asc.svg +++ b/apps/red-ui/src/assets/icons/general/sort-asc.svg @@ -1,22 +1,10 @@ - - - - - - - - + + + sort-asc + + + + + + diff --git a/apps/red-ui/src/assets/icons/general/sort-desc.svg b/apps/red-ui/src/assets/icons/general/sort-desc.svg index c85082534..979017696 100644 --- a/apps/red-ui/src/assets/icons/general/sort-desc.svg +++ b/apps/red-ui/src/assets/icons/general/sort-desc.svg @@ -1,25 +1,10 @@ - - - - - - - - + + + sort-desc + + + + + + diff --git a/apps/red-ui/src/assets/styles/red-checkbox.scss b/apps/red-ui/src/assets/styles/red-checkbox.scss index 21457c3ee..4b5f957a0 100644 --- a/apps/red-ui/src/assets/styles/red-checkbox.scss +++ b/apps/red-ui/src/assets/styles/red-checkbox.scss @@ -24,6 +24,6 @@ display: flex; align-items: center; - gap: 4px; + gap: 8px; } } diff --git a/apps/red-ui/src/assets/styles/red-menu.scss b/apps/red-ui/src/assets/styles/red-menu.scss index a08b46ba5..2defa1624 100644 --- a/apps/red-ui/src/assets/styles/red-menu.scss +++ b/apps/red-ui/src/assets/styles/red-menu.scss @@ -5,12 +5,21 @@ box-shadow: 0 2px 6px 0 rgba(40, 50, 65, 0.3); max-width: none !important; min-width: 180px !important; - margin-top: 4px; + margin-top: 10px; + + .mat-menu-content:not(:empty) { + padding-top: 8px; + padding-bottom: 24px; + } .mat-menu-item { font-family: 'Inter', sans-serif; font-size: 13px; color: $accent; + padding: 0 8px; + margin: 0 8px 2px 8px; + border-radius: 4px; + width: -webkit-fill-available; display: flex; align-items: center; @@ -18,18 +27,25 @@ .arrow-wrapper { width: 16px; - margin-right: 8px; text-align: center; mat-icon { - width: 9px; - height: 9px; + width: 16px; + height: 16px; margin: 0; } } &.padding-left { - padding-left: 64px; + padding-left: 56px; + } + + &:last-of-type { + margin-bottom: 0; + } + + &:hover { + background-color: rgba($primary, 0.1); } } }