Skip to content

Commit ca5c957

Browse files
chore: move the paddings to the root element
1 parent ab57397 commit ca5c957

9 files changed

Lines changed: 30 additions & 33 deletions

File tree

packages/main/src/themes/RadioButton.css

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@
1414
color: var(--_ui5_radio_button_color);
1515
border-radius: var(--_ui5_radio_button_border_radius);
1616
font-size: var(--sapFontSize);
17-
padding-block: var(--_ui5_radio_button_label_side_padding);
18-
padding-inline-start: var(--_ui5_radio_button_outer_ring_padding);
19-
}
20-
21-
:host([text]) {
22-
padding-inline-start: var(--_ui5_radio_button_outer_ring_padding_with_label);
2317
}
2418

2519
:host(:not([disabled])) .ui5-radio-root {
@@ -55,8 +49,8 @@
5549
content: "";
5650
display: var(--_ui5_radio_button_focus_outline);
5751
position: absolute;
58-
inset-block: calc(-1 * var(--_ui5_radio_button_focus_dist));
59-
inset-inline: calc(-1 * var(--_ui5_radio_button_focus_dist)) var(--_ui5_radio_button_focus_dist);
52+
inset-block: var(--_ui5_radio_button_focus_dist);
53+
inset-inline: var(--_ui5_radio_button_focus_dist);
6054
pointer-events: none;
6155
border: var(--_ui5_radio_button_border_width) var(--sapContent_FocusStyle) var(--sapContent_FocusColor);
6256
border-radius: var(--_ui5_radio_button_border_radius);
@@ -195,13 +189,13 @@
195189
box-sizing: border-box;
196190
border: var(--_ui5_radio_button_border);
197191
border-radius: var(--_ui5_radio_button_border_radius);
192+
padding-block: var(--_ui5_radio_button_label_side_padding);
193+
padding-inline-start: var(--_ui5_radio_button_outer_ring_padding);
198194
}
199195

200-
.ui5-radio-root::after {
201-
content: "";
202-
position: absolute;
203-
inset-inline: 0;
204-
inset-block: calc(-1 * var(--_ui5_radio_button_label_side_padding));
196+
197+
:host([text]) .ui5-radio-root {
198+
padding-inline-start: var(--_ui5_radio_button_outer_ring_padding_with_label);
205199
}
206200

207201
/* Inner */

packages/main/src/themes/base/RadioButton-parameters.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
--_ui5_radio_button_border_radius: 0;
2424
--_ui5_radio_button_border: none;
2525
--_ui5_radio_button_focus_outline: block;
26-
--_ui5_radio_button_focus_dist: 0.1375rem;
26+
--_ui5_radio_button_focus_dist: 0.5rem;
2727
--_ui5_radio_button_color: var(--sapField_BorderColor);
2828
--_ui5_radio_button_label_offset: 1px;
2929
--_ui5_radio_button_label_color: var(--sapContent_LabelColor);
@@ -38,7 +38,7 @@
3838
@container style(--ui5_content_density: compact) {
3939
:host {
4040
--_ui5_radio_button_min_width: 2rem;
41-
--_ui5_radio_button_focus_dist: 0.125rem;
41+
--_ui5_radio_button_focus_dist: 0.375rem;
4242
--_ui5_radio_button_outer_ring_padding_with_label: 0.5rem;
4343
}
4444
}

packages/main/src/themes/base/sizes-parameters.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
/* Radio Button */
125125
--_ui5_radio_button_label_side_padding: .6875rem;
126126
--_ui5_radio_button_inner_size: 2.75rem;
127-
--_ui5_radio_button_svg_size: 1.5714em;
127+
--_ui5_radio_button_svg_size: 1.5714em; /* 1.375rem */
128128

129129
/* Responsive Popover */
130130
--_ui5-responsive_popover_header_height: 2.75rem;
@@ -322,7 +322,7 @@
322322
/* Radio Button */
323323
--_ui5_radio_button_label_side_padding: 0.5rem;
324324
--_ui5_radio_button_inner_size: 2rem;
325-
--_ui5_radio_button_svg_size: 1.1429em;
325+
--_ui5_radio_button_svg_size: 1.1429em; /* 1rem */
326326

327327
/* Responsive Popover */
328328
--_ui5-responsive_popover_header_height: 2.5rem;

packages/main/src/themes/sap_horizon/RadioButton-parameters.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
--_ui5_radio_button_checked_warning_fill: var(--sapField_WarningColor);
1717
--_ui5_radio_button_read_only_inner_ring_color: var(--sapField_TextColor);
1818
--_ui5_radio_button_read_only_border_width: var(--sapElement_BorderWidth);
19-
--_ui5_radio_button_focus_dist: 0.325rem;
19+
--_ui5_radio_button_focus_dist: 0.375rem;
2020
}
2121

