Skip to content

Commit

Permalink
fix(header): Change grid header css to flexbox
Browse files Browse the repository at this point in the history
* Change grid header css to flexbox

Change grid header css to be flexbox based

Header display properties was previously table based while body is block based. This causes alignment issues in some cases.

* Better spacing

* Another space

Fix angular-ui#6799, Fix angular-ui#2592
  • Loading branch information
m4m4m4 authored and Devin Fields committed Oct 30, 2018
1 parent 39d3ab3 commit dfeeeee
Showing 1 changed file with 17 additions and 4 deletions.
21 changes: 17 additions & 4 deletions src/less/header.less
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
// Clearfix for floating header cells
&:before, &:after {
content: "";
display: table;
display: -ms-flexbox;
display: flex;
line-height: 0;
}

Expand All @@ -44,15 +45,23 @@
// .border-radius(@gridBorderRadius, 0, 0, @gridBorderRadius);
}


.ui-grid-header-cell-wrapper {
position: relative;
display: table;
display: -ms-flexbox;
display: flex;
box-sizing: border-box;
height: 100%;
width: 100%;
}

.ui-grid-header-cell-row {
display: table-row;
display: -ms-flexbox;
display: flex;
-ms-flex-direction: row;
flex-direction: row;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
}

.ui-grid-header-cell {
Expand All @@ -61,7 +70,6 @@
background-color: inherit;
border-right: @gridBorderWidth solid;
border-color: @headerVerticalBarColor;
display: table-cell;

&:last-child {
border-right: 0;
Expand All @@ -84,6 +92,11 @@
margin-left: -8px;
}
}
/* Fixes IE word-wrap if needed on header cells */
.ui-grid-header-cell > div {
-ms-flex-basis: 100%;
flex-basis: 100%;
}

// Make vertical bar in header row fill the height of the cell completely
.ui-grid-header .ui-grid-vertical-bar {
Expand Down

0 comments on commit dfeeeee

Please sign in to comment.