grid.Container: SCSS cleanup #6395

neomjs · Feb 6, 2025 · cb30f9d · cb30f9d
1 parent 18a717b
commit cb30f9d
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 65 deletions.
diff --git a/resources/scss/src/grid/Container.scss b/resources/scss/src/grid/Container.scss
@@ -5,6 +5,20 @@
     overscroll-behavior: none;
     position           : relative;
 
+    .neo-grid-container {
+        border             : 1px solid var(--grid-container-border-color);
+        border-spacing     : 0;
+        color              : var(--grid-container-color);
+        font-size          : 13px;
+        font-weight        : 400;
+        height             : 100%;
+        line-height        : 19px;
+        overscroll-behavior: none;
+        overflow-y         : hidden;
+        position           : absolute;
+        width              : 100%;
+    }
+
     .neo-grid-scrollbar {
         background-color: red;
         bottom          : 0;
@@ -15,67 +29,3 @@
         z-index         : 2;
     }
 }
-
-.neo-grid-container {
-    border             : 1px solid var(--grid-container-border-color);
-    border-spacing     : 0;
-    color              : var(--grid-container-color);
-    font-size          : 13px;
-    font-weight        : 400;
-    height             : 100%;
-    line-height        : 19px;
-    overscroll-behavior: none;
-    overflow-y         : hidden;
-    position           : absolute;
-    width              : 100%;
-
-    .neo-grid-row {
-        display: flex;
-        width  : 100%;
-    }
-
-    .neo-grid-header-toolbar .neo-grid-row:nth-child(1) .neo-grid-header-cell {
-        z-index : 10;
-    }
-
-    .neo-grid-row:last-child {
-        .neo-grid-cell {
-            border-bottom-width: 0 !important;
-        }
-    }
-
-    .neo-grid-row.neo-even {
-        .neo-grid-cell {
-            background-color: var(--grid-container-cell-background-color-even);
-        }
-    }
-
-    .neo-grid-header-cell {
-        position: sticky;
-        top     : 0;
-        z-index : 5;
-    }
-
-    .neo-grid-cell, .neo-grid-header-cell {
-        border-bottom: 1px solid var(--grid-container-border-color);
-        border-right : 1px solid var(--grid-container-border-color);
-        height       : inherit;
-        min-width    : 300px;
-
-        &:last-child {
-            border-right-width : 0;
-        }
-
-        &.neo-locked {
-            left: 0;
-        }
-    }
-
-    .neo-grid-cell {
-        align-items     : center;
-        background-color: var(--grid-container-cell-background-color);
-        display         : flex;
-        padding         : 2px 10px 2px;
-        width           : fit-content;
-    }
-}
diff --git a/resources/scss/src/grid/View.scss b/resources/scss/src/grid/View.scss
@@ -53,13 +53,26 @@
 
     .neo-grid-row {
         position: absolute;
+        width   : 100%;
+
+        &:last-child {
+            .neo-grid-cell {
+                border-bottom-width: 0 !important;
+            }
+        }
 
          &:hover {
              .neo-grid-cell {
                  background-color: var(--grid-cell-background-color-hover);
              }
          }
 
+        &.neo-even {
+            .neo-grid-cell {
+                background-color: var(--grid-container-cell-background-color-even);
+            }
+        }
+
          // selection.RowModel
          &.neo-selected {
              .neo-grid-cell {
@@ -69,7 +82,19 @@
          }
 
          .neo-grid-cell {
-             position: absolute;
+             align-items     : center;
+             background-color: var(--grid-container-cell-background-color);
+             border-bottom   : 1px solid var(--grid-container-border-color);
+             border-right    : 1px solid var(--grid-container-border-color);
+             display         : flex;
+             height          : inherit;
+             padding         : 2px 10px 2px;
+             position        : absolute;
+             width           : fit-content;
+
+             &:last-child {
+                 border-right-width : 0;
+             }
 
              // selection.CellModel
              &.neo-selected {