Merge pull request #437 from UiPath/fix/apollo-design-grid

fix(grid): adapt to apollo design
UiPath · Dec 9, 2023 · 0c2a051 · 0c2a051
2 parents 68cea3d + 5652fda
commit 0c2a051
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# v15.0.13 (2023-12-08)
+* **grid** modify hover color
+
 # v15.0.12 (2023-12-07)
 * **tree-select** tree nodes disappears after loading
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-components",
-  "version": "15.0.12",
+  "version": "15.0.13",
   "author": {
     "name": "UiPath Inc",
     "url": "https://uipath.com"

diff --git a/projects/angular/components/ui-grid/src/_ui-grid-variables.scss b/projects/angular/components/ui-grid/src/_ui-grid-variables.scss
@@ -1,7 +1,8 @@
 $ui-grid-cell-background-color: var(--color-background, #ffffff);
 $ui-grid-border-color: var(--color-border-de-emp, #cfd8dd);
 $ui-grid-cell-bottom-border: 1px solid $ui-grid-border-color;
-$ui-grid-row-hover-color: var(--color-hover, #e9f1fa);
+$ui-grid-row-hover-color: var(--color-data-grid-hover, #F1F2F3);
+$ui-grid-header-pressed-color: var(--color-data-grid-pressed, #EAECED);
 $header-background-color:  var(--color-background-secondary, #f4f5f7);
 $grid-actions-box-shadow: var(--color-background, #ffffff);
 $highlighted-entity-color: var(--color-primary, #0067df);
diff --git a/projects/angular/components/ui-grid/src/_ui-grid.theme.scss b/projects/angular/components/ui-grid/src/_ui-grid.theme.scss
@@ -204,33 +204,14 @@ $ui-grid-opacity-transition: opacity $ui-grid-default-transition;
 
         .ui-grid-row {
             &:focus,
+            &:hover,
             &.cdk-focused {
                 background-color: $ui-grid-row-hover-color;
 
-                &:not(.ui-grid-row-state-expanded) {
-                    .ui-grid-header-cell,
-                    .ui-grid-cell {
-                        background-color: $ui-grid-row-hover-color;
-                    }
-                }
-
-                outline: none;
-
-                .ui-grid-action-cell-container {
-                    opacity: 1;
+                .ui-grid-header-cell,
+                .ui-grid-cell {
                     background-color: $ui-grid-row-hover-color;
                 }
-            }
-
-            &:hover {
-                background-color: $ui-grid-row-hover-color;
-
-                &:not(.ui-grid-row-state-expanded) {
-                    .ui-grid-header-cell,
-                    .ui-grid-cell {
-                        background-color: $ui-grid-row-hover-color;
-                    }
-                }
 
                 outline: none;
 

diff --git a/projects/angular/components/ui-grid/src/ui-grid.component.scss b/projects/angular/components/ui-grid/src/ui-grid.component.scss
@@ -461,7 +461,7 @@ ui-grid {
                     &.ui-grid-state-resizing,
                     &:focus,
                     &.cdk-focused {
-                        background-color: $ui-grid-row-hover-color;
+                        background-color: $ui-grid-header-pressed-color;
                     }
                 }
             }
@@ -734,10 +734,6 @@ ui-grid {
             .ui-grid-cell {
                 height: $ui-grid-row-height - $ui-row-border-width;
                 background: $ui-grid-cell-background-color;
-
-                &.ui-grid-state-resizing {
-                    background: $ui-grid-row-hover-color;
-                }
             }
 
             .sticky-columns-cell-container.ui-grid-cell {

diff --git a/projects/angular/package.json b/projects/angular/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@uipath/angular",
-    "version": "15.0.12",
+    "version": "15.0.13",
     "license": "MIT",
     "author": {
         "name": "UiPath Inc",