MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

UI fix button styles on listings, listing filters

This commit is contained in:
mchouliara 2024-10-15 16:08:27 +03:00
parent f718af9b43
commit 55f0c5a68f
46 changed files with 219 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/src/annotation-service/ui/admin/status/listing/filters/status-listing-filters.component.html
View File

@ -1,19 +1,19 @@
<div class="d-flex align-items-center gap-1-rem">
<div class="d-flex align-items-center gap-1-rem listing-filters">
<button mat-flat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<button mat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<mat-icon aria-hidden="false" [matBadgeHidden]="!appliedFilterCount" [matBadge]="appliedFilterCount" matBadgeColor="warn" matBadgeSize="small">filter_alt</mat-icon>
{{'COMMONS.LISTING-COMPONENT.SEARCH-FILTER-BTN' | translate}}
</button>
<mat-menu #filterMenu>
<div class="container-fluid" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="container-fluid filter-container" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="row justify-content-between">
<div class="col-auto mt-2">
<h4>{{'ANNOTATION-SERVICE.STATUS-LISTING.FILTER.TITLE' | translate}}</h4>
</div>
<div class="col-auto">
<button color="accent" mat-button (click)="clearFilters()">
<button color="primary" mat-button (click)="clearFilters()">
{{'COMMONS.LISTING-COMPONENT.CLEAR-ALL-FILTERS' | translate}}
</button>
</div>
@ -42,12 +42,12 @@
<div class="row justify-content-end align-items-center mt-4 mb-1 gap-1-rem">
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary-inverted" (click)="filterMenuTrigger?.closeMenu()">
<button mat-stroked-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger?.closeMenu()">
{{'ANNOTATION-SERVICE.STATUS-LISTING.FILTER.CANCEL' | translate}}
</button>
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
<button mat-flat-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
{{'ANNOTATION-SERVICE.STATUS-LISTING.FILTER.APPLY-FILTERS' | translate}}
</button>
</div>

2
frontend/src/annotation-service/ui/admin/status/listing/status-listing.component.html
View File

@ -7,7 +7,7 @@
<app-navigation-breadcrumb />
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn secondary"
<button mat-flat-button color="accent" class="padded-shadow-btn"
*ngIf="authService.hasPermission(authService.permissionEnum.EditStatus)"
[routerLink]="routerUtils.generateUrl(['/annotation-statuses/new'])">
<mat-icon>add</mat-icon>

12
frontend/src/app/ui/admin/description-status/listing/description-status-listing-filters/description-status-listing-filters.component.html
View File

@ -1,19 +1,19 @@
<div class="d-flex align-items-center gap-1-rem">
<div class="d-flex align-items-center gap-1-rem listing-filters">
<button mat-flat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<button mat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<mat-icon aria-hidden="false" [matBadgeHidden]="!appliedFilterCount" [matBadge]="appliedFilterCount" matBadgeColor="warn" matBadgeSize="small">filter_alt</mat-icon>
{{'COMMONS.LISTING-COMPONENT.SEARCH-FILTER-BTN' | translate}}
</button>
<mat-menu #filterMenu>
<div class="container-fluid" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="container-fluid filter-container" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="row justify-content-between">
<div class="col-auto mt-2">
<h4>{{'PLAN-BLUEPRINT-LISTING.FILTER.TITLE' | translate}}</h4>
</div>
<div class="col-auto">
<button color="accent" mat-button (click)="clearFilters()">
<button color="primary" mat-button (click)="clearFilters()">
{{'COMMONS.LISTING-COMPONENT.CLEAR-ALL-FILTERS' | translate}}
</button>
</div>
@ -42,12 +42,12 @@
<div class="row justify-content-end align-items-center mt-4 mb-1 gap-1-rem">
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary-inverted" (click)="filterMenuTrigger?.closeMenu()">
<button mat-stroked-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger?.closeMenu()">
{{'PLAN-BLUEPRINT-LISTING.FILTER.CANCEL' | translate}}
</button>
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
<button mat-flat-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
{{'PLAN-BLUEPRINT-LISTING.FILTER.APPLY-FILTERS' | translate}}
</button>
</div>

2
frontend/src/app/ui/admin/description-status/listing/description-status-listing/description-status-listing.component.html
View File

@ -7,7 +7,7 @@
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn secondary" *ngIf="authService.hasPermission(authService.permissionEnum.EditDescriptionStatus)" [routerLink]="routerUtils.generateUrl(['/description-statuses/new'])">
<button mat-flat-button color="accent" class="padded-shadow-btn" *ngIf="authService.hasPermission(authService.permissionEnum.EditDescriptionStatus)" [routerLink]="routerUtils.generateUrl(['/description-statuses/new'])">
<mat-icon>add</mat-icon>
{{'DESCRIPTION-STATUS-LISTING.ACTIONS.CREATE-DESCRIPTION-STATUS' | translate}}
</button>

2
frontend/src/app/ui/admin/description-template/editor/components/field-set/description-template-editor-field-set.component.html
View File

@ -156,7 +156,7 @@
<ng-container *ngIf="hasFocus">
<div class="row justify-content-end pt-2">
<div class="col-auto">
<ul class="list-unstyled list-inline fieldset-actions-list d-flex align-items-center text-primary-blue">
<ul class="list-unstyled list-inline fieldset-actions-list d-flex align-items-center text-primary">
<li class="list-inline-item" *ngIf="!viewOnly">
<span role="button" [matMenuTriggerFor]="inputmenu" class="inputMenuTrigger">

13
frontend/src/app/ui/admin/description-template/editor/components/field-set/description-template-editor-field-set.component.scss
View File

@ -17,12 +17,13 @@
//Palete
$blue-color : var(--sys-primary);
$blue-color-light: #5cf7f2;
.text-primary {
color: var(--sys-primary);
}
.actions-list{
border-radius: 7px;
box-shadow: 0 1px 0.8em $blue-color;
box-shadow: 0 1px 0.8em var(--sys-primary);
padding: 1em 0em;
font-size: small;
}
@ -39,13 +40,13 @@ $blue-color-light: #5cf7f2;
box-shadow: 0px 1px 2px rgb(173, 173, 173) ;
padding: 3em;
border-radius: .3em;
border-left: 0.3em solid $blue-color;
border-left: 0.3em solid var(--sys-primary);
padding-bottom: 2em;
margin-bottom: 2em;
}
.field-id-container{
background-color: $blue-color-light;
background-color: var(--md-sys-color-inverse-primary);
position: absolute;
right: 0;
top: 0;
@ -85,7 +86,7 @@ $blue-color-light: #5cf7f2;
transform: translateY(3px);
}
.mat-checkbox-frame{
border: 1px solid $blue-color ;
border: 1px solid var(--sys-primary) ;
}
}

14
frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.html
View File

