Skip to content

Commit 36147a4

Browse files
authored
Merge pull request #1712 from BorderTech/feature/clean-sass-tabset-corners
Feature/clean sass tabset corners
2 parents 8d13432 + 2d10e43 commit 36147a4

File tree

4 files changed

+2
-38
lines changed

4 files changed

+2
-38
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
* Updated TinyMCE to resolve security vulnerability #1696.
1010
* Added WTab based methods to WTabSet corresponding to the content methods
1111
* Introduced new SystemExceptions to make it easier to identify what exception occurred (eg invalid session token) #1627
12-
1312
* Add `@FunctionalInterface` to `Action` and `BeanProvider` to indicate that
1413
these can be instantiated as lambda expressions.
14+
* Removed decorative Sass which created rounded corners on tabs. This was forgotten in the changes for 1.5.1 which separated structure from style as
15+
much as possible #1711.
1516

1617
### Bug Fixes
1718

wcomponents-theme/src/main/sass/components/_wtabset-left-right.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
left: $wc-tabpanel-border-width;
3131

3232
[role='tab'] {
33-
@include wc-ui-tabset-left-border-radius;
3433
@include border($pos: right, $width: 0);
3534
}
3635
}
@@ -43,7 +42,6 @@
4342
right: $wc-tabpanel-border-width;
4443

4544
[role='tab'] {
46-
@include wc-ui-tabset-right-border-radius;
4745
@include border($pos: left, $width: 0);
4846
text-align: right;
4947
}

wcomponents-theme/src/main/sass/components/_wtabset.scss

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,12 @@ $wc-tabset-allow-left-right: true !default;
1111
// The width of the tab in left/right TabSets. Ignored if
1212
// $wc-tabset-allow-left-right != true
1313
$wc-tabset-left-right-tab-width: 15% !default;
14-
$wc-tabset-border-radius: $wc-gap-small !default;
1514

1615
// We apply a border to the top of the tabpanel (in a regular tabset) which
1716
// allows us to separate the tabs from the content. It is also used to offset
1817
// the position of the tablist so that the active tab covers this border.
1918
$wc-tabset-tab-border: 1px !default;
2019
$wc-tabpanel-border-width: 1px !default;
21-
22-
@import '../mixins/tabset';
2320
// #############################################################################
2421

2522
.wc-tabset {
@@ -54,10 +51,6 @@ $wc-tabpanel-border-width: 1px !default;
5451
border-top: 0;
5552
}
5653

57-
&[aria-selected] {
58-
@include wc-ui-tabset-top-border-radius;
59-
}
60-
6154
&[aria-selected='true'] {
6255
@include wc-opaque-box;
6356
@include border($pos: bottom, $width: 0);

wcomponents-theme/src/main/sass/mixins/_tabset.scss

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)