From b6072f806a8255e5cc227e61fafaafee94c9a327 Mon Sep 17 00:00:00 2001
From: davidcanonieto <david.cano.nieto@gmail.com>
Date: Tue, 28 Apr 2020 08:50:06 +0100
Subject: [PATCH] [ADF-5129][ADF-5130] Fix Lock in Gallery view and Lock Dialog
 (#5646)

---
 .../app/components/files/files.component.scss |  3 +-
 .../src/lib/dialogs/node-lock.dialog.html     |  2 +-
 .../components/document-list.component.scss   | 36 +++++++++++++------
 .../datatable/datatable.component.scss        |  5 +++
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/demo-shell/src/app/components/files/files.component.scss b/demo-shell/src/app/components/files/files.component.scss
index c8399a90e9..79bb0c0db7 100644
--- a/demo-shell/src/app/components/files/files.component.scss
+++ b/demo-shell/src/app/components/files/files.component.scss
@@ -29,8 +29,9 @@
         }
     }
 
-    .app-datatable-card .app-lock-button {
+    .adf-datatable-card .app-lock-button {
         top: -10px;
+        position: absolute;
     }
 
     .app-site-container-style {
diff --git a/lib/content-services/src/lib/dialogs/node-lock.dialog.html b/lib/content-services/src/lib/dialogs/node-lock.dialog.html
index 43f12ee5b7..087dd1aeac 100644
--- a/lib/content-services/src/lib/dialogs/node-lock.dialog.html
+++ b/lib/content-services/src/lib/dialogs/node-lock.dialog.html
@@ -5,7 +5,7 @@
 <mat-dialog-content>
     <br />
     <form [formGroup]="form" (submit)="submit()">
-        <mat-checkbox  data-automation-id="adf-lock-node-checkbox" class="adf-lock-file-name" [formControl]="form.controls['isLocked']" ngDefaultControl>
+        <mat-checkbox  data-automation-id="adf-lock-node-checkbox" class="adf-lock-file-name" matTooltip="{{ nodeName }}" [formControl]="form.controls['isLocked']" ngDefaultControl>
             {{ 'CORE.FILE_DIALOG.FILE_LOCK_CHECKBOX' | translate }} <strong>"{{ nodeName }}"</strong>
         </mat-checkbox>
 
diff --git a/lib/content-services/src/lib/document-list/components/document-list.component.scss b/lib/content-services/src/lib/document-list/components/document-list.component.scss
index 15117e3b0b..aae8c1b5af 100644
--- a/lib/content-services/src/lib/document-list/components/document-list.component.scss
+++ b/lib/content-services/src/lib/document-list/components/document-list.component.scss
@@ -25,10 +25,22 @@
         overflow-y: auto;
     }
 
-    .adf-datatable-selected > svg {
-        fill: $document-list-selection-color;
-        width: 32px;
-        height: 32px;
+    .adf-datatable-card {
+        .adf-datatable-selected > svg {
+            fill: $document-list-selection-color;
+            width: 30px;
+            height: 30px;
+            position: absolute;
+            top: 10px;
+        }
+    }
+
+    .adf-datatable-list {
+        .adf-datatable-selected > svg {
+            fill: $document-list-selection-color;
+            width: 30px;
+            height: 30px;
+        }
     }
 
     .adf-document-list_empty_template {
@@ -175,21 +187,23 @@
             height: 300px !important;
 
             img {
-                height: 100px;
+                height: 130px;
             }
 
-            :first-child .adf-cell-container .adf-cell-value {
-                display: flex;
-                width: 265px;
-                flex: 0 0 auto;
-                justify-content: center;
+            .adf-datatable-cell {
+                overflow: visible;
             }
 
-            .adf-datatable-cell.adf-datatable-table-cell.adf-datatable-cell--image {
+            .adf-datatable-cell.adf-datatable-cell--image {
                 flex: 0 0 auto;
                 display: flex;
                 flex-direction: column-reverse;
                 justify-content: space-between;
+
+                .adf-cell-value {
+                    display: flex;
+                    justify-content: center;
+                }
             }
         }
     }
diff --git a/lib/core/datatable/components/datatable/datatable.component.scss b/lib/core/datatable/components/datatable/datatable.component.scss
index 59b381951f..cd60570ceb 100644
--- a/lib/core/datatable/components/datatable/datatable.component.scss
+++ b/lib/core/datatable/components/datatable/datatable.component.scss
@@ -111,6 +111,10 @@
                 }
             }
 
+            .adf-datatable-cell--image {
+                margin-left: 8px;
+            }
+
             .adf-datatable-cell {
                 text-align: left;
                 flex: 0 1 24%;
@@ -144,6 +148,7 @@
                 height: 42px !important;
                 width: 42px !important;
                 right: 0;
+                top: 4px;
             }
 
             .adf-image-table-cell {