@ -117,7 +117,7 @@
<td>{{usersMap.get(user?.get('userId')?.value)?.name}}</td>
<td>{{enumUtils.toUserDescriptionTemplateRoleString(user?.get('role')?.value)}}</td>
<td *ngIf="!viewOnly">
<button mat-button class="padded-shadow-btn delete-inverted" (click)="verifyAndRemoveUser(i)" [matTooltip]="'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-REMOVE-USER'| translate"><mat-icon>person_remove</mat-icon></button>
<button mat-stroked-button color="warn" class="padded-shadow-btn" (click)="verifyAndRemoveUser(i)" [matTooltip]="'DESCRIPTION-TEMPLATE-EDITOR.STEPS.GENERAL-INFO.DESCRIPTION-TEMPLATE-REMOVE-USER'| translate"><mat-icon>person_remove</mat-icon></button>
</td>
</tr>
<tr *ngIf="formGroup.get('users')?.controls?.length === 0">
@ -198,7 +198,7 @@
</div>
@if(!viewOnly &&!selectedTocEntry?.subEntries?.length){
<div class="col-12">
<button mat-button class="padded-shadow-btn secondary" (click)="addNewEntry({parent:selectedTocEntry, childType: tocEntryEnumValues.Section})">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.PAGE-INFO.ACTIONS.CREATE-SECTION' | translate}}</button>
<button mat-flat-button color="accent" class="padded-shadow-btn" (click)="addNewEntry({parent:selectedTocEntry, childType: tocEntryEnumValues.Section})">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.PAGE-INFO.ACTIONS.CREATE-SECTION' | translate}}</button>
</div>
<mat-error *ngIf="selectedTocEntry.form.invalid && showErrors">{{'DESCRIPTION-TEMPLATE-EDITOR.STEPS.FORM.FIELD.ERROR-MESSAGES.FIELD-SELECT-AT-LEAST-ONE-REQUIRED' | translate}}</mat-error>
}
@ -276,11 +276,11 @@
<ng-container *ngIf="steps && stepper">
<div class="floating-btn">
<button *ngIf="stepper?.selectedIndex > 0" [@previous_btn] mat-button class="padded-shadow-btn secondary " (click)="stepper?.previous()">
<button *ngIf="stepper?.selectedIndex > 0" [@previous_btn] mat-flat-button color="accent" class="padded-shadow-btn " (click)="stepper?.previous()">
<mat-icon class="back-icon pointer">chevron_left</mat-icon>
{{'DESCRIPTION-TEMPLATE-EDITOR.ACTIONS.PREVIOUS' | translate}}
</button>
<button *ngIf="stepper?.selectedIndex < (steps.length-1)" mat-button class="padded-shadow-btn secondary ml-3" [@next_btn] (click)="stepper?.next();" [disabled]="!isStepCompleted(stepper?.selectedIndex)">
<button *ngIf="stepper?.selectedIndex < (steps.length-1)" mat-flat-button color="accent" class="padded-shadow-btn ml-3" [@next_btn] (click)="stepper?.next();" [disabled]="!isStepCompleted(stepper?.selectedIndex)">
<span>{{'DESCRIPTION-TEMPLATE-EDITOR.ACTIONS.NEXT' | translate}}</span>
<mat-icon class="back-icon pointer" iconPositionEnd>chevron_right</mat-icon>
</button>
@ -292,8 +292,8 @@
<ng-template #actions>
<div>
<button mat-button class="padded-shadow-btn primary-inverted mr-3" (click)="cancel()">{{'DESCRIPTION-TEMPLATE-EDITOR.ACTIONS.CLOSE' | translate}}</button>
<button *ngIf="!viewOnly" mat-button class="padded-shadow-btn secondary" type="button">
<button mat-stroked-button color="primary" class="padded-shadow-btn mr-3" (click)="cancel()">{{'DESCRIPTION-TEMPLATE-EDITOR.ACTIONS.CLOSE' | translate}}</button>
<button *ngIf="!viewOnly" mat-flat-button color="accent" class="padded-shadow-btn" type="button">
<span class="d-flex flex-row row">
<span (click)="save(); formSubmit()" class="col">{{'DESCRIPTION-TEMPLATE-EDITOR.ACTIONS.SAVE' | translate}}</span>
<mat-divider [vertical]="true"></mat-divider>
@ -307,7 +307,7 @@
<button mat-menu-item (click)="saveWithClose(false)" type="button">{{ 'DESCRIPTION-TEMPLATE-EDITOR.ACTIONS.SAVE-AND-CONTINUE' | translate }}</button>
</mat-menu>
<button *ngIf="!viewOnly && steps?.length-1 === stepper?.selectedIndex" [@finalize_btn] mat-button class="padded-shadow-btn primary ml-3" [disabled]="!formGroup.valid" [class.invisible]="steps?.length-1 !== stepper?.selectedIndex" (click)="finalize()">
<button *ngIf="!viewOnly && steps?.length-1 === stepper?.selectedIndex" [@finalize_btn] mat-flat-button color="primary" class="padded-shadow-btn ml-3" [disabled]="!formGroup.valid" [class.invisible]="steps?.length-1 !== stepper?.selectedIndex" (click)="finalize()">
{{'DESCRIPTION-TEMPLATE-EDITOR.ACTIONS.FINALIZE' | translate}}
</button>
</div>

4
frontend/src/app/ui/admin/description-template/listing/description-template-listing.component.html
View File

@ -6,7 +6,7 @@
<app-navigation-breadcrumb />
</div>
<div class="col-auto" *ngIf="canCreateNew()">
<button mat-button class="padded-shadow-btn import" (click)="import()">
<button mat-stroked-button class="padded-shadow-btn import" (click)="import()">
<span class="button-text">
{{'DESCRIPTION-TEMPLATE-LISTING.IMPORT.UPLOAD-XML' | translate}}
</span>
@ -14,7 +14,7 @@
</div>
<div class="col-auto" *ngIf="canCreateNew()">
<button mat-button class="padded-shadow-btn secondary" *ngIf="authService.hasPermission(authService.permissionEnum.EditDescriptionTemplate)" [routerLink]="[routerUtils.generateUrl('/description-templates/new')]">
<button mat-flat-button color="accent" class="padded-shadow-btn" *ngIf="authService.hasPermission(authService.permissionEnum.EditDescriptionTemplate)" [routerLink]="[routerUtils.generateUrl('/description-templates/new')]">
<mat-icon>add</mat-icon>
{{'DESCRIPTION-TEMPLATE-LISTING.CREATE-DESCRIPTION-TEMPLATE' | translate}}
</button>

10
frontend/src/app/ui/admin/description-template/listing/filters/description-template-listing-filters.component.html
View File

@ -1,19 +1,19 @@
<div class="d-flex align-items-center gap-1-rem">
<div class="d-flex align-items-center gap-1-rem listing-filters">
<button mat-flat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<button mat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<mat-icon aria-hidden="false" [matBadgeHidden]="!appliedFilterCount" [matBadge]="appliedFilterCount" matBadgeColor="warn" matBadgeSize="small">filter_alt</mat-icon>
{{'COMMONS.LISTING-COMPONENT.SEARCH-FILTER-BTN' | translate}}
</button>
<mat-menu #filterMenu>
<div class="container-fluid" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="filter-container container-fluid" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="row justify-content-between">
<div class="col-auto mt-2">
<h4>{{'DESCRIPTION-TEMPLATE-LISTING.FILTER.TITLE' | translate}}</h4>
</div>
<div class="col-auto">
<button color="accent" mat-button (click)="clearFilters()">
<button color="primary" mat-button (click)="clearFilters()">
{{'COMMONS.LISTING-COMPONENT.CLEAR-ALL-FILTERS' | translate}}
</button>
</div>
@ -47,7 +47,7 @@
</button>
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
<button mat-flat-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
{{'DESCRIPTION-TEMPLATE-LISTING.FILTER.APPLY-FILTERS' | translate}}
</button>
</div>

8
frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.html
View File

@ -8,22 +8,22 @@
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn neutral" (click)="cancel()" type="button">{{'DESCRIPTION-TEMPLATE-TYPE-EDITOR.ACTIONS.CANCEL' | translate}}</button>
<button mat-stroked-button class="padded-shadow-btn neutral" (click)="cancel()" type="button">{{'DESCRIPTION-TEMPLATE-TYPE-EDITOR.ACTIONS.CANCEL' | translate}}</button>
</div>
<div class="col-auto" *ngIf="canDelete">
<button mat-button (click)="delete()" class="padded-shadow-btn delete-inverted" type="button">
<button mat-stroked-button color="warn" (click)="delete()" class="padded-shadow-btn" type="button">
<mat-icon>delete</mat-icon>
{{'DESCRIPTION-TEMPLATE-TYPE-EDITOR.ACTIONS.DELETE' | translate}}
</button>
</div>
<div class="col-auto" *ngIf="canFinalize">
<button mat-button class="padded-shadow-btn secondary" (click)="save(); finalize()">
<button mat-flat-button color="accent" class="padded-shadow-btn" (click)="save(); finalize()">
<mat-icon>save</mat-icon>
{{'DESCRIPTION-TEMPLATE-TYPE-EDITOR.ACTIONS.FINALIZE' | translate}}
</button>
</div>
<div class="col-auto" *ngIf="canSave">
<button mat-button class="padded-shadow-btn primary" (click)="save(); formSubmit()">
<button mat-flat-button color="primary" class="padded-shadow-btn" (click)="save(); formSubmit()">
<mat-icon>save</mat-icon>
{{'DESCRIPTION-TEMPLATE-TYPE-EDITOR.ACTIONS.SAVE' | translate}}
</button>

2
frontend/src/app/ui/admin/description-types/listing/description-template-type-listing.component.html
View File

@ -6,7 +6,7 @@
<app-navigation-breadcrumb />
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn secondary"
<button mat-flat-button color="accent" class="padded-shadow-btn"
*ngIf="authService.hasPermission(authService.permissionEnum.EditDescriptionTemplateType)"
[routerLink]="routerUtils.generateUrl(['/description-template-type/new'])">
<mat-icon>add</mat-icon>

12
frontend/src/app/ui/admin/description-types/listing/filters/description-template-type-listing-filters.component.html
View File

