inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-05-26 17:24:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove style wokarounds for viewer toolbar (#367)

Browse Source
This commit is contained in:
Denys Vuika 2018-05-25 09:37:27 +01:00 committed by GitHub
parent 1d9bf48f15
commit 8c3fed1066
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/components/preview/preview.component.html
View File

@ -37,19 +37,15 @@
mat-menu-item
#selection="adfFavorite"
[adf-node-favorite]="selectedEntities">
<mat-icon [ngClass]="{
'toolbar__option--active': selection.hasFavorites(),
'toolbar__option--default': !selection.hasFavorites()
}">
{{ selection.hasFavorites() ? 'star' :'star_border' }}
</mat-icon>
<mat-icon color="primary" *ngIf="selection.hasFavorites()">star</mat-icon>
<mat-icon *ngIf="!selection.hasFavorites()">star_border</mat-icon>
<span>{{ 'APP.ACTIONS.FAVORITE' | translate }}</span>
</button>
<button
mat-menu-item
[acaCopyNode]="selectedEntities">
<mat-icon color="primary">content_copy</mat-icon>
<mat-icon>content_copy</mat-icon>
<span>{{ 'APP.ACTIONS.COPY' | translate }}</span>
</button>
@ -57,7 +53,7 @@
mat-menu-item
*ngIf="permission.check(node, ['delete'])"
[acaMoveNode]="selectedEntities">
<mat-icon color="primary">library_books</mat-icon>
<mat-icon>library_books</mat-icon>
<span>{{ 'APP.ACTIONS.MOVE' | translate }}</span>
</button>
@ -65,7 +61,7 @@
mat-menu-item
*ngIf="permission.check(node, ['delete'])"
(click)="deleteFile()">
<mat-icon color="primary">delete</mat-icon>
<mat-icon>delete</mat-icon>
<span>{{ 'APP.ACTIONS.DELETE' | translate }}</span>
</button>
@ -73,7 +69,7 @@
mat-menu-item
*ngIf="permission.check(node, ['update'])"
[acaNodeVersions]="selectedEntities">
<mat-icon color="primary">history</mat-icon>
<mat-icon>history</mat-icon>
<span>{{ 'APP.ACTIONS.VERSIONS' | translate }}</span>
</button>
</adf-viewer-more-actions>

1
src/app/ui/application.scss
View File

@ -27,7 +27,6 @@ ng-component {
@import './overrides/alfresco-upload-button';
@import './overrides/alfresco-upload-dialog';
@import './overrides/toolbar';
@import './overrides/adf-viewer-more-actions';
@import './overrides/adf-info-drawer';
@import './overrides/_adf-sidebar-action-menu';

2
src/app/ui/custom-theme.scss
View File

@ -3,7 +3,6 @@
@import '../components/sidenav/sidenav.component.theme';
@import './overrides/toolbar';
@import './overrides/adf-viewer-more-actions';
$grey-scale: (
50 : #e0e0e0,
@ -48,5 +47,4 @@ $custom-theme: mat-light-theme($custom-theme-primary, $custom-theme-accent);
@mixin custom-theme($theme) {
@include sidenav-component-theme($custom-theme);
@include toolbar-component-theme($custom-theme);
@include viewer-more-actions-component-theme($custom-theme);
}

18
src/app/ui/overrides/_adf-viewer-more-actions.scss
View File

@ -1,18 +0,0 @@
@mixin viewer-more-actions-component-theme($theme) {
$primary: map-get($theme, primary);
$accent: map-get($theme, accent);
$background: map-get($theme, background);
.adf-viewer-more-actions {
@include angular-material-theme($theme);
.toolbar__option--active {
color: mat-color($accent) !important;
}
.toolbar__option--default {
color: mat-color($primary, .87) !important;
}
}
}