Skip to content

Commit 63ca721

Browse files
authored
fix(ui5-tabcontainer): apply overflow items styles (#1178)
Recently, we introduced static area for all composed popovers, but the additional styles for the TabContainer overflow items have not been supplied.
1 parent eaf00a1 commit 63ca721

File tree

3 files changed

+54
-37
lines changed

3 files changed

+54
-37
lines changed

packages/main/src/TabContainer.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import TabContainerPopoverTemplate from "./generated/templates/TabContainerPopov
2323

2424
// Styles
2525
import tabContainerCss from "./generated/themes/TabContainer.css.js";
26+
import tabContainerPopoverCss from "./generated/themes/TabContainerPopup.css.js";
2627
import ResponsivePopoverCommonCss from "./generated/themes/ResponsivePopoverCommon.css.js";
2728

2829
const SCROLL_STEP = 128;
@@ -167,7 +168,7 @@ class TabContainer extends UI5Element {
167168
}
168169

169170
static get staticAreaStyles() {
170-
return ResponsivePopoverCommonCss;
171+
return [tabContainerPopoverCss, ResponsivePopoverCommonCss];
171172
}
172173

173174
static get render() {

packages/main/src/themes/TabContainer.css

+5-36
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@
8787
bottom: -0.8rem;
8888
}
8989

90-
.ui5-tc__headerItem--disabled,
91-
.ui5-tc__overflowItem--disabled {
90+
.ui5-tc__headerItem--disabled {
9291
cursor: default;
9392
opacity: 0.5;
9493
}
@@ -217,32 +216,6 @@
217216
display: block;
218217
}
219218

220-
.ui5-tc__overflowItem {
221-
color: var(--_ui5_tc_overflowItem_default_color);
222-
}
223-
224-
.ui5-tc__overflowItem[active] .ui5-tc__overflowItemContent {
225-
color: var(--sapList_Active_TextColor);
226-
}
227-
228-
.ui5-tc__overflowItemContent {
229-
display: flex;
230-
align-items: center;
231-
padding: 0 0.5rem;
232-
height: var(--_ui5_tc_item_text);
233-
pointer-events: none;
234-
}
235-
236-
.ui5-tc__overflowItem ui5-icon {
237-
width: 1.375rem;
238-
height: 1.375rem;
239-
padding-right: 1rem;
240-
}
241-
242-
.ui5-tc__overflowItem ui5-icon {
243-
color: currentColor;
244-
}
245-
246219
.ui5-tc-root.ui5-tc--textOnly .ui5-tc__content {
247220
height: calc(100% - var(--_ui5_tc_header_height_text_only)); /* the header height (text only tabs) */
248221
}
@@ -276,8 +249,7 @@
276249
/*** Semantic states ***/
277250
.ui5-tc__headerItem--positive.ui5-tc__headerItem--textOnly,
278251
.ui5-tc__headerItem--positive .ui5-tc-headerItemIcon-outer,
279-
.ui5-tc-headerItemSemanticIcon--positive::before,
280-
.ui5-tc__overflowItem--positive {
252+
.ui5-tc-headerItemSemanticIcon--positive::before {
281253
color: var(--sapPositiveColor);
282254
border-color: var(--_ui5_tc_headerItem_positive_selected_border_color);
283255
}
@@ -302,8 +274,7 @@
302274

303275
.ui5-tc__headerItem--negative.ui5-tc__headerItem--textOnly,
304276
.ui5-tc__headerItem--negative .ui5-tc-headerItemIcon-outer,
305-
.ui5-tc-headerItemSemanticIcon--negative::before,
306-
.ui5-tc__overflowItem--negative {
277+
.ui5-tc-headerItemSemanticIcon--negative::before {
307278
color: var(--sapNegativeColor);
308279
border-color: var(--_ui5_tc_headerItem_negative_selected_border_color);
309280
}
@@ -327,8 +298,7 @@
327298

328299
.ui5-tc__headerItem--critical.ui5-tc__headerItem--textOnly,
329300
.ui5-tc__headerItem--critical .ui5-tc-headerItemIcon-outer,
330-
.ui5-tc-headerItemSemanticIcon--critical::before,
331-
.ui5-tc__overflowItem--critical {
301+
.ui5-tc-headerItemSemanticIcon--critical::before {
332302
color: var(--sapCriticalColor);
333303
border-color: var(--_ui5_tc_headerItem_critical_selected_border_color);
334304
}
@@ -351,8 +321,7 @@
351321
}
352322

353323
.ui5-tc__headerItem--nutral.ui5-tc__headerItem--textOnly,
354-
.ui5-tc__headerItem--neutral .ui5-tc-headerItemIcon-outer,
355-
.ui5-tc__overflowItem--neutral {
324+
.ui5-tc__headerItem--neutral .ui5-tc-headerItemIcon-outer {
356325
color: var(--sapNeutralColor);
357326
border-color: var(--_ui5_tc_headerItem_neutral_selected_border_color);
358327
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
.ui5-tc__overflowItem {
2+
color: var(--_ui5_tc_overflowItem_default_color);
3+
}
4+
5+
.ui5-tc__overflowItem--disabled {
6+
cursor: default;
7+
opacity: 0.5;
8+
}
9+
10+
.ui5-tc__overflowItem--positive {
11+
color: var(--sapPositiveColor);
12+
border-color: var(--_ui5_tc_headerItem_positive_selected_border_color);
13+
}
14+
15+
.ui5-tc__overflowItem--negative {
16+
color: var(--sapNegativeColor);
17+
border-color: var(--_ui5_tc_headerItem_negative_selected_border_color);
18+
}
19+
20+
.ui5-tc__overflowItem--critical {
21+
color: var(--sapCriticalColor);
22+
border-color: var(--_ui5_tc_headerItem_critical_selected_border_color);
23+
}
24+
25+
.ui5-tc__overflowItem--neutral {
26+
color: var(--sapNeutralColor);
27+
border-color: var(--_ui5_tc_headerItem_neutral_selected_border_color);
28+
}
29+
30+
.ui5-tc__overflowItem[active] .ui5-tc__overflowItemContent {
31+
color: var(--sapList_Active_TextColor);
32+
}
33+
34+
.ui5-tc__overflowItemContent {
35+
display: flex;
36+
align-items: center;
37+
padding: 0 0.5rem;
38+
height: var(--_ui5_tc_item_text);
39+
pointer-events: none;
40+
}
41+
42+
.ui5-tc__overflowItem ui5-icon {
43+
width: 1.375rem;
44+
height: 1.375rem;
45+
padding-right: 1rem;
46+
color: currentColor;
47+
}

0 commit comments

Comments
 (0)