Skip to content

Commit

Permalink
TabPanel: support focused but not selected state in Generic
Browse files Browse the repository at this point in the history
  • Loading branch information
@EugeniyKiyashko
EugeniyKiyashko committed Sep 4, 2024
1 parent 536fcb8 commit 10a2df2
Show file tree
Hide file tree
Showing 24 changed files with 496 additions and 491 deletions.
Binary file modified .../htmlEditor/dialogs/addImage/etalons/tabpanel-in-htmleditor (generic-light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...tor/dialogs/addImage/etalons/tabpanel-in-htmleditor (generic-light-compact).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ter in tab content after window resize, pane_1.size=`100px` (generic-light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...litter/etalons/Splitter in tab content, pane_1.size=`100px` (generic-light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...avigation/tabPanel/etalons/TabPanel 1 item active,rtl=false (generic-light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...navigation/tabPanel/etalons/TabPanel 1 item active,rtl=true (generic-light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .../tabPanel/etalons/TabPanel available item focused,rtl=false (generic-light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...n/tabPanel/etalons/TabPanel available item focused,rtl=true (generic-light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...tabPanel/etalons/TabPanel long not stretched tabs,rtl=false (generic-light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .../tabPanel/etalons/TabPanel long not stretched tabs,rtl=true (generic-light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...abPanel/etalons/TabPanel long tabs,2 tab selected,rtl=false (generic-light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...tabPanel/etalons/TabPanel long tabs,2 tab selected,rtl=true (generic-light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...tion/tabPanel/etalons/TabPanel with expanded tabs,rtl=false (generic-light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ation/tabPanel/etalons/TabPanel with expanded tabs,rtl=true (generic-light).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions packages/devextreme-scss/scss/widgets/generic/tabPanel/layout/tab-panel/_base.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
border: $generic-tabs-border;
}

&.dx-state-focused {
.dx-multiview-wrapper.dx-state-focused {
border-color: $tabs-focused-border-color;
}
}
// &.dx-state-focused {
// .dx-multiview-wrapper.dx-state-focused {
// border-color: $tabs-focused-border-color;
// }
// }
}
56 changes: 28 additions & 28 deletions ...ages/devextreme-scss/scss/widgets/generic/tabPanel/layout/tab-panel/_position-bottom.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,39 +25,39 @@
);
}

.dx-tabs .dx-tabs-scrollable {
@include dx-tabs-border-mixin(
none,
$generic-tabs-border-width solid,
none,
$generic-tabs-border-width solid,
);
// .dx-tabs .dx-tabs-scrollable {
// @include dx-tabs-border-mixin(
// none,
// $generic-tabs-border-width solid,
// none,
// $generic-tabs-border-width solid,
// );

&::after {
top: $generic-tabs-border-width;
bottom: 0;
}
}
// &::after {
// top: $generic-tabs-border-width;
// bottom: 0;
// }
// }

&.dx-state-focused {
&.dx-disabled-focused-tab {
.dx-tabs-wrapper {
border-block-start: $generic-tabs-border;
}
// &.dx-state-focused {
// &.dx-disabled-focused-tab {
// .dx-tabs-wrapper {
// border-block-start: $generic-tabs-border;
// }

.dx-tabs-nav-button {
border-block-start: $generic-tabs-border;
}
}
// .dx-tabs-nav-button {
// border-block-start: $generic-tabs-border;
// }
// }

.dx-tabs-wrapper {
border-block-start: $generic-tabs-border-focus;
}
// .dx-tabs-wrapper {
// border-block-start: $generic-tabs-border-focus;
// }

.dx-tabs-nav-button {
border-block-start: $generic-tabs-border-focus;
}
}
// .dx-tabs-nav-button {
// border-block-start: $generic-tabs-border-focus;
// }
// }

&:not(.dx-empty-collection) {
.dx-multiview-wrapper {
Expand Down
68 changes: 34 additions & 34 deletions packages/devextreme-scss/scss/widgets/generic/tabPanel/layout/tab-panel/_position-left.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,47 +17,47 @@
border-inline-start: $generic-tabs-border;
border-inline-end: $generic-tabs-border;

@include dx-tabs-border-mixin(
$generic-tabs-border,
none,
$generic-tabs-border,
none,
);
// @include dx-tabs-border-mixin(
// $generic-tabs-border,
// none,
// $generic-tabs-border,
// none,
// );
}

.dx-tabs .dx-tabs-scrollable {
@include dx-tabs-border-mixin(
$generic-tabs-border-width solid,
none,
$generic-tabs-border-width solid,
none,
);
// .dx-tabs .dx-tabs-scrollable {
// @include dx-tabs-border-mixin(
// $generic-tabs-border-width solid,
// none,
// $generic-tabs-border-width solid,
// none,
// );

&::after {
left: 0;
right: $generic-tabs-border-width;
}
}
// &::after {
// left: 0;
// right: $generic-tabs-border-width;
// }
// }

&.dx-state-focused {
&.dx-disabled-focused-tab {
.dx-tabs-wrapper {
border-inline-end: $generic-tabs-border;
}
// &.dx-state-focused {
// &.dx-disabled-focused-tab {
// .dx-tabs-wrapper {
// border-inline-end: $generic-tabs-border;
// }

.dx-tabs-nav-button {
border-inline-end: $generic-tabs-border;
}
}
// .dx-tabs-nav-button {
// border-inline-end: $generic-tabs-border;
// }
// }

.dx-tabs-wrapper {
border-inline-end: $generic-tabs-border-focus;
}
// .dx-tabs-wrapper {
// border-inline-end: $generic-tabs-border-focus;
// }

.dx-tabs-nav-button {
border-inline-end: $generic-tabs-border-focus;
}
}
// .dx-tabs-nav-button {
// border-inline-end: $generic-tabs-border-focus;
// }
// }

&:not(.dx-empty-collection) {
.dx-multiview-wrapper {
Expand Down
68 changes: 34 additions & 34 deletions packages/devextreme-scss/scss/widgets/generic/tabPanel/layout/tab-panel/_position-right.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,47 +17,47 @@
border-inline-start: $generic-tabs-border;
border-inline-end: $generic-tabs-border;

@include dx-tabs-border-mixin(
$generic-tabs-border,
none,
$generic-tabs-border,
none,
);
// @include dx-tabs-border-mixin(
// $generic-tabs-border,
// none,
// $generic-tabs-border,
// none,
// );
}

.dx-tabs .dx-tabs-scrollable {
@include dx-tabs-border-mixin(
$generic-tabs-border-width solid,
none,
$generic-tabs-border-width solid,
none,
);
// .dx-tabs .dx-tabs-scrollable {
// @include dx-tabs-border-mixin(
// $generic-tabs-border-width solid,
// none,
// $generic-tabs-border-width solid,
// none,
// );

&::after {
right: 0;
left: $generic-tabs-border-width;
}
}
// &::after {
// right: 0;
// left: $generic-tabs-border-width;
// }
// }

&.dx-state-focused {
&.dx-disabled-focused-tab {
.dx-tabs-wrapper {
border-inline-start: $generic-tabs-border;
}
// &.dx-state-focused {
// &.dx-disabled-focused-tab {
// .dx-tabs-wrapper {
// border-inline-start: $generic-tabs-border;
// }

.dx-tabs-nav-button {
border-inline-start: $generic-tabs-border;
}
}
// .dx-tabs-nav-button {
// border-inline-start: $generic-tabs-border;
// }
// }

.dx-tabs-wrapper {
border-inline-start: $generic-tabs-border-focus;
}
// .dx-tabs-wrapper {
// border-inline-start: $generic-tabs-border-focus;
// }

.dx-tabs-nav-button {
border-inline-start: $generic-tabs-border-focus;
}
}
// .dx-tabs-nav-button {
// border-inline-start: $generic-tabs-border-focus;
// }
// }

&:not(.dx-empty-collection) {
.dx-multiview-wrapper {
Expand Down
56 changes: 28 additions & 28 deletions packages/devextreme-scss/scss/widgets/generic/tabPanel/layout/tab-panel/_position-top.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,39 +25,39 @@
);
}

.dx-tabs .dx-tabs-scrollable {
@include dx-tabs-border-mixin(
none,
$generic-tabs-border-width solid,
none,
$generic-tabs-border-width solid,
);
// .dx-tabs .dx-tabs-scrollable {
// @include dx-tabs-border-mixin(
// none,
// $generic-tabs-border-width solid,
// none,
// $generic-tabs-border-width solid,
// );

&::after {
top: 0;
bottom: $generic-tabs-border-width;
}
}
// &::after {
// top: 0;
// bottom: $generic-tabs-border-width;
// }
// }

&.dx-state-focused {
&.dx-disabled-focused-tab {
.dx-tabs-wrapper {
border-block-end: $generic-tabs-border;
}
// &.dx-state-focused {
// &.dx-disabled-focused-tab {
// .dx-tabs-wrapper {
// border-block-end: $generic-tabs-border;
// }

.dx-tabs-nav-button {
border-block-end: $generic-tabs-border;
}
}
// .dx-tabs-nav-button {
// border-block-end: $generic-tabs-border;
// }
// }

.dx-tabs-wrapper {
border-block-end: $generic-tabs-border-focus;
}
// .dx-tabs-wrapper {
// border-block-end: $generic-tabs-border-focus;
// }

.dx-tabs-nav-button {
border-block-end: $generic-tabs-border-focus;
}
}
// .dx-tabs-nav-button {
// border-block-end: $generic-tabs-border-focus;
// }
// }

&:not(.dx-empty-collection) {
.dx-multiview-wrapper {
Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-scss/scss/widgets/generic/tabPanel/layout/tab/_base.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
.dx-tabpanel-tab {
padding: $generic-tabpanel-tabs-item-padding;

&.dx-state-focused::after {
border-color: $tabs-border-color;
}
// &.dx-state-focused::after {
// border-color: $tabs-border-color;
// }

&.dx-state-disabled {
&::after {
Expand Down
Loading

0 comments on commit 10a2df2

Please sign in to comment.