@ui5/webcomponents 0.0.0-47cc17a26 → 0.0.0-49bade48d

package/src/themes/ColorPaletteItem.css

@@ -123,6 +123,20 @@
 	pointer-events: none;
 }
 
+/* White outline for selected state on mobile */
+:host([selected]:not([_disabled])[on-phone]) .ui5-cp-item::after {
+	content: "";
+	box-sizing: border-box;
+	position: absolute;
+	top: calc(-1 * var(--_ui5_color_palette_item_height) + 0.375rem);
+	left: 0;
+	right: 0;
+	bottom: calc(-100%);
+	border: var(--_ui5_color-palette-item-after-not-focus-color);
+	border-radius: 0.1875rem;
+	pointer-events: none;
+}
+
 :host(:not([_disabled]):not([on-phone]):not([selected]):not(:hover)) .ui5-cp-item:focus:not(:hover)::after {
 	border: var(--_ui5_color-palette-item-after-focus-not-selected-border);
 }

package/src/themes/ColorPicker.css

@@ -36,6 +36,8 @@
     border: var(--_ui5_color_picker_circle_outer_border);
     border-radius: 0.6875rem;
     pointer-events: none;
+    /* Inline left/top are percentages of the picker box; translate centers the circle on that point. */
+    transform: translate(-50%, -50%);
 }
 
 .ui5-color-picker-circle:after {
@@ -49,8 +51,7 @@
 }
 
 .ui5-color-picker-sliders-wrapper {
-    width: calc(100% - 0.9375rem);
-    margin-left: -0.9375rem;
+    width: 100%;
     padding-bottom: 0.25rem;
 }
 
@@ -65,6 +66,8 @@
     height: var(--_ui5_color_picker_slider_handle_height);
     background: transparent;
     box-sizing: border-box;
+    margin-inline-start: -.25rem;
+
 }
 
 [ui5-slider]::part(handle-container) {
@@ -73,30 +76,33 @@
     z-index: 2;
 }
 
-[ui5-slider]::part(handle)::after {
-    content: "";
-    border: 0.125rem solid var(--_ui5_color_picker_slider_handle_inner_border_color);
-    display: block;
-    height: var(--_ui5_color_picker_slider_handle_after_height);
-    border-radius: 1rem;
-    width: 100%;
-    box-sizing: border-box;
-}
-
 [ui5-slider]::part(root-container) {
 	padding: var(--_ui5_color_picker_slider_spacing) 0;
 }
 
