Skip to content

Commit dda82e9

Browse files
committed
fix(safari): overflow render bug and fix tab styles
* fix safari render bug * amend tabset styles * remove browser default focus-ring on tabs
1 parent 54189ef commit dda82e9

File tree

1 file changed

+29
-3
lines changed

1 file changed

+29
-3
lines changed

src/scss/components/tabset/_index.scss

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,33 @@
1+
/// ---------------------------- ///
2+
/// ---------- TABSET ---------- ///
3+
/// ---------------------------- ///
4+
15
// ===== LAYOUT & APPEARANCE ===============
26
hx-tab {
3-
border-radius: 2px 2px 0 0;
4-
border: 1px solid transparent;
7+
border-bottom: 2px solid transparent;
8+
color: $gray-700;
59
color: var(--hxTabset-hxTab-color, $gray-700);
610
cursor: pointer;
711
font-size: 0.875rem;
8-
font-weight: 500;
912

1013
&:hover {
14+
color: $gray-950;
1115
color: var(--hxTabset-hxTab-hover-color, $gray-950);
1216
}
1317

18+
// v2.0 spec - TBD: new focus states
19+
// v2.0 spec - remove browser default focus-ring
1420
&:focus {
21+
box-shadow: none;
22+
outline: none;
1523
z-index: 1; // keeps focus ring in front of adjacent tabs
1624
}
1725

1826
&[current] {
1927
background-color: inherit;
28+
border-bottom: 2px solid $teal-300;
2029
border-bottom: 2px solid var(--hxTabset-hxTab-current-border-bottom, $teal-300);
30+
color: $gray-950;
2131
color: var(--hxTabset-hxTab-current-color, $gray-950);
2232
font-weight: 600;
2333
outline: none;
@@ -33,6 +43,7 @@ hx-tabcontent {
3343
-ms-grid-rows: 1fr;
3444
background-color: inherit;
3545
border-color: $gray-300 transparent;
46+
border-color: var(--hxTabset-hxTabcontent-border-color, $gray-300) transparent;
3647
border-style: solid;
3748
border-width: 1px;
3849
display: -ms-grid;
@@ -64,6 +75,17 @@ hx-tabpanel {
6475

6576
&[open] {
6677
display: block;
78+
overflow-y: auto;
79+
80+
// IE11 overflow bug
81+
@media all and (-ms-high-contrast: active), (-ms-high-contrast: none) {
82+
height: 20rem;
83+
}
84+
85+
// Chrome86/FF85 focus-ring
86+
&:focus-visible {
87+
outline: none;
88+
}
6789
}
6890
}
6991

@@ -101,6 +123,7 @@ hx-tabset {
101123
// before <hx-tabset> upgrades.
102124
hx-tabset:not([hx-defined]) {
103125
hx-tab:first-of-type {
126+
background-color: $gray-0;
104127
background-color: var(--hxTabset-hxTab-first-of-type-bgcolor, $gray-0);
105128
}
106129

@@ -113,11 +136,14 @@ hx-tabset:not([hx-defined]) {
113136

114137
hx-tabset.beta-hxBound {
115138
hx-tab[current] {
139+
background-color: $gray-0;
116140
background-color: var(--hxTabset-hxTab-current-bgcolor, $gray-0);
117141
}
118142

119143
hx-tabcontent {
144+
background-color: $gray-0;
120145
background-color: var(--hxTabset-hxTabcontent-bgcolor, $gray-0);
146+
border-color: $gray-300;
121147
border-color: var(--hxTabset-hxTabcontent-border-color, $gray-300);
122148
}
123149
}

0 commit comments

Comments
 (0)