From 0997fe6732723eefe9872070fad9ee2f47f57eca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Tue, 2 Apr 2019 10:12:21 +0200
Subject: [PATCH] checkmark column removed

---
 .../editor/subheader/umb-editor-sub-header.less     |  1 +
 .../src/less/components/umb-checkmark.less          | 10 ++++++----
 .../src/views/users/views/users/users.html          | 13 ++-----------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
index 2e599252bb..169edbf7f4 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less
@@ -24,6 +24,7 @@
     padding-left: 10px;
     padding-right: 10px;
     background-color: @pinkLight;
+    border-color: @pinkLight;
     border-radius: 3px;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-checkmark.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-checkmark.less
index 75ac13bdd0..021fc8cc9b 100644
--- a/src/Umbraco.Web.UI.Client/src/less/components/umb-checkmark.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-checkmark.less
@@ -2,19 +2,21 @@
     border: 2px solid @white;
     width: 25px;
     height: 25px;
-    background: @gray-7;
-    border-radius: 50%;
+    border: 1px solid @gray-7;
+    border-radius: 3px;
     box-sizing: border-box;
     display: flex;
     justify-content: center;
     align-items: center;
-    color: @white;
+    color: @gray-7;
     cursor: pointer;
     font-size: 15px;
 }
 
 .umb-checkmark--checked {
-    background: @green;
+    background: @ui-active;
+    border-color: @ui-active;
+    color: @white;
 }
 
 .umb-checkmark--xs {
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
index 7fb036a57a..2991b7621b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
@@ -229,12 +229,11 @@
             <div class="umb-table umb-user-table" ng-class="{'-has-selection': vm.selection.length > 0}">
                 <div class="umb-table-head">
                     <div class="umb-table-row">
-                        <div class="umb-table-cell" style="padding-left: 10px; width: 10px;">
+                        <div class="umb-table-cell umb-user-table-col-avatar" style="width: 70px; padding:10px 15px;">
                             <a href="" style="text-decoration: none;" ng-click="vm.selectAll()">
                                 <umb-checkmark checked="vm.areAllSelected()" size="xs"></umb-checkmark>
                             </a>
                         </div>
-                        <div class="umb-table-cell umb-user-table-col-avatar" style="width: 70px;"></div>
                         <div class="umb-table-cell umb-table__name"><localize key="general_name">Name</localize></div>
                         <div class="umb-table-cell"><localize key="user_usergroup">User group</localize></div>
                         <div class="umb-table-cell"><localize key="user_lastLogin">Last login</localize></div>
@@ -246,15 +245,7 @@
                         ng-click="vm.selectUser(user, vm.selection, $event)"
                         ng-class="{'-selected': user.selected, '-selectable': vm.isSelectable(user)}"
                         class="umb-table-row umb-user-table-row">
-                        <div class="umb-table-cell" style="padding-left: 10px;">
-                            <div ng-if="!user.isCurrentUser">
-                                <umb-checkmark
-                                    checked="user.selected"
-                                    size="xs">
-                                </umb-checkmark>
-                            </div>
-                        </div>
-                        <div class="umb-table-cell umb-user-table-col-avatar" scope="row">
+                        <div class="umb-table-cell umb-user-table-col-avatar not-fixed" scope="row" style="padding-left: 10px;">
                             <a ng-click="vm.clickUser(user, $event)" ng-href="#{{::vm.getEditPath(user)}}">
                                 <umb-avatar
                                     size="xs"