-[ui5-slider]::part(progress-container) {
-    width: calc(100% + 0.6875rem);
+[ui5-slider]::part(scale) {
     height: var(--_ui5_color_picker_slider_progress_container_height);
-    position: absolute;
     margin-top: var(--_ui5_color_picker_slider_container_margin_top);
     border-radius: 0;
     border: 0.0625rem solid var(--sapField_BorderColor);
+    box-sizing: content-box;
 }
 
-[ui5-slider].ui5-color-picker-hue-slider::part(progress-container) {
+[ui5-slider]::part(scale-inner) {
+    background: transparent;
+    width: calc(100% - .5625rem);
+}
+
+[ui5-slider]::part(scale-inner)::before,
+[ui5-slider]::part(scale-inner)::after {
+    display: none;
+}
+
+[ui5-slider]::part(progress) {
+    background: transparent;
+}
+
+[ui5-slider].ui5-color-picker-hue-slider::part(scale) {
     background-size: 100%;
     background-image: -webkit-linear-gradient(left, #f00, #ff0, #0f0, #0ff, #00f, #f0f, #f00);
     background-image: -moz-linear-gradient(left, #f00, #ff0, #0f0, #0ff, #00f, #f0f, #f00);
@@ -104,7 +110,7 @@
     background-color: none;
 }
 
-[ui5-slider].ui5-color-picker-alpha-slider::part(progress-container) {
+[ui5-slider].ui5-color-picker-alpha-slider::part(scale) {
     background-image: -webkit-linear-gradient(left, rgba(65, 120, 13, 0), var(--ui5_Color_Picker_Progress_Container_Color)), url('data:image/png;base64,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');
 }
 
@@ -191,12 +197,8 @@
     margin-top: var(--_ui5_color_channel_toggle_button_margin-top);
 }
 
-.ui5-color-picker-hue-slider::part(progress-container)::before,
-.ui5-color-picker-alpha-slider::part(progress-container)::before,
-.ui5-color-picker-hue-slider::part(progress-container)::after,
-.ui5-color-picker-alpha-slider::part(progress-container)::after,
-[ui5-slider].ui5-color-picker-hue-slider::part(icon-slider),
-[ui5-slider].ui5-color-picker-alpha-slider::part(icon-slider) {
+[ui5-slider].ui5-color-picker-hue-slider::part(handle-icon),
+[ui5-slider].ui5-color-picker-alpha-slider::part(handle-icon) {
      display: none;
 }
 
@@ -242,7 +244,3 @@
     background-image: -moz-linear-gradient(right, #f00, #ff0, #0f0, #0ff, #00f, #f0f, #f00);
     background-image: linear-gradient(right, #f00, #ff0, #0f0, #0ff, #00f, #f0f, #f00);
 }
-
-:dir(rtl) .ui5-color-picker-sliders-wrapper {
-	margin-left: 0.625rem;
-}

package/src/themes/ComboBox.css

@@ -8,4 +8,8 @@
 	width: 100%;
 	height: 100%;
 	border-radius: var(--_ui5_input_border_radius);
+}
+
+:host(:not([readonly])) [inner-input] {
+	padding: var(--_ui5_input_inner_padding_with_icon);
 }

package/src/themes/ComboBoxPopover.css

@@ -13,4 +13,8 @@
 
 .ui5-combobox-busy:not([active]) {
 	display: none;
+}
+
+[ui5-responsive-popover] [ui5-input] {
+	width: 100%;
 }

package/src/themes/DatePicker.css

@@ -1,6 +1,7 @@
 @import "./InvisibleTextStyles.css";
 @import "./InputIcon.css";
 @import "./InputSharedStyles.css";
+@import "./FormComponents.css";
 
 :host(:not([hidden])) {
 	display: inline-block;
@@ -40,7 +41,6 @@
 }
 
 :host .ui5-date-picker-input {
-	width: 100%;
 	color: inherit;
 	background-color: inherit;
 	border-radius: inherit;
@@ -62,4 +62,5 @@
 
 .ui5-date-picker-popover::part(header) {
 	padding: 0;
-}
+}
+

package/src/themes/DatePickerPopover.css

@@ -1,16 +1,45 @@
 .ui5-date-picker-popover {
-	width: var(--_ui5_calendar_width);
+	width: auto;
+	min-width: var(--_ui5_calendar_width);
 	.ui5-popover-header {
 		width: 100%;
 	}
 }
 
+.ui5-date-picker-popover .ui5-responsive-popover-header .row {
+	justify-content: flex-start;
+	font-family: var(--sapFontHeaderFamily);
+	font-size: var(--sapFontHeader5Size);
+	color: var(--sapPageHeader_TextColor);
+}
+
 [ui5-calendar] {
-	width: 100%;
+	width: auto;
 	display: flex;
 	justify-content: center;
 }
 
 [ui5-responsive-popover]::part(content) {
-    padding: 0;
+	padding: 0;
+}
+
+.ui5-dt-picker-footer {
+	display: flex;
+	justify-content: flex-end;
+	align-items: center;
+	height: 2.75rem;
+	width: 100%;
+}
+
+.ui5-dt-picker-footer.ui5-dt-picker-footer-time-hidden {
+	padding: 0;
+}
+
+.ui5-dt-picker-action {
+	margin: 0.25rem;
+}
+
+[ui5-responsive-popover]::part(header) {
+	font-family: var(--_ui5_button_fontFamily);
+	text-align: left;
 }

package/src/themes/DateTimePicker.css

@@ -5,7 +5,9 @@
 }
 
 :host .ui5-date-picker-input {
+	width: 100%;
 	min-width: inherit;
 	color: inherit;
 	background-color: inherit;
+	
 }

package/src/themes/DateTimePickerPopover.css

@@ -4,7 +4,9 @@
 }
 
 :host .ui5-date-picker-popover:not([on-phone]) .ui5-popover-header {
-	width: 20rem;
+	width: 100%;
+	max-width: 100%;
+	display: block;
 }
 
 .ui5-dt-picker-content {

package/src/themes/DayPicker.css

@@ -1,3 +1,5 @@
+@import "./InvisibleTextStyles.css";
+
 :host(:not([hidden])) {
 	display: block;
 }
@@ -420,7 +422,7 @@
 }
 
 .ui5-dp-item--withsecondtype .ui5-dp-daytext {
-	font-size: 0.75rem;
+	font-size: var(--_ui5_dp_item_withsecondtype_font_size);
 }
 
 .ui5-dp-item.ui5-dp-item--withsecondtype .ui5-dp-specialday,

package/src/themes/Dialog.css

@@ -1,8 +1,8 @@
 @import "./InvisibleTextStyles.css";
 
 :host {
-	min-width: 20rem;
-	min-height: 6rem;
+	min-width: min(20rem, 90vw);
+	min-height: min(6rem, 90vh);
 	max-height: 94%;
 	max-width: 90%;
 	flex-direction: column;
@@ -139,22 +139,6 @@
 	color: var(--sapButton_Lite_TextColor);
 }
 
-::slotted([slot="footer"]) {
-	height: var(--_ui5_dialog_footer_height);
-}
-
-::slotted([slot="footer"][ui5-bar][design="Footer"]) {
-	border-top: none;
-}
-
-::slotted([slot="header"][ui5-bar]) {
-	box-shadow: none;
-}
-
-::slotted([slot="footer"][ui5-toolbar]) {
-	border: 0;
-}
-
 :host::backdrop {
 	background-color: var(--_ui5_popup_block_layer_background);
 	opacity: var(--_ui5_popup_block_layer_opacity);

package/src/themes/Form.css

@@ -3,6 +3,7 @@
 
 :host {
 	display: block;
+	container-type: inline-size;
 }
 
 .ui5-form-root {
@@ -10,7 +11,6 @@
 	flex-direction: column;
 	background-color: var(--sapGroup_ContentBackground);
     border-radius: 0.75rem;
-	container-type: inline-size;
 }
 
 .ui5-form-header {
@@ -30,7 +30,7 @@
 }
 
 .ui5-form-group-layout {
-	display: grid;
+	display: block;
 	column-gap: 1rem;
 }
 
@@ -51,5 +51,7 @@
 }
 
 dl {
-	all: unset;
+	padding: 0;
+	margin: 0;
+	border: 0 transparent;
 }

package/src/themes/FormItem.css

@@ -3,46 +3,25 @@
 	width: 100%;
 }
 
-:host([column-span="1"]) {
-	grid-column: span 1;
-}
-
-:host([column-span="2"]) {
-	grid-column: span 2;
-}
-
-:host([column-span="3"]) {
-	grid-column: span 3;
-}
-
-:host([column-span="4"]) {
-	grid-column: span 4;
-}
-
-:host([column-span="5"]) {
-	grid-column: span 5;
-}
-
-:host([column-span="6"]) {
-	grid-column: span 6;
+:host {
+	break-inside: avoid;
 }
 
 .ui5-form-item-root {
-	container-type: inline-size;
 	background-color: inherit;
 	color: inherit;
 }
 
 .ui5-form-item-layout {
 	display: grid;
-	grid-template-columns: var(--ui5-form-item-layout);
+	grid-template-columns: var(--ui5-form-item-layout, 4fr 8fr 0fr);
 	align-items: center;
 }
 
 .ui5-form-item-label {
-	padding: var(--ui5-form-item-label-padding);
-	padding-inline-end: var(--ui5-form-item-label-padding-end);
-	justify-self: var(--ui5-form-item-label-justify);
+	padding: var(--ui5-form-item-label-padding, 0.125rem 0);
+	padding-inline-end: 0.85rem;
+	justify-self: var(--ui5-form-item-label-justify, end);
 }
 
 .ui5-form-item-content {
@@ -69,34 +48,8 @@
 	width: 100%;
 }
 
-@container (max-width: 600px) {
-	:host {
-		order: var(--ui5-form-item-order-S, unset);
-	}
-}
-
-/* M  - 1 column by default, up to 2 columns */
-@container (width > 600px) and (width <= 1024px) {
-	:host {
-		order: var(--ui5-form-item-order-M, unset);
-	}
-
-}
-
-/* L - 2 columns by default, up to 3 columns */
-@container (width > 1024px) and (width <= 1440px) {
-	:host {
-		order: var(--ui5-form-item-order-L, unset);
-	}
-}
-
-/* XL - 3 columns by default, up to 6 */
-@container (min-width: 1441px) {
-	:host {
-		order: var(--ui5-form-item-order-Xl, unset);
-	}
-}
-
 dd {
-	all: unset;
+	padding: 0;
+	margin: 0;
+	border: 0 transparent;
 }

package/src/themes/FormItemSpan.css

@@ -1,59 +1,64 @@
-/* 
-* By default, 
+/*
+* By default:
 * - in M, L ans XL sizes the Form's labels take 4 cells out 12 of the whole width, e.g 4:8:0
 * - in S size, it  the Form's labels take the whole width 12/12 cells, e.g the label and the input are displayed vertically.
 *
 * The ratio can be changed via the labelSpan and the emptySpan properties.
 */
 
-@container (max-width: 600px) {
+:host {
+	--ui5-form-item-label-justify-internal: start;
+	--ui5-form-item-label-padding-internal: 0.625rem 0.25rem 0 0.25rem;
+}
+
+@container (max-width: 599px) {
 	.ui5-form-item,
 	.ui5-form-group {
 		--ui5-form-item-layout: var(--ui5-form-item-layout-S);
 	}
 
-	:host([label-span-s="12"]) .ui5-form-item,
-	:host([label-span-s="12"]) .ui5-form-group {
-		--ui5-form-item-label-justify: var(--ui5-form-item-label-justify-span12);
-		--ui5-form-item-label-padding: var(--ui5-form-item-label-padding-span12);
+	:host(:is([label-span~="S12"], :not([label-span*="S"]))) .ui5-form-item,
+	:host(:is([label-span~="S12"], :not([label-span*="S"]))) .ui5-form-group {
+		--ui5-form-item-label-justify: var(--ui5-form-item-label-justify-internal);
+		--ui5-form-item-label-padding: var(--ui5-form-item-label-padding-internal);
 	}
 }
 
-@container (width > 600px) and (width <= 1024px) {
+@container (min-width: 600px) and (max-width: 1023px) {
 	.ui5-form-item,
 	.ui5-form-group {
 		--ui5-form-item-layout: var(--ui5-form-item-layout-M);
 	}
 
-	:host([label-span-m="12"]) .ui5-form-item,
-	:host([label-span-m="12"]) .ui5-form-group {
-		--ui5-form-item-label-justify: var(--ui5-form-item-label-justify-span12);
-		--ui5-form-item-label-padding: var(--ui5-form-item-label-padding-span12);
+	:host([label-span~="M12"]) .ui5-form-item,
+	:host([label-span~="M12"]) .ui5-form-group {
+		--ui5-form-item-label-justify: var(--ui5-form-item-label-justify-internal);
+		--ui5-form-item-label-padding: var(--ui5-form-item-label-padding-internal);
 	}
 }
 
-@container (width > 1024px) and (width <= 1440px) {
+@container (min-width: 1024px) and (max-width: 1439px) {
 	.ui5-form-item,
 	.ui5-form-group {
 		--ui5-form-item-layout: var(--ui5-form-item-layout-L);
 	}
 
-	:host([label-span-l="12"]) .ui5-form-item,
-	:host([label-span-l="12"]) .ui5-form-group {
-		--ui5-form-item-label-justify: var(--ui5-form-item-label-justify-span12);
-		--ui5-form-item-label-padding: var(--ui5-form-item-label-padding-span12);
+	:host([label-span~="L12"]) .ui5-form-item,
+	:host([label-span~="L12"]) .ui5-form-group {
+		--ui5-form-item-label-justify: var(--ui5-form-item-label-justify-internal);
+		--ui5-form-item-label-padding: var(--ui5-form-item-label-padding-internal);
 	}
 }
 
-@container (min-width: 1441px) {
+@container (min-width: 1440px) {
 	.ui5-form-item,
 	.ui5-form-group {
 		--ui5-form-item-layout: var(--ui5-form-item-layout-XL);
 	}
 
-	:host([label-span-xl="12"]) .ui5-form-item,
-	:host([label-span-xl="12"]) .ui5-form-group {
-		--ui5-form-item-label-justify: var(--ui5-form-item-label-justify-span12);
-		--ui5-form-item-label-padding: var(--ui5-form-item-label-padding-span12);
+	:host([label-span~="XL12"]) .ui5-form-item,
+	:host([label-span~="XL12"]) .ui5-form-group {
+		--ui5-form-item-label-justify: var(--ui5-form-item-label-justify-internal);
+		--ui5-form-item-label-padding: var(--ui5-form-item-label-padding-internal);
 	}
-}
+}