[ACA-2147] toolbar clean css - fix colors (#1114)

* [ACA-2147] toolbar clean css - fix colors

* [ACA-1619] keep aspect properties config example

* [ACA-2147] keep toolbar color setting in custom-theme

* remove dist folder from travis cache

* build dist folder before each suite

* remove no longer needed 'Prepare dist cache' since dist cache was disabled
This commit is contained in:
Suzana Dirla 2019-05-21 18:38:19 +03:00 committed by Denys Vuika
parent 1928aa0b1b
commit eb1e8c8fa1
9 changed files with 42 additions and 22 deletions

View File

@ -11,7 +11,6 @@ node_js:
cache:
directories:
- node_modules
- dist
before_install:
- sudo /etc/init.d/postgresql stop
@ -33,18 +32,16 @@ jobs:
script:
- npm run test:ci
- bash <(curl -s https://codecov.io/bash) -X gcov
- name: 'Prepare dist cache'
script: npm run build.e2e
- stage: e2e
name: Test Suite appNavigation
script: SUITE="--suite authentication,listViews,navigation,application,pagination" npm run e2e:docker
script: npm run build.e2e && SUITE="--suite authentication,listViews,navigation,application,pagination" npm run e2e:docker
- name: Test Suite search&actionsAvailable
script: SUITE="--suite search,actionsAvailable" npm run e2e:docker
script: npm run build.e2e && SUITE="--suite search,actionsAvailable" npm run e2e:docker
- name: Test Suite addRemoveContent
script: SUITE="--suite addRemoveContent" npm run e2e:docker
script: npm run build.e2e && SUITE="--suite addRemoveContent" npm run e2e:docker
- name: Test Suite manageContent
script: SUITE="--suite manageContent" npm run e2e:docker
script: npm run build.e2e && SUITE="--suite manageContent" npm run e2e:docker
- name: Test Suite sharingContent&markFavorite
script: SUITE="--suite sharingContent" npm run e2e:docker
script: npm run build.e2e && SUITE="--suite sharingContent" npm run e2e:docker
- name: Test Suite viewContent&metadata&extensions
script: SUITE="--suite viewer,infoDrawer,extensions" npm run e2e:docker
script: npm run build.e2e && SUITE="--suite viewer,infoDrawer,extensions" npm run e2e:docker

View File

@ -132,7 +132,20 @@
"items": [
{
"aspect": "exif:exif",
"properties": "*"
"properties": [
"exif:pixelXDimension",
"exif:pixelYDimension",
"exif:dateTimeOriginal",
"exif:exposureTime",
"exif:fNumber",
"exif:flash",
"exif:focalLength",
"exif:isoSpeedRatings",
"exif:orientation",
"exif:manufacturer",
"exif:model",
"exif:software"
]
}
]
}

View File

@ -36,7 +36,7 @@ import {
template: `
<button
mat-icon-button
[color]="(infoDrawerOpened$ | async) ? 'accent' : 'primary'"
[color]="(infoDrawerOpened$ | async) ? 'primary' : ''"
[attr.title]="'APP.ACTIONS.DETAILS' | translate"
(click)="onClick()"
>

View File

@ -45,7 +45,7 @@ export class ToolbarActionComponent implements DoCheck {
type = 'icon-button';
@Input()
color = 'primary';
color = '';
@Input()
actionRef: ContentActionRef;

View File

@ -43,7 +43,7 @@ export class ToolbarButtonComponent {
type: ToolbarButtonType = ToolbarButtonType.ICON_BUTTON;
@Input()
color = 'primary';
color = '';
@Input()
actionRef: ContentActionRef;

View File

@ -37,7 +37,7 @@ export class ToolbarMenuComponent {
actionRef: ContentActionRef;
@Input()
color = 'primary';
color = '';
get hasChildren(): boolean {
return (

View File

@ -11,7 +11,6 @@
@import '../components/create-menu/create-menu.component.scss';
@import '../components/layout/layout.theme.scss';
@import './overrides/adf-toolbar.theme';
@import 'overrides/adf-layout-container.theme';
@import './overrides/adf-document-list.theme';
@ -60,7 +59,6 @@ $foreground: map-get($custom-theme, foreground);
$warn: map-get($custom-theme, warn);
@mixin custom-theme($theme) {
@include custom-adf-toolbar-theme($theme);
@include adf-document-list-theme($theme);
@include layout-theme($theme);
@ -73,6 +71,10 @@ $warn: map-get($custom-theme, warn);
@include aca-current-user-theme($theme);
@include aca-context-menu-theme($theme);
@include app-create-menu-theme($theme);
.mat-toolbar {
color: var(--theme-text-color, rgba(0, 0, 0, 0.54));
}
}
//Custom variables - ACA specific styling:

View File

@ -1,5 +0,0 @@
@mixin custom-adf-toolbar-theme($theme) {
.adf-toolbar {
@include mat-button-theme($theme);
}
}

View File

@ -1050,7 +1050,20 @@
{
"id": "app.content.metadata.exifAspect",
"aspect": "exif:exif",
"properties": "*"
"properties": [
"exif:pixelXDimension",
"exif:pixelYDimension",
"exif:dateTimeOriginal",
"exif:exposureTime",
"exif:fNumber",
"exif:flash",
"exif:focalLength",
"exif:isoSpeedRatings",
"exif:orientation",
"exif:manufacturer",
"exif:model",
"exif:software"
]
}
]
}