From c74b696a6e58fe490e88f3972863ca156c562d7f Mon Sep 17 00:00:00 2001 From: mihai sirghe <32762007+smihai78@users.noreply.github.com> Date: Fri, 3 Nov 2017 15:06:54 +0200 Subject: [PATCH] =?UTF-8?q?[ADF-1784]=20-=20[Mobile]=20-=20Empty=20folder?= =?UTF-8?q?=20image=20should=20not=20display=20drag=20an=E2=80=A6=20(#2600?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [ADF-1784] - [Mobile] - Empty folder image should not display drag and drop image Fixed * [ADF-1784] - [Mobile] Empty folder image should not display drag and drop image Also, for process-lis-component, i added a small fix for the image size when viewed with small screen devices --- ng2-components/ng2-activiti-processlist/index.ts | 4 +++- .../src/components/process-attachment-list.component.html | 4 ++-- .../src/components/process-attachment-list.component.scss | 6 ++++++ .../src/components/task-attachment-list.component.html | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ng2-components/ng2-activiti-processlist/index.ts b/ng2-components/ng2-activiti-processlist/index.ts index 4b36499a48..688c4527d3 100644 --- a/ng2-components/ng2-activiti-processlist/index.ts +++ b/ng2-components/ng2-activiti-processlist/index.ts @@ -16,6 +16,7 @@ */ import { NgModule } from '@angular/core'; +import { FlexLayoutModule } from '@angular/flex-layout'; import { MatButtonModule, MatCardModule, @@ -127,7 +128,8 @@ export const ACTIVITI_PROCESSLIST_PROVIDERS: [any] = [ MatCardModule, MatInputModule, MatChipsModule, - MatSelectModule + MatSelectModule, + FlexLayoutModule ], declarations: [ ...ACTIVITI_PROCESSLIST_DIRECTIVES diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html index d2aaf865d4..ed072cf7ca 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html @@ -4,8 +4,8 @@
{{'ADF_PROCESS_LIST.PROCESS-ATTACHMENT.EMPTY.HEADER' | translate}}
-
{{'ADF_PROCESS_LIST.PROCESS-ATTACHMENT.EMPTY.DRAG-AND-DROP.TITLE' | translate}}
-
{{'ADF_PROCESS_LIST.PROCESS-ATTACHMENT.EMPTY.DRAG-AND-DROP.SUBTITLE' | translate}}
+
{{'ADF_PROCESS_LIST.PROCESS-ATTACHMENT.EMPTY.DRAG-AND-DROP.TITLE' | translate}}
+
{{'ADF_PROCESS_LIST.PROCESS-ATTACHMENT.EMPTY.DRAG-AND-DROP.SUBTITLE' | translate}}
diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.scss b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.scss index d940d339ca..e458e82b1c 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.scss +++ b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.scss @@ -1,3 +1,5 @@ +@import '~@angular/material/theming'; + adf-datatable ::ng-deep th span { color: #232323; } @@ -45,4 +47,8 @@ adf-datatable ::ng-deep .data-cell { height: 161px; object-fit: contain; margin-top: 17px; + + @media screen and ($mat-xsmall) { + width: 250px; + } } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.html b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.html index 4292cf5ac1..2188fbbc14 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.html @@ -3,8 +3,8 @@
{{'ADF_TASK_LIST.ATTACHMENT.EMPTY.HEADER' | translate}}
-
{{'ADF_TASK_LIST.ATTACHMENT.EMPTY.DRAG-AND-DROP.TITLE' | translate}}
-
{{'ADF_TASK_LIST.ATTACHMENT.EMPTY.DRAG-AND-DROP.SUBTITLE' | translate}}
+
{{'ADF_TASK_LIST.ATTACHMENT.EMPTY.DRAG-AND-DROP.TITLE' | translate}}
+
{{'ADF_TASK_LIST.ATTACHMENT.EMPTY.DRAG-AND-DROP.SUBTITLE' | translate}}