Skip to content

Commit 2e0f8a0

Browse files
authored
refactor(ui5-select): move styles to base theme (#169)
1 parent 08f23f8 commit 2e0f8a0

File tree

2 files changed

+49
-65
lines changed

2 files changed

+49
-65
lines changed

packages/main/src/themes/base/Select.less

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
@import "./base.less";
2+
@import "./global.less";
3+
4+
@_ui5_select_disabled_background: @sapUiFieldBackground;
5+
@_ui5_select_disabled_border_color: @sapUiFieldBorderColor;
6+
@_ui5_select_state_error_warning_border_style: solid;
7+
@_ui5_select_state_error_warning_border_width: 0.125rem;
8+
@_ui5_select_hover_icon_left_border: none;
9+
@_ui5_select_rtl_hover_icon_left_border: none;
10+
@_ui5_select_rtl_hover_icon_right_border: none;
11+
@_ui5_select_focus_width: 1px;
12+
113
:host(ui5-select) {
214
display: inline-block;
315
width: 100%;
@@ -41,9 +53,7 @@ ui5-select {
4153
&:before {
4254
content: "";
4355
position: absolute;
44-
width: calc(~"100% - 0.25rem");
45-
height: calc(~"100% - 0.25rem");
46-
border: 1px dotted @sapUiContentFocusColor;
56+
border: @_ui5_select_focus_width dotted @sapUiContentFocusColor;
4757
top: 1px;
4858
right: 1px;
4959
bottom: 1px;
@@ -60,6 +70,8 @@ ui5-select {
6070

6171
// Disabled
6272
&.sapWCSelectDisabled {
73+
background: @_ui5_select_disabled_background;
74+
border-color: @_ui5_select_disabled_border_color;
6375
cursor: default;
6476
opacity: 0.5;
6577
}
@@ -83,20 +95,29 @@ ui5-select {
8395
}
8496
}
8597

98+
.sapWCSelect:hover:not(.sapWCSelectDisabled) .sapWCSelectDropDownIcon {
99+
border-left: @_ui5_select_hover_icon_left_border;
100+
}
101+
86102
// States
103+
.sapWCSelectState {
104+
border-style: solid;
105+
border-width: 0.125rem;
106+
}
107+
87108
.sapWCSelectError {
109+
border: @_ui5_select_state_error_warning_border_width @_ui5_select_state_error_warning_border_style @sapUiFieldInvalidColor;
88110
background-color: @sapUiFieldInvalidBackground;
89-
border: 0.125rem solid @sapUiFieldInvalidColor;
90111
}
91112

92113
.sapWCSelectWarning {
114+
border: @_ui5_select_state_error_warning_border_width @_ui5_select_state_error_warning_border_style @sapUiFieldInvalidColor;
93115
background-color: @sapUiFieldWarningBackground;
94-
border: 0.125rem solid @sapUiFieldWarningColor;
95116
}
96117

97118
.sapWCSelectSuccess {
98119
background-color: @sapUiFieldSuccessBackground;
99-
border: 0.125rem solid @sapUiFieldSuccessColor;
120+
border-color: @sapUiFieldSuccessColor;
100121
}
101122

102123
// Compact
@@ -114,11 +135,25 @@ ui5-select {
114135
padding-left: 0;
115136
padding-right: 0.5rem;
116137
}
138+
139+
.sapWCSelect:hover:not(.sapWCSelectDisabled) {
140+
.sapWCSelectDropDownIcon {
141+
border-left: @_ui5_select_rtl_hover_icon_left_border;
142+
border-right: @_ui5_select_rtl_hover_icon_right_border;
143+
}
144+
}
117145
}
118146

119147
ui5-select span[dir="rtl"] {
120148
.sapWCSelect {
121149
padding-left: 0;
122150
padding-right: 0.5rem;
123151
}
152+
153+
.sapWCSelect:hover:not(.sapWCSelectDisabled) {
154+
.sapWCSelectDropDownIcon {
155+
border-left: @_ui5_select_rtl_hover_icon_left_border;
156+
border-right: @_ui5_select_rtl_hover_icon_right_border;
157+
}
158+
}
124159
}

packages/main/src/themes/sap_belize_hcb/Select.less

Lines changed: 8 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -9,62 +9,11 @@
99
@import "./base.less";
1010
@import "./global.less";
1111

12-
.sapWCSelect {
13-
&:not(.sapWCSelectOpened):not(.sapWCSelectDisabled):focus {
14-
15-
&:before {
16-
content: "";
17-
position: absolute;
18-
width: calc(~"100% - 0.375rem");
19-
height: calc(~"100% - 0.375rem");
20-
border: 0.125rem dotted @sapUiContentFocusColor;
21-
top: 1px;
22-
right: 1px;
23-
bottom: 1px;
24-
left: 1px;
25-
pointer-events: none;
26-
}
27-
}
28-
29-
&.sapWCSelectDisabled {
30-
background: @sapUiHcReducedBackground;
31-
border-color: @sapUiHcReducedForeground;
32-
color: @sapUiContentDisabledTextColor;
33-
}
34-
35-
&.sapWCSelectError:not(.sapWCSelectDisabled),
36-
&.sapWCSelectWarning:not(.sapWCSelectDisabled) {
37-
border-style: dashed;
38-
border-width: 1px;
39-
}
40-
41-
&.sapWCInputBaseContentWrapperWarning:not(.sapWCInputBaseReadonlyWrapper):not(.sapWCInputBaseDisabledWrapper) {
42-
border-style: dashed;
43-
border-width: 1px;
44-
}
45-
46-
&:hover:not(.sapWCSelectDisabled) {
47-
.sapWCSelectDropDownIcon {
48-
border-left: 0.0625rem solid @sapUiFieldHoverBorderColor;
49-
}
50-
}
51-
}
52-
53-
// RTL
54-
:host(ui5-select) span[dir="rtl"] {
55-
.sapWCSelect:hover:not(.sapWCSelectDisabled) {
56-
.sapWCSelectDropDownIcon {
57-
border-left: none;
58-
border-right: 0.0625rem solid @sapUiFieldHoverBorderColor;
59-
}
60-
}
61-
}
62-
63-
ui5-select span[dir="rtl"] {
64-
.sapWCSelect:hover:not(.sapWCSelectDisabled) {
65-
.sapWCSelectDropDownIcon {
66-
border-left: none;
67-
border-right: 0.0625rem solid @sapUiFieldHoverBorderColor;
68-
}
69-
}
70-
}
12+
@_ui5_select_disabled_background: @sapUiHcReducedBackground;
13+
@_ui5_select_disabled_border_color: @sapUiHcReducedForeground;
14+
@_ui5_select_state_error_warning_border_style: dashed;
15+
@_ui5_select_state_error_warning_border_width: 1px;
16+
@_ui5_select_hover_icon_left_border: 0.0625rem solid @sapUiFieldHoverBorderColor;
17+
@_ui5_select_rtl_hover_icon_left_border: none;
18+
@_ui5_select_rtl_hover_icon_right_border: 0.0625rem solid @sapUiFieldHoverBorderColor;;
19+
@_ui5_select_focus_width: 0.125rem;

0 commit comments

Comments
 (0)