mirror of
https://github.com/Alfresco/alfresco-content-app.git
synced 2025-05-12 17:04:46 +00:00
[ACS-5166] UI fixes (#3287)
* fix menu positioning * fix update version script * change the menu icon * clean implementation for toolbar buttons
This commit is contained in:
parent
10935e9d54
commit
05906b878d
@ -273,7 +273,7 @@
|
|||||||
"title": "APP.HEADER.BUTTONS.CREATE",
|
"title": "APP.HEADER.BUTTONS.CREATE",
|
||||||
"description": "APP.HEADER.BUTTONS.CREATE_TOOLTIP",
|
"description": "APP.HEADER.BUTTONS.CREATE_TOOLTIP",
|
||||||
"data": {
|
"data": {
|
||||||
"menuType": "button"
|
"menuType": "stroked-button"
|
||||||
},
|
},
|
||||||
"children": [
|
"children": [
|
||||||
{
|
{
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
mat-icon-button
|
mat-icon-button
|
||||||
(click)="toggleClick()"
|
(click)="toggleClick()"
|
||||||
title="{{'APP.TOOLTIPS.EXPAND_NAVIGATION' | translate}}">
|
title="{{'APP.TOOLTIPS.EXPAND_NAVIGATION' | translate}}">
|
||||||
<mat-icon>menu</mat-icon>
|
<mat-icon>keyboard_double_arrow_right</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
<ng-content select="aca-page-layout-header"></ng-content>
|
<ng-content select="aca-page-layout-header"></ng-content>
|
||||||
</div>
|
</div>
|
||||||
|
@ -25,32 +25,13 @@
|
|||||||
|
|
||||||
.aca-toolbar-action {
|
.aca-toolbar-action {
|
||||||
.app-toolbar-menu {
|
.app-toolbar-menu {
|
||||||
.mat-button {
|
.mat-button-base {
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
border-radius: 6px;
|
|
||||||
height: 32px;
|
|
||||||
background: var(--theme-grey-text-background-color);
|
|
||||||
color: var(--theme-selected-text-color);
|
|
||||||
line-height: 32px;
|
|
||||||
|
|
||||||
.mat-button-wrapper {
|
|
||||||
display: flex;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.mat-flat-button {
|
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
height: 32px;
|
height: 32px;
|
||||||
line-height: 32px;
|
line-height: 32px;
|
||||||
|
|
||||||
.mat-button-wrapper {
|
|
||||||
display: flex;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
<adf-icon [value]="actionRef.icon"></adf-icon>
|
<adf-icon [value]="actionRef.icon"></adf-icon>
|
||||||
</button>
|
</button>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
<ng-container *ngSwitchCase="'flat-button'">
|
<ng-container *ngSwitchCase="'flat-button'">
|
||||||
<button
|
<button
|
||||||
[id]="actionRef.id"
|
[id]="actionRef.id"
|
||||||
@ -22,9 +23,24 @@
|
|||||||
[disabled]="actionRef.disabled"
|
[disabled]="actionRef.disabled"
|
||||||
(click)="runAction()"
|
(click)="runAction()"
|
||||||
>
|
>
|
||||||
<span *ngIf="actionRef.title" data-automation-id="flat-button-title">{{ actionRef.title | translate }}</span>
|
<span *ngIf="actionRef.title">{{ actionRef.title | translate }}</span>
|
||||||
</button>
|
</button>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
|
<ng-container *ngSwitchCase="'stroked-button'">
|
||||||
|
<button
|
||||||
|
[id]="actionRef.id"
|
||||||
|
[color]="data?.color || color"
|
||||||
|
mat-stroked-button
|
||||||
|
[attr.aria-label]="actionRef.description || actionRef.title | translate"
|
||||||
|
[attr.title]="actionRef.description || actionRef.title | translate"
|
||||||
|
[disabled]="actionRef.disabled"
|
||||||
|
(click)="runAction()"
|
||||||
|
>
|
||||||
|
<span *ngIf="actionRef.title">{{ actionRef.title | translate }}</span>
|
||||||
|
</button>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
<ng-container *ngSwitchCase="'menu-item'">
|
<ng-container *ngSwitchCase="'menu-item'">
|
||||||
<app-toolbar-menu-item [actionRef]="actionRef"></app-toolbar-menu-item>
|
<app-toolbar-menu-item [actionRef]="actionRef"></app-toolbar-menu-item>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
@ -30,6 +30,7 @@ import { ThemePalette } from '@angular/material/core';
|
|||||||
export enum ToolbarButtonType {
|
export enum ToolbarButtonType {
|
||||||
ICON_BUTTON = 'icon-button',
|
ICON_BUTTON = 'icon-button',
|
||||||
FLAT_BUTTON = 'flat-button',
|
FLAT_BUTTON = 'flat-button',
|
||||||
|
STROKED_BUTTON = 'stroked-button',
|
||||||
MENU_ITEM = 'menu-item'
|
MENU_ITEM = 'menu-item'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
[disabled]="actionRef.disabled"
|
[disabled]="actionRef.disabled"
|
||||||
#matTrigger="matMenuTrigger"
|
#matTrigger="matMenuTrigger"
|
||||||
>
|
>
|
||||||
<span *ngIf="actionRef.title" data-automation-id="mat-button-menu-item-title">{{ actionRef.title | translate }}</span>
|
<span *ngIf="actionRef.title">{{ actionRef.title | translate }}</span>
|
||||||
</button>
|
</button>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
@ -25,7 +25,22 @@
|
|||||||
[disabled]="actionRef.disabled"
|
[disabled]="actionRef.disabled"
|
||||||
#matTrigger="matMenuTrigger"
|
#matTrigger="matMenuTrigger"
|
||||||
>
|
>
|
||||||
<span *ngIf="actionRef.title" data-automation-id="mat-flat-button-menu-item-title">{{ actionRef.title | translate }}</span>
|
<span *ngIf="actionRef.title">{{ actionRef.title | translate }}</span>
|
||||||
|
</button>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<ng-container *ngSwitchCase="'stroked-button'">
|
||||||
|
<button
|
||||||
|
[id]="actionRef.id"
|
||||||
|
[color]="data?.color || color"
|
||||||
|
mat-stroked-button
|
||||||
|
[attr.aria-label]="actionRef.description || actionRef.title | translate"
|
||||||
|
[attr.title]="actionRef.description || actionRef.title | translate"
|
||||||
|
[matMenuTriggerFor]="menu"
|
||||||
|
[disabled]="actionRef.disabled"
|
||||||
|
#matTrigger="matMenuTrigger"
|
||||||
|
>
|
||||||
|
<span *ngIf="actionRef.title">{{ actionRef.title | translate }}</span>
|
||||||
</button>
|
</button>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
@ -45,7 +60,7 @@
|
|||||||
</ng-container>
|
</ng-container>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
<mat-menu #menu="matMenu" [overlapTrigger]="false">
|
<mat-menu #menu="matMenu" [overlapTrigger]="false" [xPosition]="'before'">
|
||||||
<ng-container *ngFor="let child of actionRef.children; trackBy: trackByActionId">
|
<ng-container *ngFor="let child of actionRef.children; trackBy: trackByActionId">
|
||||||
<ng-container [ngSwitch]="child.type">
|
<ng-container [ngSwitch]="child.type">
|
||||||
<ng-container *ngSwitchCase="'custom'">
|
<ng-container *ngSwitchCase="'custom'">
|
||||||
|
@ -7,6 +7,7 @@ eval libs=( "@alfresco/adf-core"
|
|||||||
"@alfresco/adf-extensions"
|
"@alfresco/adf-extensions"
|
||||||
"@alfresco/adf-testing"
|
"@alfresco/adf-testing"
|
||||||
"@alfresco/adf-cli"
|
"@alfresco/adf-cli"
|
||||||
|
"@alfresco/eslint-plugin-eslint-angular"
|
||||||
)
|
)
|
||||||
|
|
||||||
cd ${DIR}/..
|
cd ${DIR}/..
|
||||||
|
Loading…
x
Reference in New Issue
Block a user