@ -1,19 +1,19 @@
<div class="d-flex align-items-center gap-1-rem">
<div class="d-flex align-items-center gap-1-rem listing-filters">
<button mat-flat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<button mat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<mat-icon aria-hidden="false" [matBadgeHidden]="!appliedFilterCount" [matBadge]="appliedFilterCount" matBadgeColor="warn" matBadgeSize="small">filter_alt</mat-icon>
{{'DESCRIPTION-TEMPLATE-TYPE-LISTING.FILTER.SEARCH-FILTER-BTN' | translate}}
</button>
<mat-menu #filterMenu>
<div class="container-fluid" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="filter-container container-fluid" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="row justify-content-between">
<div class="col-auto mt-2">
<h4>{{'DESCRIPTION-TEMPLATE-TYPE-LISTING.FILTER.TITLE' | translate}}</h4>
</div>
<div class="col-auto">
<button color="accent" mat-button (click)="clearFilters()">
<button color="primary" mat-button (click)="clearFilters()">
{{'DESCRIPTION-TEMPLATE-TYPE-LISTING.FILTER.CLEAR-ALL-FILTERS' | translate}}
</button>
</div>
@ -42,12 +42,12 @@
<div class="row justify-content-end align-items-center mt-4 mb-1 gap-1-rem">
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary-inverted" (click)="filterMenuTrigger?.closeMenu()">
<button mat-stroked-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger?.closeMenu()">
{{'DESCRIPTION-TEMPLATE-TYPE-LISTING.FILTER.CANCEL' | translate}}
</button>
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
<button mat-flat-button color="primary" class="padded-shadow-btn primary" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
{{'DESCRIPTION-TEMPLATE-TYPE-LISTING.FILTER.APPLY-FILTERS' | translate}}
</button>
</div>

12
frontend/src/app/ui/admin/entity-locks/filters/lock-listing-filters.component.html
View File

@ -1,19 +1,19 @@
<div class="d-flex align-items-center gap-1-rem">
<div class="d-flex align-items-center gap-1-rem listing-filters">
<button mat-flat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<button mat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<mat-icon aria-hidden="false" [matBadgeHidden]="!appliedFilterCount" [matBadge]="appliedFilterCount" matBadgeColor="warn" matBadgeSize="small">filter_alt</mat-icon>
{{'COMMONS.LISTING-COMPONENT.SEARCH-FILTER-BTN' | translate}}
</button>
<mat-menu #filterMenu>
<div class="container-fluid" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="container-fluid filter-container" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="row justify-content-between">
<div class="col-auto mt-2">
<h4>{{'LOCK-LISTING.FILTER.TITLE' | translate}}</h4>
</div>
<div class="col-auto">
<button color="accent" mat-button (click)="clearFilters()">
<button color="primary" mat-button (click)="clearFilters()">
{{'COMMONS.LISTING-COMPONENT.CLEAR-ALL-FILTERS' | translate}}
</button>
</div>
@ -42,12 +42,12 @@
<div class="row justify-content-between mt-4 mb-1 gap-1-rem">
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary-inverted" (click)="filterMenuTrigger?.closeMenu()">
<button mat-stroked-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger?.closeMenu()">
{{'LOCK-LISTING.FILTER.CANCEL' | translate}}
</button>
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
<button mat-flat-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
{{'LOCK-LISTING.FILTER.APPLY-FILTERS' | translate}}
</button>
</div>

10
frontend/src/app/ui/admin/language/listing/filters/language-listing-filters.component.html
View File

@ -1,19 +1,19 @@
<div class="d-flex align-items-center gap-1-rem">
<div class="d-flex align-items-center gap-1-rem listing-filters">
<button mat-flat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<button mat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<mat-icon aria-hidden="false" [matBadgeHidden]="!appliedFilterCount" [matBadge]="appliedFilterCount" matBadgeColor="warn" matBadgeSize="small">filter_alt</mat-icon>
{{'COMMONS.LISTING-COMPONENT.SEARCH-FILTER-BTN' | translate}}
</button>
<mat-menu #filterMenu>
<div class="container-fluid" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="container-fluid filter-container" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="row justify-content-between">
<div class="col-auto mt-2">
<h4>{{'LANGUAGE-LISTING.FILTER.TITLE' | translate}}</h4>
</div>
<div class="col-auto">
<button color="accent" mat-button (click)="clearFilters()">
<button color="primary" mat-button (click)="clearFilters()">
{{'COMMONS.LISTING-COMPONENT.CLEAR-ALL-FILTERS' | translate}}
</button>
</div>
@ -31,7 +31,7 @@
<div class="row justify-content-end align-items-center mt-4 mb-1 gap-1-rem">
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary-inverted" (click)="filterMenuTrigger?.closeMenu()">
<button mat-stroked-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger?.closeMenu()">
{{'LANGUAGE-LISTING.FILTER.CANCEL' | translate}}
</button>
</div>

2
frontend/src/app/ui/admin/language/listing/language-listing.component.html
View File

@ -6,7 +6,7 @@
<app-navigation-breadcrumb />
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn secondary"
<button mat-flat-button color="accent" class="padded-shadow-btn"
*ngIf="authService.hasPermission(authService.permissionEnum.EditLanguage)"
[routerLink]="routerUtils.generateUrl(['/languages/new'])">
<mat-icon>add</mat-icon>

14
frontend/src/app/ui/admin/plan-blueprint/editor/plan-blueprint-editor.component.html
View File

@ -6,16 +6,16 @@
<app-navigation-breadcrumb />
</div>
<div class="col-md-auto mb-md-0 col-12 mb-2" *ngIf="canDelete">
<button [disabled]="isLocked" mat-button class="padded-shadow-btn secondary" type="button" (click)="delete()">
<button mat-stroked-button color="warn" [disabled]="isLocked" mat-button class="padded-shadow-btn" type="button" (click)="delete()">
<mat-icon>delete</mat-icon>
{{'PLAN-BLUEPRINT-EDITOR.ACTIONS.DELETE' | translate}}
</button>
</div>
<div class="col-md-auto col-12" *ngIf="canDownloadXML">
<button mat-button class="padded-shadow-btn secondary" (click)="downloadXML()" type="button">{{'PLAN-BLUEPRINT-EDITOR.ACTIONS.DOWNLOAD-XML' | translate }}</button>
<button mat-flat-button color="accent" class="padded-shadow-btn" (click)="downloadXML()" type="button">{{'PLAN-BLUEPRINT-EDITOR.ACTIONS.DOWNLOAD-XML' | translate }}</button>
</div>
<div *ngIf="!hideEditActions && canFinalize" class="col-auto">
<button mat-button class="padded-shadow-btn secondary" (click)="finalize()" [disabled]="this.isLocked || !this.isFormValid()" type="button">{{'PLAN-BLUEPRINT-EDITOR.ACTIONS.FINALIZE' | translate }}</button>
<button mat-flat-button color="primary" class="padded-shadow-btn" (click)="finalize()" [disabled]="this.isLocked || !this.isFormValid()" type="button">{{'PLAN-BLUEPRINT-EDITOR.ACTIONS.FINALIZE' | translate }}</button>
</div>
</div>
<form *ngIf="formGroup">
@ -78,7 +78,7 @@
</mat-form-field>
</div>
<div class="col-auto mb-3" *ngIf="!hideEditActions">
<button mat-button class="padded-shadow-btn secondary" type="button" (click)="addField(sectionIndex)">{{'PLAN-BLUEPRINT-EDITOR.ACTIONS.ADD-FIELD' | translate}}</button>
<button mat-flat-button color="accent" class="padded-shadow-btn" type="button" (click)="addField(sectionIndex)">{{'PLAN-BLUEPRINT-EDITOR.ACTIONS.ADD-FIELD' | translate}}</button>
</div>
</div>
<div class="row">
@ -337,7 +337,7 @@
<div class="col-12">
<div class="row">
<div class="col-auto" *ngIf="!hideEditActions">
<button mat-button class="padded-shadow-btn secondary" type="button" (click)="addSection()">{{'PLAN-BLUEPRINT-EDITOR.ACTIONS.ADD-SECTION' | translate}}</button>
<button mat-flat-button color="accent" class="padded-shadow-btn" type="button" (click)="addSection()">{{'PLAN-BLUEPRINT-EDITOR.ACTIONS.ADD-SECTION' | translate}}</button>
<mat-error *ngIf="formGroup.get('definition').get('sections').dirty && formGroup.get('definition').get('sections').hasError('required')">{{'PLAN-BLUEPRINT-EDITOR.SECTIONS-REQUIRED' | translate}}</mat-error>
<mat-error *ngIf="formGroup.get('definition').get('sections').hasError('backendError')">{{formGroup.get('definition').get('sections').getError('backendError').message}}</mat-error>
</div>
@ -346,11 +346,11 @@
</div>
<div class="row mt-4">
<div class="col-auto">
<button mat-button class="padded-shadow-btn secondary" (click)="cancel()" type="button">{{'PLAN-BLUEPRINT-EDITOR.ACTIONS.CANCEL' | translate}}</button>
<button mat-stroked-button class="padded-shadow-btn" (click)="cancel()" type="button">{{'PLAN-BLUEPRINT-EDITOR.ACTIONS.CANCEL' | translate}}</button>
</div>
<div class="col"></div>
<div class="col-auto" *ngIf="!hideEditActions">
<button mat-button class="padded-shadow-btn secondary" [disabled]="isLocked" type="submit" (click)="save(); formSubmit()">
<button mat-flat-button color="primary" class="padded-shadow-btn" [disabled]="isLocked" type="submit" (click)="save(); formSubmit()">
{{'PLAN-BLUEPRINT-EDITOR.ACTIONS.SAVE' | translate}}
</button>
</div>

