From 79b020b97e4d185242382c8c786da79f737c5747 Mon Sep 17 00:00:00 2001
From: aignatov-bio <aignatov@biosistemika.com>
Date: Tue, 14 Jan 2020 11:39:15 +0100
Subject: [PATCH] Update table header color and update checkboxes

---
 .../repositories/repository_datatable.js      |  2 +-
 app/assets/stylesheets/extend/datatable.scss  | 54 +++++++++++++++++++
 app/assets/stylesheets/repositories.scss      |  8 ++-
 .../repository/repository_table.scss          |  4 +-
 .../shared_styles/elements/checkboxes.scss    |  4 +-
 app/assets/stylesheets/themes/scinote.scss    | 45 ----------------
 .../repositories/_repository_table.html.erb   |  5 +-
 7 files changed, 71 insertions(+), 51 deletions(-)
 create mode 100644 app/assets/stylesheets/extend/datatable.scss

diff --git a/app/assets/javascripts/repositories/repository_datatable.js b/app/assets/javascripts/repositories/repository_datatable.js
index 1a676030f..c1b399e85 100644
--- a/app/assets/javascripts/repositories/repository_datatable.js
+++ b/app/assets/javascripts/repositories/repository_datatable.js
@@ -413,7 +413,7 @@ var RepositoryDatatable = (function(global) {
         className: 'dt-body-center',
         sWidth: '1%',
         render: function() {
-          return "<input class='repository-row-selector' type='checkbox'>";
+          return "<input class='repository-row-selector sci-checkbox' type='checkbox'><span class='sci-checkbox-label'></span>";
         }
       }, {
         // Assigned column is not searchable
diff --git a/app/assets/stylesheets/extend/datatable.scss b/app/assets/stylesheets/extend/datatable.scss
new file mode 100644
index 000000000..c967e06ef
--- /dev/null
+++ b/app/assets/stylesheets/extend/datatable.scss
@@ -0,0 +1,54 @@
+// scss-lint:disable SelectorDepth QualifyingElement NestingDepth
+// Data table
+
+.table.dataTable {
+  table-layout: initial;
+  text-overflow: initial;
+  width: 100%;
+  word-break: initial;
+
+  thead {
+    background-color: $color-concrete;
+
+    tr {
+      th {
+        border-bottom-width: 0;
+        border-left: 2px solid $color-white;
+        font-weight: bold;
+
+        &::after {
+          color: $color-silver-chalice;
+          font-weight: normal;
+          opacity: 1;
+        }
+
+        &:first-child {
+          border-left: 0;
+        }
+      }
+
+      th,
+      td {
+        padding: 8px;
+      }
+    }
+  }
+
+  tbody {
+    tr {
+      &.selected,
+      .selected {
+        background-color: $color-alto;
+      }
+    }
+  }
+
+  .sorting_desc,
+  .sorting_asc {
+    background-color: $color-alto;
+
+    &::after {
+      color: $color-volcano;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/repositories.scss b/app/assets/stylesheets/repositories.scss
index 24b57394d..b9965aadf 100644
--- a/app/assets/stylesheets/repositories.scss
+++ b/app/assets/stylesheets/repositories.scss
@@ -130,6 +130,12 @@
         }
       }
     }
+
+    .dataTables_scrollBody {
+      thead {
+        opacity: 0;
+      }
+    }
   }
 
   .pagination-row {
@@ -140,7 +146,7 @@
     display: flex;
     height: 68px;
     left: var(--repository-sidebar-margin);
-    padding: 0 32px;
+    padding: 0 142px 0 32px;
     position: fixed;
     transition: .4s;
     width: calc(100% - var(--repository-sidebar-margin));
diff --git a/app/assets/stylesheets/repository/repository_table.scss b/app/assets/stylesheets/repository/repository_table.scss
index 5e2d4854d..06ab58077 100644
--- a/app/assets/stylesheets/repository/repository_table.scss
+++ b/app/assets/stylesheets/repository/repository_table.scss
@@ -43,7 +43,7 @@
     }
 
     .assign-counter-container {
-      border-radius: 2px;
+      border-radius: $border-radius-tag;
       cursor: pointer;
       display: inline-block;
       height: calc(100% - 2px);
@@ -103,6 +103,7 @@
         .repository-row-edit-icon {
           display: inline-block;
         }
+
         .assign-counter-container {
           margin-left: 0;
         }
@@ -121,6 +122,7 @@
           .repository-row-edit-icon {
             display: none;
           }
+
           .assign-counter-container {
             margin-left: 30px;
           }
diff --git a/app/assets/stylesheets/shared_styles/elements/checkboxes.scss b/app/assets/stylesheets/shared_styles/elements/checkboxes.scss
index c7cee3baa..66dbe2cd5 100644
--- a/app/assets/stylesheets/shared_styles/elements/checkboxes.scss
+++ b/app/assets/stylesheets/shared_styles/elements/checkboxes.scss
@@ -18,8 +18,8 @@ input[type="checkbox"].sci-checkbox {
     display: inline-block;
     flex-shrink: 0;
     height: var(--sci-checkbox-size);
-    margin-left: calc((var(--sci-checkbox-size) * -1) - 3px);
-    position: relative;
+    margin-left: calc(var(--sci-checkbox-size) * -1);
+    position: absolute;
     width: var(--sci-checkbox-size);
 
     &::before {
diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss
index ab9b0e508..cac736281 100644
--- a/app/assets/stylesheets/themes/scinote.scss
+++ b/app/assets/stylesheets/themes/scinote.scss
@@ -1172,51 +1172,6 @@ ul.content-activities {
   width: 100%;
 }
 
-/* Data table */
-
-table.dataTable {
-  background-color: $color-alabaster;
-  table-layout: initial;
-  text-overflow: initial;
-  width: 100%;
-  word-break: initial;
-
-  thead {
-    background-color: $color-silver-chalice;
-  }
-
-  thead > tr > th {
-    border-bottom-width: 0;
-    border-left: 2px solid $color-alabaster;
-    color: $color-white;
-    font-weight: normal;
-  }
-
-  thead > tr > th:first-child {
-    border-left: none;
-  }
-
-  thead > tr > th,
-  thead > tr > td {
-    padding: 8px;
-  }
-
-  tbody > tr.selected,
-  tbody > tr > .selected {
-    background-color: $color-alto !important;
-    color: $color-emperor !important;
-
-    a {
-      color: $brand-primary !important;
-    }
-  }
-
-  .sorting_desc,
-  .sorting_asc {
-    background-color: $brand-primary;
-  }
-}
-
 /* Helpers */
 .line-wrap {
   overflow: hidden;
diff --git a/app/views/repositories/_repository_table.html.erb b/app/views/repositories/_repository_table.html.erb
index 4bf674a66..195adb2b2 100644
--- a/app/views/repositories/_repository_table.html.erb
+++ b/app/views/repositories/_repository_table.html.erb
@@ -22,7 +22,10 @@
     data-editable="<%= can_manage_repository_rows?(repository) %>">
     <thead>
       <tr>
-        <th id="checkbox"><input name="select_all" value="1" type="checkbox"></th>
+        <th id="checkbox">
+            <input name="select_all" value="1" type="checkbox" class="sci-checkbox">
+            <span class="sci-checkbox-label"></span>
+        </th>
         <th id="assigned"><%= t("repositories.table.assigned") %></th>
         <th id="row-id"><%= t("repositories.table.id") %></th>
         <th id="row-name"><%= t("repositories.table.row_name") %></th>