Skip to content

Commit 8ad1fdd

Browse files
authored
fix(ui5-color-palette): align space between swatches (#3912)
1 parent 53f909d commit 8ad1fdd

File tree

3 files changed

+27
-17
lines changed

3 files changed

+27
-17
lines changed

packages/main/src/themes/ColorPaletteItem.css

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
border-radius: 0.25rem;
66
display: inline-block;
77
margin: var(--_ui5_color-palette-item-margin);
8+
box-sizing: border-box;
89
}
910

1011
:host(:not([_disabled]):hover) {
@@ -28,6 +29,12 @@
2829
height: 100%;
2930
}
3031

32+
.ui5-cp-item:hover {
33+
border: 1px solid var(--sapGroup_ContentBackground);
34+
border-radius: 0.25rem;
35+
box-sizing: border-box;
36+
}
37+
3138
:host(:not([_disabled])) .ui5-cp-item:focus{
3239
outline: none;
3340
}
@@ -40,10 +47,10 @@
4047
content: "";
4148
box-sizing: border-box;
4249
position: absolute;
43-
left: 0.125rem;
44-
top: 0.125rem;
45-
right: 0.125rem;
46-
bottom: 0.125rem;
50+
left: 0.0625rem;
51+
top: 0.0625rem;
52+
right: 0.0625rem;
53+
bottom: 0.0625rem;
4754
border: 0.0625rem solid white;
4855
pointer-events: none;
4956
}
@@ -52,10 +59,10 @@
5259
content: "";
5360
box-sizing: border-box;
5461
position: absolute;
55-
left: 0.125rem;
56-
top: 0.125rem;
57-
right: 0.125rem;
58-
bottom: 0.125rem;
62+
left: 0.0625rem;
63+
top: 0.0625rem;
64+
right: 0.0625rem;
65+
bottom: 0.0625rem;
5966
border: 0.0625rem dotted black;
6067
pointer-events: none;
6168
}
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
:root {
2-
--_ui5_color-palette-item-height: 1.75rem;
32
--_ui5_color-palette-item-container-sides-padding: 0.3125rem;
43
--_ui5_color-palette-item-container-rows-padding: 0.6875rem;
54
--_ui5_color-palette-item-focus-height: 1.5rem;
65
--_ui5_color-palette-item-container-padding: var(--_ui5_color-palette-item-container-sides-padding) var(--_ui5_color-palette-item-container-rows-padding);
7-
--_ui5_color-palette-item-hover-height: 2.25rem;
8-
--_ui5_color-palette-item-margin: calc(var(--_ui5_color-palette-item-hover-height) - var(--_ui5_color-palette-item-height));
9-
--_ui5_color-palette-item-hover-margin: calc(var(--_ui5_color-palette-item-margin) / 2);
10-
--_ui5_color-palette-row-width: 14.5rem;
6+
--_ui5_color-palette-item-hover-margin: 0;
117
--_ui5_color-palette-row-height: 9.5rem;
128
--_ui5_color-palette-button-height: 3rem;
139
}

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,13 @@
1616
--_ui5_day_picker_item_height: 2.875rem;
1717
--_ui5_day_picker_empty_height: 3rem;
1818

19-
/* DateTimePicker */
19+
/* ColorPalette */
20+
--_ui5_color-palette-item-height: 1.75rem;
21+
--_ui5_color-palette-item-hover-height: 2.375rem;
22+
--_ui5_color-palette-item-margin: calc((var(--_ui5_color-palette-item-hover-height) - var(--_ui5_color-palette-item-height)) / 2);
23+
--_ui5_color-palette-row-width: 12rem;
24+
25+
/* DateTimePicker */
2026
--_ui5_datetime_picker_width: 40.0625rem;
2127
--_ui5_datetime_picker_height: 25rem;
2228
--_ui5_datetime_timeview_width: 17rem;
@@ -140,9 +146,10 @@
140146
--_ui5_color-palette-item-focus-height: 1rem;
141147
--_ui5_color-palette-item-container-sides-padding: 0.1875rem;
142148
--_ui5_color-palette-item-container-rows-padding: 0.8125rem;
143-
--_ui5_color-palette-item-hover-height: 1.65rem;
144-
--_ui5_color-palette-item-hover-margin: 0.3125rem;
145-
--_ui5_color-palette-row-width: 12rem;
149+
--_ui5_color-palette-item-hover-height: 1.625rem;
150+
--_ui5_color-palette-item-margin: calc((var(--_ui5_color-palette-item-hover-height) - var(--_ui5_color-palette-item-height)) / 2);
151+
--_ui5_color-palette-row-width: 8.125rem;
152+
--_ui5_color-palette-item-hover-margin: 0;
146153
--_ui5_color-palette-row-height: 7.5rem;
147154
--_ui5_color-palette-button-height: 2rem;
148155

0 commit comments

Comments
 (0)