From 528acf7bc85840a0d62f3ee9f07982e6fa74b617 Mon Sep 17 00:00:00 2001
From: inikolova <Iliana.Nikolova@telerik.com>
Date: Mon, 12 Apr 2021 14:03:53 +0300
Subject: [PATCH] fix: missing border between expand/collapse column

---
 packages/default/scss/grid/_layout.scss | 11 ++--
 tests/visual/grid-angular.html          | 75 ++++++++++++++++++++++++-
 2 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/packages/default/scss/grid/_layout.scss b/packages/default/scss/grid/_layout.scss
index db54890b703..11dad2f481c 100644
--- a/packages/default/scss/grid/_layout.scss
+++ b/packages/default/scss/grid/_layout.scss
@@ -190,16 +190,17 @@
             }
         }
 
-        .k-hierarchy-cell + td {
-            border-left-width: 0;
-        }
-
         .k-hierarchy-cell + .k-grid-content-sticky {
             border-left-width: $grid-cell-vertical-border-width;
         }
         .k-detail-cell {}
         .k-master-row {}
-        .k-detail-row {}
+
+        .k-detail-row {
+            .k-detail-cell {
+                border-left-width: 0;
+            }
+        }
 
         &[dir = "rtl"],
         .k-rtl & {
diff --git a/tests/visual/grid-angular.html b/tests/visual/grid-angular.html
index c00fa2986cd..1fe371f5382 100644
--- a/tests/visual/grid-angular.html
+++ b/tests/visual/grid-angular.html
@@ -103,7 +103,7 @@
 
         <span class="col-2">Angular -- fixed height, hierarchy, filter menu, sort icon</span>
         <section class="col-2">
-            <kendo-grid class="k-widget k-grid k-grid-no-scrollbar" style="height: 250px;">
+            <kendo-grid class="k-widget k-grid k-grid-no-scrollbar" style="height: 240px;">
                 <div class="k-grid-aria-root">
                     <div class="k-grid-header">
                         <div class="k-grid-header-wrap">
@@ -186,6 +186,79 @@
             </kendo-grid>
         </section>
 
+        <span class="col-2">Angular -- expand/collapse cell and first column is a checkbox column</span>
+        <section class="col-2">
+            <kendo-grid class="k-widget k-grid">
+                <div class="k-grid-aria-root">
+                    <div class="k-grid-header" role="presentation" style="padding: 0px 14px 0px 0px;">
+                        <div class="k-grid-header-wrap">
+                            <table>
+                                <colgroup>
+                                    <col class="k-hierarchy-col" />
+                                    <col style="width: 100px;" />
+                                    <col style="width: 300px;" />
+                                    <col style="width: 100px;" />
+                                    <col />
+                                </colgroup>
+                                <thead>
+                                    <tr>
+                                        <th class="k-hierarchy-cell k-header"></th>
+                                        <th class="k-header"></th>
+                                        <th class="k-header">Product</th>
+                                        <th class="k-header">Unit Price</th>
+                                        <th class="k-header">Qty Per Unit</th>
+                                    </tr>
+                                </thead>
+                            </table>
+                        </div>
+                    </div>
+                    <kendo-grid-list class="k-grid-container">
+                        <div class="k-grid-content k-virtual-content">
+                            <div class="k-grid-table-wrap">
+                                <table class="k-grid-table">
+                                    <colgroup>
+                                        <col class="k-hierarchy-col" />
+                                        <col style="width: 100px;" />
+                                        <col style="width: 300px;" />
+                                        <col style="width: 100px;" />
+                                        <col />
+                                    </colgroup>
+                                    <tbody>
+                                        <tr class="k-master-row">
+                                            <td class="k-hierarchy-cell">
+                                                <a class="k-icon k-minus"></a>
+                                            </td>
+                                            <td><input class="k-checkbox" /><label class="k-checkbox-label"></label></td>
+                                            <td>Chai</td>
+                                            <td>18</td>
+                                            <td>10 boxes x 20 bags</td>
+                                        </tr>
+                                        <tr class="k-detail-row">
+                                            <td class="k-hierarchy-cell"></td>
+                                            <td class="k-detail-cell" colspan="4"><div style="background: #ccc; padding: 10px;">Nested content</div></td>
+                                        </tr>
+                                        <tr class="k-alt k-master-row">
+                                            <td class="k-hierarchy-cell">
+                                                <a class="k-icon k-plus"></a>
+                                            </td>
+                                            <td><input class="k-checkbox" type="checkbox" /><label class="k-checkbox-label"></label></td>
+                                            <td>Chang</td>
+                                            <td>19</td>
+                                            <td>24 - 12 oz bottles</td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
+                            <div class="k-height-container">
+                                <div></div>
+                            </div>
+                        </div>
+                    </kendo-grid-list>
+                </div>
+            </kendo-grid>
+
+        </section>
+
     </div>
 
 </body>