diff --git a/api/js/etemplate/Et2Date/Et2DateDuration.ts b/api/js/etemplate/Et2Date/Et2DateDuration.ts index cce72269c6..87189b5d5c 100644 --- a/api/js/etemplate/Et2Date/Et2DateDuration.ts +++ b/api/js/etemplate/Et2Date/Et2DateDuration.ts @@ -120,26 +120,25 @@ export class Et2DateDuration extends Et2InputWidget(FormControlMixin(LitElement) css` .form-field__group-two { width: 100%; - border: 1px solid var(--input-border-color); - border-radius: var(--sl-input-border-radius-medium, 3px); } et2-select { color: var(--input-text-color); border-left: 1px solid var(--input-border-color); flex: 2 1 auto; } - et2-select::part(form-control-input) { - border: none; + et2-select::part(control) { + border-top-left-radius: 0px; + border-bottom-left-radius: 0px; } et2-textbox { flex: 1 1 auto; max-width: 4.5em; + margin-right: -2px; } - et2-textbox::part(base) { - border: none; - } - et2-textbox:not(:last-of-type) { - border-right: 1px solid var(--input-border-color); + et2-textbox:not(:last-child)::part(base) { + border-right: none; + border-top-right-radius: 0px; + border-bottom-right-radius: 0px; } `, diff --git a/api/js/etemplate/Et2Select/Et2SelectCategory.ts b/api/js/etemplate/Et2Select/Et2SelectCategory.ts index dcc5f725bd..8a50411d97 100644 --- a/api/js/etemplate/Et2Select/Et2SelectCategory.ts +++ b/api/js/etemplate/Et2Select/Et2SelectCategory.ts @@ -29,7 +29,7 @@ export class Et2SelectCategory extends Et2StaticSelectMixin(Et2Select) } /* Border on the (single) selected value */ .select--standard .select__control { - border-left: 8px solid transparent; + border-left: 8px solid var(--sl-input-border-color); } ` ] @@ -118,7 +118,7 @@ export class Et2SelectCategory extends Et2StaticSelectMixin(Et2Select) this.append(image); } this.dropdown.querySelector(".select__control").style.borderColor = - getComputedStyle(checkedItem).getPropertyValue("--category-color") || "transparent"; + getComputedStyle(checkedItem).getPropertyValue("--category-color") || ""; } } diff --git a/api/js/etemplate/Et2Select/SearchMixin.ts b/api/js/etemplate/Et2Select/SearchMixin.ts index 7268e3b394..8c8672a694 100644 --- a/api/js/etemplate/Et2Select/SearchMixin.ts +++ b/api/js/etemplate/Et2Select/SearchMixin.ts @@ -108,11 +108,16 @@ export const Et2WithSearchMixin = >(superclass // @ts-ignore ...(super.styles ? (Symbol.iterator in Object(super.styles) ? super.styles : [super.styles]) : []), css` - /* Move the widget border */ + /* Move the widget border .form-control-input { border: solid var(--sl-input-border-width) var(--sl-input-border-color); border-radius: var(--sl-input-border-radius-medium); } + .form-control-input:hover { + background-color: var(--sl-input-background-color-hover); + border-color: var(--sl-input-border-color-hover); + color: var(--sl-input-color-hover); + } .select--standard .select__control { border-style: none; }