Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 17 insertions, 4 deletions

diff --git a/app/assets/stylesheets/framework/tables.scss b/app/assets/stylesheets/framework/tables.scss
index 59e83608d9d..39d9e9a77f9 100644
--- a/app/assets/stylesheets/framework/tables.scss
+++ b/app/assets/stylesheets/framework/tables.scss
@@ -9,11 +9,15 @@ table {
   * This is a temporary workaround until we fix the neutral
   * color palette in https://gitlab.com/gitlab-org/gitlab/-/issues/213570
   *
-  * The overwrites here affected the security dashboard tables, when removing
-  * this code, table-th-transparent and original-text-color classes should
-  * be removed there.
+  * The overwrites here affected the following areas:
+  * - The security dashboard tables. When removing
+  *   this code, table-th-transparent and original-text-color classes should
+  *   be removed there.
+  * - The subscription seats table. When removing this code, the .seats-table
+  *   <th> and margin overrides should be removed there.
   *
   * Remove this code as soon as this happens
+  *
   */
   &.gl-table {
     @include gl-text-gray-500;
@@ -186,6 +190,7 @@ table {
     .checkbox {
       padding-left: $gl-spacing-scale-4;
       padding-right: 0;
+      width: 1px;
 
       + td,
       + th {
@@ -205,12 +210,20 @@ table {
       width: 10%;
     }
 
+    .description {
+      max-width: 0;
+    }
+
     .identifier {
       width: 16%;
     }
 
     .scanner {
-      width: 15%;
+      width: 10%;
+    }
+
+    .activity {
+      width: 5%;
     }
   }
 }