Skip to content

Commit 8eefd2f

Browse files
author
Ryan A. Johnson
committed
fix(Tabs): correct tabs layout
* convert Tabs component layout from Flexbox to CSS grid
1 parent f87247f commit 8eefd2f

File tree

4 files changed

+17
-49
lines changed

4 files changed

+17
-49
lines changed

src/helix-ui/styles/elements/hx-tabcontent.less

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,14 @@ hx-tabcontent {
33
border-color: @gray-300 transparent;
44
border-style: solid;
55
border-width: 1px;
6-
flex-basis: 0px;
7-
flex-shrink: 0;
6+
display: block;
87
min-height: 14rem; // 224px
9-
overflow: hidden;
10-
}
8+
overflow-y: auto;
119

12-
// Legacy Browsers (IE and early Edge)
13-
hx-tabcontent {
14-
// as tabset grid cell
10+
// Legacy Browsers (IE and early Edge)
1511
-ms-grid-row: 2;
1612
-ms-grid-column: 1;
1713

18-
// as sub-grid container
19-
display: -ms-grid;
20-
-ms-grid-rows: 1fr;
21-
-ms-grid-columns: 1fr;
22-
}
23-
24-
// Evergreen Browsers
25-
@supports (--is-modern: true) {
26-
hx-tabcontent {
27-
display: flex;
28-
flex-direction: column;
29-
flex-grow: 1;
30-
}
14+
// Evergreen Browsers
15+
grid-area: content;
3116
}

src/helix-ui/styles/elements/hx-tablist.less

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,11 @@ hx-tablist {
22
background-color: inherit;
33
display: flex;
44
padding: 0 0.5rem;
5-
}
65

7-
// Legacy Browsers (IE and early Edge)
8-
hx-tablist {
6+
// Legacy Browsers (IE and early Edge)
97
-ms-grid-row: 1;
108
-ms-grid-column: 1;
11-
}
129

13-
// Evergreen Browsers
14-
@supports (--is-modern: true) {
15-
hx-tablist {
16-
flex-grow: 0;
17-
}
10+
// Evergreen Browsers
11+
grid-area: list;
1812
}
Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,9 @@
1-
@import (reference) './hx-reveal.less';
2-
31
hx-tabpanel {
4-
&:extend(hx-reveal all);
52
background-color: transparent;
6-
overflow-y: auto;
3+
display: none;
74
padding: 1.5rem 1.25rem;
85

96
&[open] {
107
display: block;
118
}
129
}
13-
14-
// Legacy Browsers (IE and early Edge)
15-
hx-tabpanel {
16-
-ms-grid-row: 1;
17-
-ms-grid-column: 1;
18-
}
Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
hx-tabset {
22
background-color: inherit;
33
height: 100%;
4-
}
54

6-
// Legacy Browsers (IE and early Edge)
7-
hx-tabset {
5+
// Legacy Browsers (IE and early Edge)
86
display: -ms-grid;
97
-ms-grid-rows: auto 1fr;
108
-ms-grid-columns: 1fr;
11-
}
129

13-
// Evergreen Browsers
14-
@supports (--is-modern: true) {
15-
hx-tabset {
16-
display: flex;
17-
flex-direction: column;
18-
}
10+
// Evergreen Browsers
11+
display: grid;
12+
grid-template-rows: auto 1fr;
13+
grid-template-columns: 1fr;
14+
grid-template-areas:
15+
'list'
16+
'content';
1917
}

0 commit comments

Comments
 (0)