8
frontend/src/app/ui/admin/plan-blueprint/listing/filters/plan-blueprint-listing-filters.component.html
View File

@ -1,4 +1,4 @@
<div class="d-flex align-items-center gap-1-rem">
<div class="d-flex align-items-center gap-1-rem listing-filters">
<button mat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<mat-icon aria-hidden="false" [matBadgeHidden]="!appliedFilterCount" [matBadge]="appliedFilterCount" matBadgeColor="warn" matBadgeSize="small">filter_alt</mat-icon>
@ -7,7 +7,7 @@
<mat-menu #filterMenu>
<div class="container-fluid pt-2 pb-2" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="filter-container container-fluid" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="row justify-content-between">
<div class="col-auto mt-2">
<h4>{{'PLAN-BLUEPRINT-LISTING.FILTER.TITLE' | translate}}</h4>
@ -41,12 +41,12 @@
<div class="row justify-content-end align-items-center mt-4 mb-1 gap-1-rem">
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary-inverted" (click)="filterMenuTrigger?.closeMenu()">
<button mat-stroked-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger?.closeMenu()">
{{'PLAN-BLUEPRINT-LISTING.FILTER.CANCEL' | translate}}
</button>
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
<button mat-flat-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
{{'PLAN-BLUEPRINT-LISTING.FILTER.APPLY-FILTERS' | translate}}
</button>
</div>

1
frontend/src/app/ui/admin/plan-blueprint/listing/filters/plan-blueprint-listing-filters.component.scss
View File

