Skip to content

Commit b6b0f42

Browse files
authored
Merge pull request #863 from lalithkarikelli/surf2205
refactor(tabset): implement design tokens
2 parents 977fb48 + 9c6cfd9 commit b6b0f42

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

src/scss/components/tabset/_index.scss

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
// ===== LAYOUT & APPEARANCE ===============
66
hx-tab {
7-
border-bottom: 2px solid transparent;
8-
color: $gray-700;
9-
color: var(--hxTabset-hxTab-color, $gray-700);
7+
border-bottom: $rax-component-tab-base-border-width solid transparent;
8+
color: $rax-component-tab-default-color;
9+
color: var(--hxTabset-hxTab-color, $rax-component-tab-default-color);
1010
cursor: pointer;
11-
font-size: 0.875rem;
11+
font-size: $rax-font-size-75;
1212

1313
&:hover {
14-
color: $gray-950;
15-
color: var(--hxTabset-hxTab-hover-color, $gray-950);
14+
color: $rax-component-tab-hover-color;
15+
color: var(--hxTabset-hxTab-hover-color, $rax-component-tab-hover-color);
1616
}
1717

1818
// v2.0 spec - TBD: new focus states
@@ -25,27 +25,27 @@ hx-tab {
2525

2626
&[current] {
2727
background-color: inherit;
28-
border-bottom: 2px solid $teal-300;
29-
border-bottom: 2px solid var(--hxTabset-hxTab-current-border-bottom, $teal-300);
30-
color: $gray-950;
31-
color: var(--hxTabset-hxTab-current-color, $gray-950);
32-
font-weight: 600;
28+
border-bottom: 2px solid $rax-component-tab-active-border-color; // in token $teal-500 is used
29+
border-bottom: 2px solid var(--hxTabset-hxTab-current-border-bottom, $rax-component-tab-active-border-color);
30+
color: $rax-component-tab-active-color;
31+
color: var(--hxTabset-hxTab-current-color, $rax-component-tab-active-color);
32+
font-weight: $rax-component-tab-active-font-weight;
3333
outline: none;
3434
}
3535

3636
> * + * {
37-
margin-left: 0.25rem;
37+
margin-left: $rax-spacing-unit;
3838
}
3939
}
4040

4141
hx-tabcontent {
4242
-ms-grid-columns: 1fr;
4343
-ms-grid-rows: 1fr;
4444
background-color: inherit;
45-
border-color: $gray-300 transparent;
46-
border-color: var(--hxTabset-hxTabcontent-border-color, $gray-300) transparent;
47-
border-style: solid;
48-
border-width: 1px;
45+
border-color: $rax-color-gray-300 transparent;
46+
border-color: var(--hxTabset-hxTabcontent-border-color, $rax-color-gray-300) transparent;
47+
border-style: $rax-component-tab-base-border-style;
48+
border-width: $rax-component-tab-base-border-width; //in token border-with is 2px
4949
display: -ms-grid;
5050
display: grid;
5151
grid-template-columns: 1fr;
@@ -58,20 +58,20 @@ hx-tabcontent {
5858
hx-tablist {
5959
background-color: inherit;
6060
display: flex;
61-
padding: 0 0.5rem;
61+
padding: 0 $rax-spacing-200;
6262

6363
> hx-tab {
6464
bottom: -1px;
6565
display: inline-flex;
6666
flex-shrink: 0;
67-
padding: 0.5rem 0.75rem;
67+
padding: $rax-spacing-200 $rax-spacing-300;
6868
position: relative;
6969
}
7070
}
7171

7272
hx-tabpanel {
7373
display: none;
74-
padding: 1.5rem 1.25rem;
74+
padding: $rax-spacing-600 $rax-spacing-500;
7575

7676
&[open] {
7777
display: block;
@@ -102,7 +102,7 @@ hx-tabset {
102102
grid-template-rows: auto 1fr;
103103
max-height: 100%;
104104
overflow: hidden;
105-
padding-top: 0.25rem; // reserve space to render tab glow
105+
padding-top: $rax-spacing-100; // reserve space to render tab glow
106106

107107
> hx-tablist {
108108
-ms-grid-column: 1;
@@ -123,8 +123,8 @@ hx-tabset {
123123
// before <hx-tabset> upgrades.
124124
hx-tabset:not([hx-defined]) {
125125
hx-tab:first-of-type {
126-
background-color: $gray-0;
127-
background-color: var(--hxTabset-hxTab-first-of-type-bgcolor, $gray-0);
126+
background-color: $rax-color-gray-0;
127+
background-color: var(--hxTabset-hxTab-first-of-type-bgcolor, $rax-color-gray-0); //there is no token for bg color
128128
}
129129

130130
hx-tabpanel:first-of-type {
@@ -136,14 +136,14 @@ hx-tabset:not([hx-defined]) {
136136

137137
hx-tabset.beta-hxBound {
138138
hx-tab[current] {
139-
background-color: $gray-0;
140-
background-color: var(--hxTabset-hxTab-current-bgcolor, $gray-0);
139+
background-color: $rax-color-gray-0;
140+
background-color: var(--hxTabset-hxTab-current-bgcolor, $rax-color-gray-0); //there is no token for bg color
141141
}
142142

143143
hx-tabcontent {
144-
background-color: $gray-0;
145-
background-color: var(--hxTabset-hxTabcontent-bgcolor, $gray-0);
146-
border-color: $gray-300;
147-
border-color: var(--hxTabset-hxTabcontent-border-color, $gray-300);
144+
background-color: $rax-color-gray-0;
145+
background-color: var(--hxTabset-hxTabcontent-bgcolor, $rax-color-gray-0); //there is no token for bg color
146+
border-color: $rax-color-gray-300;
147+
border-color: var(--hxTabset-hxTabcontent-border-color, $rax-color-gray-300); // there is no token for border color
148148
}
149149
}

0 commit comments

Comments
 (0)