fix(pivotgrid): bottom border on collapsed items

telerik · Feb 14, 2019 · 23e00f5 · 23e00f5
1 parent 1bbd45e
commit 23e00f5
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 3 deletions.
diff --git a/packages/bootstrap/scss/pivotgrid/_theme.scss b/packages/bootstrap/scss/pivotgrid/_theme.scss
@@ -22,7 +22,8 @@
         background-color: $panel-bg;
     }
 
-    .k-pivot-toolbar {
+    .k-pivot-toolbar,
+    .k-fieldselector {
         border-color: $grid-header-border;
     }
     .k-pivot-table,
@@ -72,4 +73,4 @@
             background-color: $header-bg;
         }
     }
-}
+}
diff --git a/packages/default/scss/pivotgrid/_layout.scss b/packages/default/scss/pivotgrid/_layout.scss
@@ -96,6 +96,17 @@
         vertical-align: top;
     }
 
+    .k-pivot .k-grid tr {
+        .k-grid-footer {
+            border-bottom-width: 0;
+        }
+        &:last-child:not(.k-grid-footer) {
+            td:not(.k-grid-footer) {
+                border-bottom-width: 1px;
+            }
+        }
+    }
+
     .k-pivot-layout .k-grid td {
         border-bottom-width: 1px;
     }

diff --git a/packages/default/scss/pivotgrid/_theme.scss b/packages/default/scss/pivotgrid/_theme.scss
@@ -20,6 +20,7 @@
 
     .k-pivot-toolbar,
     .k-pivot-table,
+    .k-fieldselector,
     .k-fieldselector .k-list-container,
     .k-fieldselector .k-columns > div,
     .k-pivot-rowheaders > .k-grid td:first-child,

diff --git a/packages/material/scss/pivotgrid/_theme.scss b/packages/material/scss/pivotgrid/_theme.scss
@@ -19,6 +19,7 @@
     .k-pivot-layout .k-grid-footer,
     .k-pivot-layout > tbody > tr:first-child > td:first-child {
         background-color: $pivotgrid-alt-bg;
+        border-color: $pivotgrid-chrome-border;
     }
     .k-pivot-rowheaders .k-grid {
         background: none;
@@ -38,11 +39,22 @@
     }
 
     .k-pivot-rowheaders > .k-grid td,
-    .k-pivot-rowheaders > .k-grid td:first-child {
+    .k-pivot-rowheaders > .k-grid td:first-child:not(.k-first) {
         border-bottom-color: transparent;
         border-left-color: $pivotgrid-chrome-border;
     }
 
+    .k-pivot-rowheaders > .k-grid tr {
+        &:last-child td:not(.k-grid-footer),
+        &:nth-last-child(2) td:not(.k-grid-footer) {
+            border-bottom-color: $pivotgrid-chrome-border;
+        }
+    }
+
+    .k-pivot-rowheaders .k-grid tr .k-grid-footer {
+       border-bottom-width: 0;
+    }
+
     .k-pivot-layout .k-grid .k-alt {
         border-left-color: $pivotgrid-chrome-border;
 

diff --git a/tests/visual/output/default/pivotconfigurator.png b/tests/visual/output/default/pivotconfigurator.png
diff --git a/tests/visual/output/material/pivotconfigurator.png b/tests/visual/output/material/pivotconfigurator.png