2222
@container style(--ui5_content_density: compact) {
2323
:host {
2424
--_ui5_radio_button_outer_ring_padding: 0.5rem;
25-
--_ui5_radio_button_focus_dist: 0.275rem;
25+
--_ui5_radio_button_focus_dist: 0.1875rem;
2626
}
2727
}

packages/main/src/themes/sap_horizon_dark/RadioButton-parameters.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
--_ui5_radio_button_checked_warning_fill: var(--sapField_WarningColor);
1717
--_ui5_radio_button_read_only_inner_ring_color: var(--sapField_TextColor);
1818
--_ui5_radio_button_read_only_border_width: var(--sapElement_BorderWidth);
19-
--_ui5_radio_button_focus_dist: 0.325rem;
19+
--_ui5_radio_button_focus_dist: 0.375rem;
2020
}
2121

2222
@container style(--ui5_content_density: compact) {
2323
:host {
2424
--_ui5_radio_button_outer_ring_padding: 0.5rem;
25-
--_ui5_radio_button_focus_dist: 0.275rem;
25+
--_ui5_radio_button_focus_dist: 0.1875rem;
2626
}
2727
}

packages/main/src/themes/sap_horizon_hcb/RadioButton-parameters.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
--_ui5_radio_button_outer_ring_padding: 0.6875rem;
1616
--_ui5_radio_button_read_only_border_width: var(--sapElement_BorderWidth);
1717
--_ui5_radio_button_read_only_inner_ring_color: var(--sapField_TextColor);
18-
--_ui5_radio_button_focus_dist: 0.325rem;
18+
--_ui5_radio_button_focus_dist: 0.375rem;
1919
}
2020

2121
@container style(--ui5_content_density: compact) {
2222
:host {
2323
--_ui5_radio_button_outer_ring_padding: 0.5rem;
24-
--_ui5_radio_button_focus_dist: 0.275rem;
24+
--_ui5_radio_button_focus_dist: 0.1875rem;
2525
}
2626
}

packages/main/src/themes/sap_horizon_hcw/RadioButton-parameters.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
--_ui5_radio_button_outer_ring_padding: 0.6875rem;
2020
--_ui5_radio_button_read_only_border_width: var(--sapElement_BorderWidth);
2121
--_ui5_radio_button_read_only_inner_ring_color: var(--sapField_TextColor);
22-
--_ui5_radio_button_focus_dist: 0.325rem;
22+
--_ui5_radio_button_focus_dist: 0.375rem;
2323
}
2424

2525
@container style(--ui5_content_density: compact) {
2626
:host {
2727
--_ui5_radio_button_outer_ring_padding: 0.5rem;
28-
--_ui5_radio_button_focus_dist: 0.275rem;
28+
--_ui5_radio_button_focus_dist: 0.1875rem;
2929
}
3030
}

packages/main/test/pages/RadioButton.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,11 @@
176176

177177
<ui5-title level="H2">Custom font and focus outline</ui5-title>
178178
<div>
179-
<ui5-radio-button class="customizedRB" text="Item 1"></ui5-radio-button>
179+
<ui5-radio-button name="customFont" class="customizedRB" text="Item 1"></ui5-radio-button>
180180
<br>
181-
<ui5-radio-button class="customizedRB" text="Item 2"></ui5-radio-button>
181+
<ui5-radio-button name="customFont" class="customizedRB" text="Item 2"></ui5-radio-button>
182182
<br>
183-
<ui5-radio-button class="customizedRB" text="Item 3"></ui5-radio-button>
183+
<ui5-radio-button name="customFont" class="customizedRB" text="Item 3"></ui5-radio-button>
184184
</div>
185185

186186
<script>

packages/main/test/pages/styles/RadioButton.css

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,15 @@ div.customStyling{
3838
stroke: rgb(12 223 147);
3939
}
4040

41-
.customizedRB::part(root):focus::before,
42-
.customizedRB::part(root):focus-visible::before {
43-
inset: -2px;
41+
.customizedRB {
42+
font-size: 30px
4443
}
4544

46-
.customizedRB {
45+
.customizedRB::part(root) {
4746
padding: 3px;
48-
font-size: 30px
47+
}
48+
49+
.customizedRB::part(root):focus::before,
50+
.customizedRB::part(root):focus-visible::before {
51+
inset: -2px;
4952
}

0 commit comments

Comments
 (0)