From dd1c4e4bc3ae97f5142d0dd9b86ed0741e624eb7 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Thu, 4 Jan 2024 15:47:00 +0100 Subject: [PATCH 1/3] fix lint error Signed-off-by: Jens Langhammer --- .../ak-dual-select/stories/ak-dual-select-master.stories.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/src/elements/ak-dual-select/stories/ak-dual-select-master.stories.ts b/web/src/elements/ak-dual-select/stories/ak-dual-select-master.stories.ts index 0c94ac51b..2c6613980 100644 --- a/web/src/elements/ak-dual-select/stories/ak-dual-select-master.stories.ts +++ b/web/src/elements/ak-dual-select/stories/ak-dual-select-master.stories.ts @@ -61,8 +61,7 @@ const metadata: Meta = { export default metadata; @customElement("ak-sb-fruity") -// @ts-ignore -class AkSbFruity extends LitElement { +export class AkSbFruity extends LitElement { @property({ type: Array }) options: DualSelectPair[] = goodForYou; From add0b56cc72101d3fa95fa2b639af3315c1c80c5 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Thu, 4 Jan 2024 15:47:56 +0100 Subject: [PATCH 2/3] update strings slightly Signed-off-by: Jens Langhammer --- .../elements/ak-dual-select/ak-dual-select.ts | 6 +++--- web/xliff/de.xlf | 18 ++++++++-------- web/xliff/en.xlf | 18 ++++++++-------- web/xliff/es.xlf | 18 ++++++++-------- web/xliff/fr.xlf | 18 ++++++++-------- web/xliff/pl.xlf | 18 ++++++++-------- web/xliff/pseudo-LOCALE.xlf | 21 ++++++++----------- web/xliff/tr.xlf | 18 ++++++++-------- web/xliff/zh-Hans.xlf | 18 ++++++++-------- web/xliff/zh-Hant.xlf | 18 ++++++++-------- web/xliff/zh_TW.xlf | 18 ++++++++-------- 11 files changed, 93 insertions(+), 96 deletions(-) diff --git a/web/src/elements/ak-dual-select/ak-dual-select.ts b/web/src/elements/ak-dual-select/ak-dual-select.ts index d42fb1bf7..17230288b 100644 --- a/web/src/elements/ak-dual-select/ak-dual-select.ts +++ b/web/src/elements/ak-dual-select/ak-dual-select.ts @@ -247,10 +247,10 @@ export class AkDualSelect extends CustomEmitterElement(CustomListenerElement(AKE const selectedCount = this.selectedPane.value?.toMove.size ?? 0; const selectedTotal = this.selected.length; const availableStatus = - availableCount > 0 ? msg(str`${availableCount} items marked to add.`) : " "; - const selectedTotalStatus = msg(str`${selectedTotal} items selected.`); + availableCount > 0 ? msg(str`${availableCount} item(s) marked to add.`) : " "; + const selectedTotalStatus = msg(str`${selectedTotal} item(s) selected.`); const selectedCountStatus = - selectedCount > 0 ? " " + msg(str`${selectedCount} items marked to remove.`) : ""; + selectedCount > 0 ? " " + msg(str`${selectedCount} item(s) marked to remove.`) : ""; const selectedStatus = `${selectedTotalStatus} ${selectedCountStatus}`; return html` diff --git a/web/xliff/de.xlf b/web/xliff/de.xlf index ce3acc4da..0bb4ba3f8 100644 --- a/web/xliff/de.xlf +++ b/web/xliff/de.xlf @@ -6249,20 +6249,20 @@ Bindings to groups/users are checked against the user of the event. Selected options - - items marked to add. - - - items selected. - - - items marked to remove. - Available Applications Selected Applications + + + item(s) marked to add. + + + item(s) selected. + + + item(s) marked to remove. diff --git a/web/xliff/en.xlf b/web/xliff/en.xlf index 8b4644718..5a33794d1 100644 --- a/web/xliff/en.xlf +++ b/web/xliff/en.xlf @@ -6525,20 +6525,20 @@ Bindings to groups/users are checked against the user of the event. Selected options - - items marked to add. - - - items selected. - - - items marked to remove. - Available Applications Selected Applications + + + item(s) marked to add. + + + item(s) selected. + + + item(s) marked to remove. diff --git a/web/xliff/es.xlf b/web/xliff/es.xlf index e7ed65a4e..4f4bd9cf4 100644 --- a/web/xliff/es.xlf +++ b/web/xliff/es.xlf @@ -6165,20 +6165,20 @@ Bindings to groups/users are checked against the user of the event. Selected options - - items marked to add. - - - items selected. - - - items marked to remove. - Available Applications Selected Applications + + + item(s) marked to add. + + + item(s) selected. + + + item(s) marked to remove. diff --git a/web/xliff/fr.xlf b/web/xliff/fr.xlf index 89d737d7a..466e5e754 100644 --- a/web/xliff/fr.xlf +++ b/web/xliff/fr.xlf @@ -8212,20 +8212,20 @@ Les liaisons avec les groupes/utilisateurs sont vérifiées par rapport à l'uti Selected options - - items marked to add. - - - items selected. - - - items marked to remove. - Available Applications Selected Applications + + + item(s) marked to add. + + + item(s) selected. + + + item(s) marked to remove. diff --git a/web/xliff/pl.xlf b/web/xliff/pl.xlf index 15963b7f0..cfe09a4d4 100644 --- a/web/xliff/pl.xlf +++ b/web/xliff/pl.xlf @@ -6373,20 +6373,20 @@ Bindings to groups/users are checked against the user of the event. Selected options - - items marked to add. - - - items selected. - - - items marked to remove. - Available Applications Selected Applications + + + item(s) marked to add. + + + item(s) selected. + + + item(s) marked to remove. diff --git a/web/xliff/pseudo-LOCALE.xlf b/web/xliff/pseudo-LOCALE.xlf index 86b7afe3c..da6cd9e95 100644 --- a/web/xliff/pseudo-LOCALE.xlf +++ b/web/xliff/pseudo-LOCALE.xlf @@ -8156,18 +8156,6 @@ Bindings to groups/users are checked against the user of the event. Selected options Śēĺēćţēď ōƥţĩōńś - - items marked to add. - ĩţēmś màŕķēď ţō àďď. - - - items selected. - ĩţēmś śēĺēćţēď. - - - items marked to remove. - ĩţēmś màŕķēď ţō ŕēmōvē. - Available Applications Àvàĩĺàƀĺē Àƥƥĺĩćàţĩōńś @@ -8176,4 +8164,13 @@ Bindings to groups/users are checked against the user of the event. Selected Applications Śēĺēćţēď Àƥƥĺĩćàţĩōńś + + item(s) marked to add. + + + item(s) selected. + + + item(s) marked to remove. + diff --git a/web/xliff/tr.xlf b/web/xliff/tr.xlf index d75c7737e..e873d25b9 100644 --- a/web/xliff/tr.xlf +++ b/web/xliff/tr.xlf @@ -6158,20 +6158,20 @@ Bindings to groups/users are checked against the user of the event. Selected options - - items marked to add. - - - items selected. - - - items marked to remove. - Available Applications Selected Applications + + + item(s) marked to add. + + + item(s) selected. + + + item(s) marked to remove. diff --git a/web/xliff/zh-Hans.xlf b/web/xliff/zh-Hans.xlf index a9475007c..d617951c7 100644 --- a/web/xliff/zh-Hans.xlf +++ b/web/xliff/zh-Hans.xlf @@ -8214,20 +8214,20 @@ Bindings to groups/users are checked against the user of the event. Selected options - - items marked to add. - - - items selected. - - - items marked to remove. - Available Applications Selected Applications + + + item(s) marked to add. + + + item(s) selected. + + + item(s) marked to remove. diff --git a/web/xliff/zh-Hant.xlf b/web/xliff/zh-Hant.xlf index 5a15deab3..0cad17bd7 100644 --- a/web/xliff/zh-Hant.xlf +++ b/web/xliff/zh-Hant.xlf @@ -6206,20 +6206,20 @@ Bindings to groups/users are checked against the user of the event. Selected options - - items marked to add. - - - items selected. - - - items marked to remove. - Available Applications Selected Applications + + + item(s) marked to add. + + + item(s) selected. + + + item(s) marked to remove. diff --git a/web/xliff/zh_TW.xlf b/web/xliff/zh_TW.xlf index 18f1e06b0..4f20250c9 100644 --- a/web/xliff/zh_TW.xlf +++ b/web/xliff/zh_TW.xlf @@ -8094,20 +8094,20 @@ Bindings to groups/users are checked against the user of the event. Selected options - - items marked to add. - - - items selected. - - - items marked to remove. - Available Applications Selected Applications + + + item(s) marked to add. + + + item(s) selected. + + + item(s) marked to remove. From 6c3e24396221368e25d7a72081f34ae1d08daabb Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Thu, 4 Jan 2024 15:48:03 +0100 Subject: [PATCH 3/3] start on dark theme support Signed-off-by: Jens Langhammer --- .../elements/ak-dual-select/components/styles.css.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/web/src/elements/ak-dual-select/components/styles.css.ts b/web/src/elements/ak-dual-select/components/styles.css.ts index f2c057bf6..bb71c377c 100644 --- a/web/src/elements/ak-dual-select/components/styles.css.ts +++ b/web/src/elements/ak-dual-select/components/styles.css.ts @@ -89,6 +89,16 @@ export const globalVariables = css` --pf-c-dual-list-selector--selection-desc--FontSize: var(--pf-global--FontSize--xs); --pf-c-dual-list-selector--selection-desc--Color: var(--pf-global--Color--dark-200); } + :host([theme="dark"]) { + --pf-c-dual-list-selector__menu--BorderColor: var(--ak-dark-background-lighter); + --pf-c-dual-list-selector__item-text--Color: var(--ak-dark-foreground); + --pf-c-dual-list-selector__list-item-row--BackgroundColor: var( + --ak-dark-background-light-ish + ); + --pf-c-dual-list-selector__list-item-row--hover--BackgroundColor: var( + --ak-dark-background-lighter; + ); + } `; export const mainStyles = css`