@ -15,7 +15,6 @@
.filter-button{
padding-top: .6rem;
padding-bottom: .6rem;
color: #000000;
}
::ng-deep .mdc-form-field {

2
frontend/src/app/ui/admin/plan-blueprint/listing/plan-blueprint-listing.component.html
View File

@ -14,7 +14,7 @@
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn secondary" *ngIf="authService.hasPermission(authService.permissionEnum.EditDescriptionTemplateType)" [routerLink]="routerUtils.generateUrl(['/plan-blueprints/new'])">
<button mat-flat-button color="accent" class="padded-shadow-btn" *ngIf="authService.hasPermission(authService.permissionEnum.EditDescriptionTemplateType)" [routerLink]="routerUtils.generateUrl(['/plan-blueprints/new'])">
<mat-icon>add</mat-icon>
{{'PLAN-BLUEPRINT-LISTING.CREATE-PLAN-BLUEPRINT' | translate}}
</button>

12
frontend/src/app/ui/admin/plan-status/listing/plan-status-listing/plan-status-listing-filters/plan-status-listing-filters.component.html
View File

@ -1,19 +1,19 @@
<div class="d-flex align-items-center gap-1-rem">
<div class="d-flex align-items-center gap-1-rem listing-filters">
<button mat-flat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<button mat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<mat-icon aria-hidden="false" [matBadgeHidden]="!appliedFilterCount" [matBadge]="appliedFilterCount" matBadgeColor="warn" matBadgeSize="small">filter_alt</mat-icon>
{{'COMMONS.LISTING-COMPONENT.SEARCH-FILTER-BTN' | translate}}
</button>
<mat-menu #filterMenu>
<div class="container-fluid" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="container-fluid filter-container" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="row justify-content-between">
<div class="col-auto mt-2">
<h4>{{'PLAN-BLUEPRINT-LISTING.FILTER.TITLE' | translate}}</h4>
</div>
<div class="col-auto">
<button color="accent" mat-button (click)="clearFilters()">
<button color="primary" mat-button (click)="clearFilters()">
{{'COMMONS.LISTING-COMPONENT.CLEAR-ALL-FILTERS' | translate}}
</button>
</div>
@ -41,12 +41,12 @@
<div class="row justify-content-end align-items-center mt-4 mb-1 gap-1-rem">
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary-inverted" (click)="filterMenuTrigger?.closeMenu()">
<button mat-stroked-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger?.closeMenu()">
{{'PLAN-BLUEPRINT-LISTING.FILTER.CANCEL' | translate}}
</button>
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
<button mat-flat-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
{{'PLAN-BLUEPRINT-LISTING.FILTER.APPLY-FILTERS' | translate}}
</button>
</div>

2
frontend/src/app/ui/admin/plan-status/listing/plan-status-listing/plan-status-listing.component.html
View File

@ -7,7 +7,7 @@
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn secondary" *ngIf="authService.hasPermission(authService.permissionEnum.EditPlanStatus)" [routerLink]="routerUtils.generateUrl(['/plan-statuses/new'])">
<button mat-flat-button color="accent" class="padded-shadow-btn" *ngIf="authService.hasPermission(authService.permissionEnum.EditPlanStatus)" [routerLink]="routerUtils.generateUrl(['/plan-statuses/new'])">
<mat-icon>add</mat-icon>
{{'PLAN-STATUS-LISTING.ACTIONS.CREATE-PLAN-STATUS' | translate}}
</button>

16
frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.html
View File

@ -7,23 +7,23 @@
<app-navigation-breadcrumb />
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn neutral" (click)="cancel()" type="button">{{'PREFILLING-SOURCE-EDITOR.ACTIONS.CANCEL' | translate}}</button>
<button mat-stroked-button class="padded-shadow-btn" (click)="cancel()" type="button">{{'PREFILLING-SOURCE-EDITOR.ACTIONS.CANCEL' | translate}}</button>
</div>
<div class="col-auto" *ngIf="canDelete">
<button mat-button class="padded-shadow-btn delete-inverted" type="button" (click)="delete()">
<button mat-stroked-button color="warn" class="padded-shadow-btn" type="button" (click)="delete()">
<mat-icon>delete</mat-icon>
{{'PREFILLING-SOURCE-EDITOR.ACTIONS.DELETE' | translate}}
</button>
</div>
<div class="col-auto" *ngIf="canSave">
<button mat-button class="padded-shadow-btn primary" (click)="formSubmit()">
<button mat-flat-button color="primary" class="padded-shadow-btn" (click)="formSubmit()">
<mat-icon>save</mat-icon>
{{'PREFILLING-SOURCE-EDITOR.ACTIONS.SAVE' | translate}}
</button>
</div>
</div>
<form *ngIf="formGroup" (ngSubmit)="formSubmit()">
<form *ngIf="formGroup" (ngSubmit)="formSubmit()" class="d-flex flex-column gap-half-rem">
<mat-card appearance="outlined" class="pt-3 pb-3">
<mat-card-content>
<div class="row">
@ -90,7 +90,7 @@
</div>
</div>
</div>
<button mat-button class="padded-shadow-btn secondary" type="button" (click)="addFixedValiueField()" [disabled]="formGroup.disabled">{{'PREFILLING-SOURCE-EDITOR.ACTIONS.ADD-FIELD' | translate}}</button>
<button mat-flat-button color="accent" class="padded-shadow-btn" type="button" (click)="addFixedValiueField()" [disabled]="formGroup.disabled">{{'PREFILLING-SOURCE-EDITOR.ACTIONS.ADD-FIELD' | translate}}</button>
</div>
</div>
</div>
@ -132,9 +132,9 @@
</div>
</div>
</div>
<div class="row d-flex gap-half-rem">
<button mat-button class="padded-shadow-btn secondary" type="button" (click)="addField()" [disabled]="formGroup.disabled">{{'PREFILLING-SOURCE-EDITOR.ACTIONS.ADD-FIELD' | translate}}</button>
<button mat-button class="padded-shadow-btn secondary" *ngIf="formGroup.get('definition').get('fields').value != ''" type="button" (click)="submitFields()" [disabled]="!formGroup.get('definition').get('fields').valid">{{'PREFILLING-SOURCE-EDITOR.ACTIONS.SUBMIT-FIELDS' | translate}}</button>
<div class="d-flex gap-half-rem">
<button mat-flat-button color="accent" class="padded-shadow-btn" type="button" (click)="addField()" [disabled]="formGroup.disabled">{{'PREFILLING-SOURCE-EDITOR.ACTIONS.ADD-FIELD' | translate}}</button>
<button mat-flat-button color="accent" class="padded-shadow-btn" *ngIf="formGroup.get('definition').get('fields').value != ''" type="button" (click)="submitFields()" [disabled]="!formGroup.get('definition').get('fields').valid">{{'PREFILLING-SOURCE-EDITOR.ACTIONS.SUBMIT-FIELDS' | translate}}</button>
</div>
</div>
</mat-card-content>

12
frontend/src/app/ui/admin/prefilling-source/listing/filters/prefilling-source-listing-filters.component.html
View File

@ -1,19 +1,19 @@
<div class="d-flex align-items-center gap-1-rem">
<div class="d-flex align-items-center gap-1-rem listing-filters">
<button mat-flat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<button mat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<mat-icon aria-hidden="false" [matBadgeHidden]="!appliedFilterCount" [matBadge]="appliedFilterCount" matBadgeColor="warn" matBadgeSize="small">filter_alt</mat-icon>
{{'COMMONS.LISTING-COMPONENT.SEARCH-FILTER-BTN' | translate}}
</button>
<mat-menu #filterMenu>
<div class="container-fluid" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="filter-container container-fluid" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="row justify-content-between">
<div class="col-auto mt-2">
<h4>{{'PREFILLING-SOURCE-LISTING.FILTER.TITLE' | translate}}</h4>
</div>
<div class="col-auto">
<button color="accent" mat-button (click)="clearFilters()">
<button color="primary" mat-button (click)="clearFilters()">
{{'COMMONS.LISTING-COMPONENT.CLEAR-ALL-FILTERS' | translate}}
</button>
</div>
@ -31,12 +31,12 @@
<div class="row justify-content-end align-items-center mt-4 mb-1 gap-1-rem">
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary-inverted" (click)="filterMenuTrigger?.closeMenu()">
<button mat-stroked-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger?.closeMenu()">
{{'PREFILLING-SOURCE-LISTING.FILTER.CANCEL' | translate}}
</button>
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
<button mat-flat-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
{{'PREFILLING-SOURCE-LISTING.FILTER.APPLY-FILTERS' | translate}}
</button>
</div>

2
frontend/src/app/ui/admin/prefilling-source/listing/prefilling-source-listing.component.html
View File

@ -7,7 +7,7 @@
<app-navigation-breadcrumb />
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn secondary"
<button mat-flat-button color="accent" class="padded-shadow-btn"
*ngIf="authService.hasPermission(authService.permissionEnum.EditPrefillingSource)"
[routerLink]="routerUtils.generateUrl(['/prefilling-sources/new'])">
<mat-icon>add</mat-icon>

12
frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.html
View File

@ -7,16 +7,16 @@
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn neutral" (click)="cancel()" type="button">{{'REFERENCE-TYPE-EDITOR.ACTIONS.CANCEL' | translate}}</button>
<button mat-stroked-button class="padded-shadow-btn" (click)="cancel()" type="button">{{'REFERENCE-TYPE-EDITOR.ACTIONS.CANCEL' | translate}}</button>
</div>
<div class="col-auto" *ngIf="canDelete">
<button mat-button (click)="delete()" class="padded-shadow-btn delete-inverted" type="button">
<button mat-stroked-button color="warn" (click)="delete()" class="padded-shadow-btn" type="button">
<mat-icon>delete</mat-icon>
{{'REFERENCE-TYPE-EDITOR.ACTIONS.DELETE' | translate}}
</button>
</div>
<div class="col-auto" *ngIf="canSave">
<button mat-button class="padded-shadow-btn primary" (click)="formSubmit()">
<button mat-flat-button color="primary" class="padded-shadow-btn" (click)="formSubmit()">
<mat-icon>save</mat-icon>
{{'REFERENCE-TYPE-EDITOR.ACTIONS.SAVE' | translate}}
</button>
@ -60,7 +60,7 @@
<h3 class="m-0">{{'REFERENCE-TYPE-EDITOR.FIELDS.FIELDS' | translate}}</h3>
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn secondary" type="button" (click)="addField()" [disabled]="formGroup.get('definition').get('fields').disabled">{{'REFERENCE-TYPE-EDITOR.ACTIONS.ADD-FIELD' | translate}}</button>
<button mat-flat-button color="accent" class="padded-shadow-btn" type="button" (click)="addField()" [disabled]="formGroup.get('definition').get('fields').disabled">{{'REFERENCE-TYPE-EDITOR.ACTIONS.ADD-FIELD' | translate}}</button>
</div>
</div>
</div>
@ -124,7 +124,7 @@
</div>
</div>
</div>
<button mat-button class="padded-shadow-btn secondary" *ngIf="formGroup.get('definition').get('fields').value != ''" type="button" (click)="submitFields()" [disabled]="!formGroup.get('definition').get('fields').valid">{{'REFERENCE-TYPE-EDITOR.ACTIONS.SUBMIT-FIELDS' | translate}}</button>
<button mat-flat-button color="accent" class="padded-shadow-btn " *ngIf="formGroup.get('definition').get('fields').value != ''" type="button" (click)="submitFields()" [disabled]="!formGroup.get('definition').get('fields').valid">{{'REFERENCE-TYPE-EDITOR.ACTIONS.SUBMIT-FIELDS' | translate}}</button>
</div>
<div class="col-12 mt-3 mb-3">
<div class="row d-flex align-items-center">
@ -132,7 +132,7 @@
<h3 class="m-0">{{'REFERENCE-TYPE-EDITOR.FIELDS.SOURCES' | translate}}</h3>
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn secondary" type="button" (click)="addSource()" [disabled]="formGroup.get('definition').get('fields').disabled">{{'REFERENCE-TYPE-EDITOR.ACTIONS.ADD-SOURCE' | translate}}</button>
<button mat-flat-button color="accent" class="padded-shadow-btn" type="button" (click)="addSource()" [disabled]="formGroup.get('definition').get('fields').disabled">{{'REFERENCE-TYPE-EDITOR.ACTIONS.ADD-SOURCE' | translate}}</button>
</div>
</div>
</div>

12
frontend/src/app/ui/admin/reference-type/listing/filters/reference-type-listing-filters.component.html
View File

@ -1,19 +1,19 @@
<div class="d-flex align-items-center gap-1-rem">
<div class="d-flex align-items-center gap-1-rem listing-filters">
<button mat-flat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<button mat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<mat-icon aria-hidden="false" [matBadgeHidden]="!appliedFilterCount" [matBadge]="appliedFilterCount" matBadgeColor="warn" matBadgeSize="small">filter_alt</mat-icon>
{{'COMMONS.LISTING-COMPONENT.SEARCH-FILTER-BTN' | translate}}
</button>
<mat-menu #filterMenu>
<div class="container-fluid" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="container-fluid filter-container" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="row justify-content-between">
<div class="col-auto mt-2">
<h4>{{'REFERENCE-TYPE-LISTING.FILTER.TITLE' | translate}}</h4>
</div>
<div class="col-auto">
<button color="accent" mat-button (click)="clearFilters()">
<button color="primary" mat-button (click)="clearFilters()">
{{'COMMONS.LISTING-COMPONENT.CLEAR-ALL-FILTERS' | translate}}
</button>
</div>
@ -31,12 +31,12 @@
<div class="row justify-content-end align-items-center mt-4 mb-1 gap-1-rem">
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary-inverted" (click)="filterMenuTrigger?.closeMenu()">
<button mat-stroked-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger?.closeMenu()">
{{'REFERENCE-TYPE-LISTING.FILTER.CANCEL' | translate}}
</button>
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
<button mat-flat-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
{{'REFERENCE-TYPE-LISTING.FILTER.APPLY-FILTERS' | translate}}
</button>
</div>

2
frontend/src/app/ui/admin/reference-type/listing/reference-type-listing.component.html
View File

@ -7,7 +7,7 @@
<app-navigation-breadcrumb />
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn secondary"
<button mat-flat-button color="accent" class="padded-shadow-btn"
*ngIf="authService.hasPermission(authService.permissionEnum.EditReferenceType)"
[routerLink]="routerUtils.generateUrl(['/reference-type/new'])">
<mat-icon>add</mat-icon>

8
frontend/src/app/ui/admin/reference/editor/reference-editor.component.html
View File

@ -6,16 +6,16 @@
<app-navigation-breadcrumb />
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn neutral" (click)="cancel()" type="button">{{'REFERENCE-EDITOR.ACTIONS.CANCEL' | translate}}</button>
<button mat-stroked-button class="padded-shadow-btn" (click)="cancel()" type="button">{{'REFERENCE-EDITOR.ACTIONS.CANCEL' | translate}}</button>
</div>
<div class="col-auto" *ngIf="canDelete">
<button mat-button class="padded-shadow-btn delete-inverted" type="button" (click)="delete()">
<button mat-stroked-button color="warn" class="padded-shadow-btn" type="button" (click)="delete()">
<mat-icon>delete</mat-icon>
{{'REFERENCE-EDITOR.ACTIONS.DELETE' | translate}}
</button>
</div>
<div class="col-auto" *ngIf="canSave">
<button mat-button class="padded-shadow-btn primary" (click)="formSubmit()">
<button mat-flat-button color="primary" class="padded-shadow-btn" (click)="formSubmit()">
<mat-icon>save</mat-icon>
{{'REFERENCE-EDITOR.ACTIONS.SAVE' | translate}}
</button>
@ -92,7 +92,7 @@
<div class="col-12">
<h3 class="mb-4">
{{'REFERENCE-EDITOR.FIELDS.FIELDS' | translate}}
<button mat-button class="padded-shadow-btn secondary" type="button" (click)="addField()" [disabled]="formGroup.disabled">{{'REFERENCE-EDITOR.ACTIONS.ADD-FIELD' | translate}}</button>
<button mat-flat-button color="accent" class="padded-shadow-btn" type="button" (click)="addField()" [disabled]="formGroup.disabled">{{'REFERENCE-EDITOR.ACTIONS.ADD-FIELD' | translate}}</button>
</h3>
<div *ngFor="let field of formGroup.get('definition').get('fields').controls; let fieldIndex=index;" class="row mb-3">
<div class="col-12">

12
frontend/src/app/ui/admin/reference/listing/filters/reference-listing-filters.component.html
View File

@ -1,20 +1,20 @@
<div class="d-flex align-items-center gap-1-rem">
<div class="d-flex align-items-center gap-1-rem listing-filters">
<button mat-flat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<button mat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<mat-icon aria-hidden="false" [matBadgeHidden]="!appliedFilterCount" [matBadge]="appliedFilterCount" matBadgeColor="warn" matBadgeSize="small">filter_alt</mat-icon>
{{'COMMONS.LISTING-COMPONENT.SEARCH-FILTER-BTN' | translate}}
</button>
<mat-menu #filterMenu>
<div class="container-fluid" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="container-fluid filter-container" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="row justify-content-between">
<div class="col-auto mt-2">
<h4>{{'REFERENCE-LISTING.FILTER.TITLE' | translate}}</h4>
</div>
<div class="col-auto">
<button color="accent" mat-button (click)="clearFilters()">
<button color="primary" mat-button (click)="clearFilters()">
{{'COMMONS.LISTING-COMPONENT.CLEAR-ALL-FILTERS' | translate}}
</button>
</div>
@ -53,12 +53,12 @@
<div class="row justify-content-end align-items-center mt-4 mb-1 gap-1-rem">
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary-inverted" (click)="filterMenuTrigger?.closeMenu()">
<button mat-stroked-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger?.closeMenu()">
{{'REFERENCE-LISTING.FILTER.CANCEL' | translate}}
</button>
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
<button mat-flat-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
{{'REFERENCE-LISTING.FILTER.APPLY-FILTERS' | translate}}
</button>
</div>

2
frontend/src/app/ui/admin/reference/listing/reference-listing.component.html
View File

@ -7,7 +7,7 @@
<app-navigation-breadcrumb />
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn secondary"
<button mat-flat-button color="accent" class="padded-shadow-btn"
*ngIf="authService.hasPermission(authService.permissionEnum.EditReference)"
[routerLink]="routerUtils.generateUrl(['/references/new/'])">
<mat-icon>add</mat-icon>

12
frontend/src/app/ui/admin/tenant/listing/filters/tenant-listing-filters.component.html
View File

@ -1,19 +1,19 @@
<div class="d-flex align-items-center gap-1-rem">
<div class="d-flex align-items-center gap-1-rem listing-filters">
<button mat-flat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<button mat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<mat-icon aria-hidden="false" [matBadgeHidden]="!appliedFilterCount" [matBadge]="appliedFilterCount" matBadgeColor="warn" matBadgeSize="small">filter_alt</mat-icon>
{{'COMMONS.LISTING-COMPONENT.SEARCH-FILTER-BTN' | translate}}
</button>
<mat-menu #filterMenu>
<div class="container-fluid" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="container-fluid filter-container" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="row justify-content-between">
<div class="col-auto mt-2">
<h4>{{'TENANT-LISTING.FILTER.TITLE' | translate}}</h4>
</div>
<div class="col-auto">
<button color="accent" mat-button (click)="clearFilters()">
<button color="primary" mat-button (click)="clearFilters()">
{{'COMMONS.LISTING-COMPONENT.CLEAR-ALL-FILTERS' | translate}}
</button>
</div>
@ -31,12 +31,12 @@
<div class="row justify-content-end align-items-center mt-4 mb-1 gap-1-rem">
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary-inverted" (click)="filterMenuTrigger?.closeMenu()">
<button mat-stroked-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger?.closeMenu()">
{{'TENANT-LISTING.FILTER.CANCEL' | translate}}
</button>
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
<button mat-flat-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
{{'TENANT-LISTING.FILTER.APPLY-FILTERS' | translate}}
</button>
</div>

2
frontend/src/app/ui/admin/tenant/listing/tenant-listing.component.html
View File

@ -8,7 +8,7 @@
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn secondary"
<button mat-flat-button color="accent" class="padded-shadow-btn"
*ngIf="authService.hasPermission(authService.permissionEnum.EditTenant)"
[routerLink]="routerUtils.generateUrl(['/tenants/new'])">
<mat-icon>add</mat-icon>

6
frontend/src/app/ui/admin/usage-limit/editor/usage-limit-editor.component.html
View File

@ -6,16 +6,16 @@
<app-navigation-breadcrumb />
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn neutral" (click)="cancel()" type="button">{{'USAGE-LIMIT-EDITOR.ACTIONS.CANCEL' | translate}}</button>
<button mat-stroked-button class="padded-shadow-btn" (click)="cancel()" type="button">{{'USAGE-LIMIT-EDITOR.ACTIONS.CANCEL' | translate}}</button>
</div>
<div class="col-auto" *ngIf="canDelete">
<button mat-button class="padded-shadow-btn delete-inverted" type="button" (click)="delete()">
<button mat-stroked-button color="warn" class="padded-shadow-btn" type="button" (click)="delete()">
<mat-icon>delete</mat-icon>
{{'USAGE-LIMIT-EDITOR.ACTIONS.DELETE' | translate}}
</button>
</div>
<div class="col-auto" *ngIf="canSave">
<button mat-button class="padded-shadow-btn primary" (click)="formSubmit()">
<button mat-flat-button color="primary" class="padded-shadow-btn" (click)="formSubmit()">
<mat-icon>save</mat-icon>
{{'USAGE-LIMIT-EDITOR.ACTIONS.SAVE' | translate}}
</button>

12
frontend/src/app/ui/admin/usage-limit/listing/filters/usage-limit-listing-filters.component.html
View File

@ -1,19 +1,19 @@
<div class="d-flex align-items-center gap-1-rem">
<div class="d-flex align-items-center gap-1-rem listing-filters">
<button mat-flat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<button mat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<mat-icon aria-hidden="false" [matBadgeHidden]="!appliedFilterCount" [matBadge]="appliedFilterCount" matBadgeColor="warn" matBadgeSize="small">filter_alt</mat-icon>
{{'COMMONS.LISTING-COMPONENT.SEARCH-FILTER-BTN' | translate}}
</button>
<mat-menu #filterMenu>
<div class="container-fluid" [class.accessibility-theme]="accessibilityTheme()"(click)="$event?.stopPropagation?.()">
<div class="filter-container container-fluid" [class.accessibility-theme]="accessibilityTheme()"(click)="$event?.stopPropagation?.()">
<div class="row justify-content-between">
<div class="col-auto mt-2">
<h4>{{'USAGE-LIMIT-LISTING.FILTER.TITLE' | translate}}</h4>
</div>
<div class="col-auto">
<button color="accent" mat-button (click)="clearFilters()">
<button color="primary" mat-button (click)="clearFilters()">
{{'COMMONS.LISTING-COMPONENT.CLEAR-ALL-FILTERS' | translate}}
</button>
</div>
@ -42,12 +42,12 @@
<div class="row justify-content-end align-items-center mt-4 mb-1 gap-1-rem">
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary-inverted" (click)="filterMenuTrigger?.closeMenu()">
<button mat-stroked-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger?.closeMenu()">
{{'USAGE-LIMIT-LISTING.FILTER.CANCEL' | translate}}
</button>
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
<button mat-flat-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
{{'USAGE-LIMIT-LISTING.FILTER.APPLY-FILTERS' | translate}}
</button>
</div>

2
frontend/src/app/ui/admin/usage-limit/listing/usage-limit-listing.component.html
View File

@ -8,7 +8,7 @@
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn secondary"
<button mat-flat-button color="accent" class="padded-shadow-btn"
*ngIf="authService.hasPermission(authService.permissionEnum.EditUsageLimit)"
[routerLink]="routerUtils.generateUrl(['/usage-limits/new'])">
<mat-icon>add</mat-icon>

12
frontend/src/app/ui/admin/user/listing/filters/user-listing-filters.component.html
View File

@ -1,19 +1,19 @@
<div class="d-flex align-items-center gap-1-rem">
<div class="d-flex align-items-center gap-1-rem listing-filters">
<button mat-flat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<button mat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<mat-icon aria-hidden="false" [matBadgeHidden]="!appliedFilterCount" [matBadge]="appliedFilterCount" matBadgeColor="warn" matBadgeSize="small">filter_alt</mat-icon>
{{'COMMONS.LISTING-COMPONENT.SEARCH-FILTER-BTN' | translate}}
</button>
<mat-menu #filterMenu>
<div class="container-fluid" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="container-fluid filter-container" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="row justify-content-between">
<div class="col-auto mt-2">
<h4>{{'USER-LISTING.FILTER.TITLE' | translate}}</h4>
</div>
<div class="col-auto">
<button color="accent" mat-button (click)="clearFilters()">
<button color="primary" mat-button (click)="clearFilters()">
{{'COMMONS.LISTING-COMPONENT.CLEAR-ALL-FILTERS' | translate}}
</button>
</div>
@ -47,12 +47,12 @@
<div class="row justify-content-end align-items-center mt-4 mb-1 gap-1-rem">
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary" (click)="filterMenuTrigger?.closeMenu()">
<button mat-flat-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger?.closeMenu()">
{{'USER-LISTING.FILTER.CANCEL' | translate}}
</button>
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary-inverted" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
<button mat-stroked-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
{{'USER-LISTING.FILTER.APPLY-FILTERS' | translate}}
</button>
</div>

2
frontend/src/app/ui/admin/user/listing/user-listing.component.html
View File

@ -12,7 +12,7 @@
</button>
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn secondary" (click)="export()" *ngIf="authService.hasPermission(authService.permissionEnum.ExportUsers)">
<button mat-flat-button color="accent" class="padded-shadow-btn" (click)="export()" *ngIf="authService.hasPermission(authService.permissionEnum.ExportUsers)">
<mat-icon>download</mat-icon>
{{'USER-LISTING.ACTIONS.EXPORT' | translate}}
</button>

4
frontend/src/app/ui/description/editor/description-form/components/form-field-set/field-set-title/field-set-title.component.scss
View File

@ -21,9 +21,9 @@ h6 {
font-weight: 400;
}
.more { //TODO mchouliara link
.more {
text-decoration: underline;
color: var(--sys-tertiary);
color: var(--link-color);
cursor: pointer;
font-size: 1rem;
font-weight: 400;

4
frontend/src/app/ui/plan/listing/listing-item/plan-listing-item.component.scss
View File

@ -43,9 +43,9 @@ p {
color: #0d7489;
}
.more-horiz { //TODO mchouliara link
.more-horiz {
font-size: 28px;
color: var(--gray);
color: var(--link-color);
}
.published-icon {

4
frontend/src/app/ui/plan/listing/plan-listing.component.scss
View File

@ -51,9 +51,9 @@
padding: 0px;
}
.more-horiz { //TODO mchouliara link
.more-horiz {
font-size: 28px;
color: var(--gray);
color: var(--link-color);
}
.more-icon :hover {

8
frontend/src/app/ui/plan/new/start-new-plan-dialogue/start-new-plan-dialog.component.html
View File

@ -15,24 +15,20 @@
</div>
<div class="col-12">
<div class="d-flex flex-wrap gap-half-rem justify-content-between align-items-center">
<div class="import-file">
<button mat-button type="button" class="padded-shadow-btn upload-btn d-flex flex-row align-items-center" (click)="uploadFile($event)">
<button mat-button type="button" class="import-file padded-shadow-btn upload-btn d-flex flex-row align-items-center" (click)="uploadFile($event)">
<mat-icon class="pr-2">file_upload</mat-icon>
{{ 'START-NEW-PLAN-DIALOG.IMPORT-FROM-FILE' | translate }}
</button>
</div>
<div class="pt-1 pb-1">
{{ 'START-NEW-PLAN-DIALOG.OR' | translate }}
</div>
<div class="start-wizard">
<button mat-flat-button color="primary" class="padded-shadow-btn font-weight-bold d-flex flex-row align-items-center" (click)="startWizard()">
<button mat-flat-button color="primary" class="start-wizard padded-shadow-btn font-weight-bold d-flex flex-row align-items-center" (click)="startWizard()">
<mat-icon>chevron_right</mat-icon>
{{ 'START-NEW-PLAN-DIALOG.START-NEW-PLAN' | translate }}
</button>
</div>
</div>
</div>
</div>
<div class="d-flex justify-content-between pt-4">
<div class="pr-2">

12
frontend/src/notification-service/ui/admin/notification-template/listing/filters/notification-template-listing-filters.component.html
View File

@ -1,19 +1,19 @@
<div class="d-flex align-items-center gap-1-rem">
<div class="d-flex align-items-center gap-1-rem listing-filters">
<button mat-flat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<button mat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<mat-icon aria-hidden="false" [matBadgeHidden]="!appliedFilterCount" [matBadge]="appliedFilterCount" matBadgeColor="warn" matBadgeSize="small">filter_alt</mat-icon>
{{'COMMONS.LISTING-COMPONENT.SEARCH-FILTER-BTN' | translate}}
</button>
<mat-menu #filterMenu>
<div class="container-fluid" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="container-fluid filter-container" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="row justify-content-between">
<div class="col-auto mt-2">
<h4>{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-LISTING.FILTER.TITLE' | translate}}</h4>
</div>
<div class="col-auto">
<button color="accent" mat-button (click)="clearFilters()">
<button color="primary" mat-button (click)="clearFilters()">
{{'COMMONS.LISTING-COMPONENT.CLEAR-ALL-FILTERS' | translate}}
</button>
</div>
@ -64,12 +64,12 @@
<div class="row justify-content-end align-items-center mt-4 mb-1 gap-1-rem">
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary-inverted" (click)="filterMenuTrigger?.closeMenu()">
<button mat-stroked-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger?.closeMenu()">
{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-LISTING.FILTER.CANCEL' | translate}}
</button>
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
<button mat-flat-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
{{'NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-LISTING.FILTER.APPLY-FILTERS' | translate}}
</button>
</div>

2
frontend/src/notification-service/ui/admin/notification-template/listing/notification-template-listing.component.html
View File

@ -7,7 +7,7 @@
<app-navigation-breadcrumb />
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn secondary"
<button mat-flat-button color="accent" class="padded-shadow-btn"
*ngIf="authService.hasPermission(authService.permissionEnum.EditNotificationTemplate)"
[routerLink]="routerUtils.generateUrl(['/notification-templates/new'])">
<mat-icon>add</mat-icon>

12
frontend/src/notification-service/ui/admin/notification/filters/notification-listing-filters.component.html
View File

@ -1,19 +1,19 @@
<div class="d-flex align-items-center gap-1-rem">
<div class="d-flex align-items-center gap-1-rem listing-filters">
<button mat-flat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<button mat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<mat-icon aria-hidden="false" [matBadgeHidden]="!appliedFilterCount" [matBadge]="appliedFilterCount" matBadgeColor="warn" matBadgeSize="small">filter_alt</mat-icon>
{{'COMMONS.LISTING-COMPONENT.SEARCH-FILTER-BTN' | translate}}
</button>
<mat-menu #filterMenu>
<div class="container-fluid" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="container-fluid filter-container" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="row justify-content-between">
<div class="col-auto mt-2">
<h4>{{'NOTIFICATION-SERVICE.NOTIFICATION-LISTING.FILTER.TITLE' | translate}}</h4>
</div>
<div class="col-auto">
<button color="accent" mat-button (click)="clearFilters()">
<button color="primary" mat-button (click)="clearFilters()">
{{'COMMONS.LISTING-COMPONENT.CLEAR-ALL-FILTERS' | translate}}
</button>
</div>
@ -96,12 +96,12 @@
<div class="row justify-content-end align-items-center mt-4 mb-1 gap-1-rem">
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary-inverted" (click)="filterMenuTrigger?.closeMenu()">
<button mat-stroked-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger?.closeMenu()">
{{'NOTIFICATION-SERVICE.NOTIFICATION-LISTING.FILTER.CANCEL' | translate}}
</button>
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
<button mat-flat-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
{{'NOTIFICATION-SERVICE.NOTIFICATION-LISTING.FILTER.APPLY-FILTERS' | translate}}
</button>
</div>

12
frontend/src/notification-service/ui/inapp-notification/listing/filters/mine-inapp-notification-listing-filters.component.html
View File

@ -1,19 +1,19 @@
<div class="d-flex align-items-center gap-1-rem">
<div class="d-flex align-items-center gap-1-rem listing-filters">
<button mat-flat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<button mat-button [matMenuTriggerFor]="filterMenu" #filterMenuTrigger="matMenuTrigger" (click)="updateFilters()" class="filter-button">
<mat-icon aria-hidden="false" [matBadgeHidden]="!appliedFilterCount" [matBadge]="appliedFilterCount" matBadgeColor="warn" matBadgeSize="small">filter_alt</mat-icon>
{{'COMMONS.LISTING-COMPONENT.SEARCH-FILTER-BTN' | translate}}
</button>
<mat-menu #filterMenu>
<div class="container-fluid" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="container-fluid filter-container" [class.accessibility-theme]="accessibilityTheme()" (click)="$event?.stopPropagation?.()">
<div class="row justify-content-between">
<div class="col-auto mt-2">
<h4>{{'NOTIFICATION-SERVICE.INAPP-NOTIFICATION-LISTING.FILTER.TITLE' | translate}}</h4>
</div>
<div class="col-auto">
<button color="accent" mat-button (click)="clearFilters()">
<button color="primary" mat-button (click)="clearFilters()">
{{'COMMONS.LISTING-COMPONENT.CLEAR-ALL-FILTERS' | translate}}
</button>
</div>
@ -42,12 +42,12 @@
<div class="row justify-content-end align-items-center mt-4 mb-1 gap-1-rem">
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary-inverted" (click)="filterMenuTrigger?.closeMenu()">
<button mat-stroked-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger?.closeMenu()">
{{'NOTIFICATION-SERVICE.INAPP-NOTIFICATION-LISTING.FILTER.CANCEL' | translate}}
</button>
</div>
<div class="col-auto">
<button mat-button class="padded-shadow-btn primary" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
<button mat-flat-button color="primary" class="padded-shadow-btn" (click)="filterMenuTrigger.closeMenu(); applyFilters();">
{{'NOTIFICATION-SERVICE.INAPP-NOTIFICATION-LISTING.FILTER.APPLY-FILTERS' | translate}}
</button>
</div>

168
frontend/src/styles.scss
View File

@ -110,10 +110,10 @@
@import './material-theme.scss';
//<!-------- m3 styles overwrites ------------>
.mat-mdc-menu-panel{
background-color: #ffffff !important;
}
//m3 styles overwrites
.mat-mdc-mini-fab {
border-radius: 50% !important;
}
@ -127,9 +127,19 @@
border-left-color: var(--mat-standard-button-toggle-selected-state-background-color);
}
}
.mdc-icon-button {
line-height: 1 !important;
}
.mat-primary.mat-mdc-outlined-button:not(:disabled){
border-color: var(--sys-primary);
}
.mat-warn.mat-mdc-outlined-button:not(:disabled){
border-color: var(--sys-error);
}
.mat-unthemed.mat-mdc-outlined-button:not(:disabled) {
color: var(--sys-on-surface);
border-color: var(--sys-outline);
}
.mat-divider.mat-divider-vertical{
border-right-color: rgba(0, 0, 0, .12) !important;
}
@ -146,14 +156,31 @@
}
}
}
// $mat-accessibility-theme: mat.m2-define-light-theme((color: (primary: $mat-theme-primary,
// accent: $mat-theme-accent,
// warn: $mat-theme-warn),
// typography: $mat-accessibility-typography,
// density: $mat-density));
.mat-mdc-slide-toggle .mdc-switch {
transform: scale(0.75);
}
// @include mat.all-component-themes($mat-core-theme);
a {
color: var(--link-color);
&:hover {
color: var(--sys-primary);
text-decoration: none;
}
&.color-unset {
color: #000000;
}
& .material-icons { //_misc.scss
vertical-align: middle;
}
}
.card {
border: 0;
}
//<!-------- ------------>
//<!------- TEXT SIZE TOGGLE STYLES ------>
.accessibility-theme {
// change individual classes set in components' scss
@ -177,25 +204,9 @@
font-size: 1.255rem !important;
}
}
//<!-------- ------------>
a {
color: var(--link-color);
&:hover {
color: var(--sys-primary);
text-decoration: none;
}
&.color-unset {
color: #000000;
}
& .material-icons { //_misc.scss
vertical-align: middle;
}
}
.card {
border: 0;
}
//TODO: angular update @import '../node_modules/dragula/dist/dragula.css';
/* in-flight clone */
@ -256,93 +267,6 @@ a {
.text-danger{
color: var(--sys-error)
}
// .listing-item {
// margin-top: 0.5em;
// padding: 0.5em;
// cursor: pointer;
// border: 3px solid #f2f2f2;
// .title {
// color: black;
// }
// .grant-title {
// color: rgb(93, 125, 173);
// }
// .gray-icon {
// color: rgb(191, 191, 191);
// }
// .chip {
// padding: 0.1em 1em;
// border-radius: 10em;
// background-color: #0d7489;
// color: #fff;
// text-transform: uppercase;
// font-weight: 500;
// max-width: 160px;
// white-space: nowrap;
// overflow: hidden;
// text-overflow: ellipsis;
// }
// .bordered-chip {
// padding: 0.1em 1em;
// border: 0.1em solid rgb(218, 227, 243);
// border-radius: 10em;
// background-color: rgb(236, 241, 249);
// color: var(--sys-primary);
// text-transform: uppercase;
// font-weight: 500;
// max-width: 160px;
// white-space: nowrap;
// overflow: hidden;
// text-overflow: ellipsis;
// }
// .squared-chip {
// padding: 0.1em 1em;
// border: 0.1em solid rgb(236, 241, 249);
// border-radius: 0.5em;
// background-color: rgb(246, 246, 246);
// color: rgb(127, 127, 127);
// max-width: 160px;
// white-space: nowrap;
// overflow: hidden;
// text-overflow: ellipsis;
// }
// mat-icon {
// width: auto;
// height: auto;
// }
// .mr-5 {
// margin-right: 2rem !important;
// }
// .info {
// background-color: #f6f6f6;
// padding: 8px 15px;
// margin-bottom: 15px;
// }
// .info p {
// margin-bottom: 0px;
// color: rgb(37, 35, 140);
// font-weight: 600;
// }
// .chip p {
// margin-bottom: 0px;
// }
// h4 span {
// color: #089dbb;
// font-weight: 600;
// }
// }
.listing {
.mat-card {
@ -412,11 +336,6 @@ a {
}
.text-primary-blue {
color: var(--sys-primary);
}
.translateY-3 {
transform: translateY(3px);
}
@ -501,6 +420,15 @@ a {
@include mat.all-component-densities(-10);
}
.listing-filters {
.mat-mdc-button.filter-button {
color: var(--sys-color-on-surface);
}
}
.filter-container {
padding: 0.5rem 1rem;
}
button, .mdc-button, .mat-mdc-button, .mdc-button:has(.material-icons,mat-icon,[matButtonIcon]), .md-button, .mat-mdc-button:not(:disabled) {
&.inverted-stroked-btn{
border: 1px solid var(--sys-on-primary);
@ -743,11 +671,3 @@ ul.unstyled-list {
padding: 0 !important;
}
}
// .mat-checkbox-checked.mat-accent .mat-checkbox-background, .mat-checkbox-indeterminate.mat-accent .mat-checkbox-background {
// background-color: var(--sys-primary-3);
// }
// .mat-checkbox-disabled.mat-checkbox-checked .mat-checkbox-background, .mat-checkbox-disabled.mat-checkbox-indeterminate .mat-checkbox-background {
// background-color: #b0b0b0;
// } //make them work