@@ -130,7 +130,7 @@ export const gridStyles = css`
130130 box-sizing : border-box;
131131 margin : 0 ;
132132 position : relative;
133- background : var (--vaadin-grid -background , var (--vaadin-background-color ));
133+ background : var (--vaadin-cell -background , var (--vaadin-background-color ));
134134 border-block : var (--_row-border-width ) solid var (--_border-color );
135135 }
136136
@@ -150,8 +150,23 @@ export const gridStyles = css`
150150 }
151151
152152 [part ~= 'row' ]: last-child {
153+ border-block-end-style : none;
153154 background : transparent;
154155 }
156+
157+ /* Header bottom border */
158+ [part ~= 'row' ]: last-child ::before {
159+ content : '' ;
160+ height : var (--_row-border-width );
161+ background : var (--_border-color );
162+ position : absolute;
163+ inset-block-end : calc (-1 * var (--_row-border-width ));
164+ inset-inline : 0 ;
165+ }
166+
167+ : host ([overflow ~= 'top' ]) & {
168+ padding-block-end : var (--_row-border-width );
169+ }
155170 }
156171
157172 # items {
@@ -203,15 +218,15 @@ export const gridStyles = css`
203218 # emptystatecell {
204219 border-block : var (--_row-border-width ) solid transparent;
205220 }
221+
222+ [part ~= 'first-row' ] {
223+ border-block-start-color : transparent;
224+ border-block-start-style : solid;
225+ }
206226 }
207227
208228 /* Grid without header */
209229 # table : not (: has (# header > tr : not ([hidden ]))) {
210- : host ([overflow ~= 'top' ]) & # header {
211- min-height : var (--_row-border-width );
212- pointer-events : none;
213- }
214-
215230 /* Focus outline */
216231 [part ~= 'first-row' ]::after ,
217232 [part ~= 'first-row' ] [part ~= 'cell' ]::after {
@@ -589,12 +604,12 @@ export const gridStyles = css`
589604
590605 /* Grid with header */
591606 # table : has (# header > tr : not ([hidden ])) [part ~= 'first-row' ][dragover = 'above' ]::after {
592- top : calc ( var ( --_row-border-width ) * -1 ) ;
607+ top : 0 ;
593608 }
594609
595610 /* Grid with footer */
596611 # table : has (# footer > tr : not ([hidden ])) [part ~= 'last-row' ][dragover = 'below' ]::after {
597- bottom : calc ( var ( --_row-border-width ) * -1 ) ;
612+ bottom : 0 ;
598613 }
599614
600615 [part ~= 'row' ][dragstart ] {
0 commit comments