Skip to content
This repository has been archived by the owner on May 24, 2024. It is now read-only.

Commit

Permalink
[terra-tabs] Vertical tabs border fix (#2133)
Browse files Browse the repository at this point in the history
Co-authored-by: Sugan G <[email protected]>
  • Loading branch information
sugan2416 and Sugan G authored Apr 17, 2024
1 parent 175265e commit 7ce742d
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 16 deletions.
3 changes: 3 additions & 0 deletions packages/terra-framework-docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
* Added
* Added examples and tests for subsections in the FlowsheetDataGrid.

* Changed
* Updated `terra-tabs` vertical tabs example to fix custom label display.

## 1.80.0 - (April 10, 2024)

* Added
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ const VerticalTabs = () => {
const customTab = (
<Tabs.Pane
customDisplay={(
<div className={cx('custom-display')}>
<span className={cx('custom-display')}>
Surgical Department
</div>
</span>
)}
label="Surgical Department"
key="tCustomTab"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

.custom-display {
color: #f00;
overflow: hidden;
text-overflow: ellipsis;
}

.content-container {
Expand Down
3 changes: 3 additions & 0 deletions packages/terra-tabs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

* Fixed
* Fixes right border for vertical tabs not extending till last tab.

## 7.26.0 - (April 10, 2024)

* Changed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,12 @@
--terra-tabs-structural-vertical-active-color: #b2b5b6;
--terra-tabs-structural-vertical-active-font-weight: normal;
--terra-tabs-structural-vertical-background-size: 0 1px;
--terra-tabs-structural-vertical-border-width: 0 0 1px 0;
--terra-tabs-structural-vertical-border-width: 0 1px 1px 0;

--terra-tabs-menu-icon-margin-right: 0.5rem;
--terra-tabs-menu-icon-font-size: 1rem;



/* NOTE: This is being commented out until discussions have been resolved around if modular tabs should be removed.
Expand Down Expand Up @@ -137,7 +137,7 @@
--terra-tabs-modular-selection-bar-background-color: #fff;
--terra-tabs-modular-tab-bar-border-bottom-color: #dddedf;
--terra-tabs-modular-active-focus-background-color: #fff;
*/

}
Expand Down
1 change: 0 additions & 1 deletion packages/terra-tabs/src/common-tabs/CommonTabs.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
}

.is-vertical {
border-left: 1px solid #868a8c;
border-top: 0;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,18 +114,16 @@
&.is-vertical {
background-image: var(--terra-tabs-structural-vertical-background-image, linear-gradient(to bottom, #dedfe0, #dedfe0));
background-size: var(--terra-tabs-structural-vertical-background-size, 0 1px);
border-width: var(--terra-tabs-structural-vertical-border-width, 0 0 1px 0);
border-width: var(--terra-tabs-structural-vertical-border-width, 0 1px 1px 0);
min-width: 2.571rem;
}


&.is-active-vertical {
background-color: var(--terra-tabs-structural-vertical-active-background-color, #fff);
background-size: var(--terra-tabs-structural-vertical-active-background-size, 100% 1px);
border-bottom: 1px solid;
border-image: linear-gradient(#006fc3, #006fc3) 0 100%;
border-left: 2px solid;
border-width: 0 0 1px 2px;
background-image: var(--terra-tabs-structural-background-image, linear-gradient(to bottom, #006fc3, #006fc3));
background-size: 2px;
border-width: 0 1px 1px 2px;
box-shadow: var(--terra-tabs-structural-vertical-active-box-shadow, none);
color: var(--terra-tabs-structural-vertical-active-color, #000);
font-weight: var(--terra-tabs-structural-vertical-active-font-weight, normal);
Expand Down
4 changes: 2 additions & 2 deletions packages/terra-tabs/src/orion-fusion-theme/Tabs.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
--terra-tabs-structural-vertical-active-color: #000;
--terra-tabs-structural-vertical-active-font-weight: normal;
--terra-tabs-structural-vertical-background-size: 0 1px;
--terra-tabs-structural-vertical-border-width: 0 0 1px 0;
--terra-tabs-structural-vertical-border-width: 0 1px 1px 0;

--terra-tabs-menu-icon-margin-right: 0.25rem;
--terra-tabs-menu-icon-font-size: 1rem;
Expand Down Expand Up @@ -140,7 +140,7 @@
--terra-tabs-modular-selection-bar-background-color;
--terra-tabs-modular-tab-bar-border-bottom-color;
--terra-tabs-modular-active-focus-background-color;
*/
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7ce742d

Please sign in to comment.