diff --git a/sveltejs/public/build/bundle.js b/sveltejs/public/build/bundle.js index 022a59fcd7192efca14fc1e01422460644adf8d1..d886e24189a268d14bdf33b3426558f3cfeff5bf 100644 Binary files a/sveltejs/public/build/bundle.js and b/sveltejs/public/build/bundle.js differ diff --git a/sveltejs/public/build/bundle.js.map b/sveltejs/public/build/bundle.js.map index bf816089563d7c72ef1c676fc0399eb9b52f86bd..9cb8ddef8d89b5dfe6e4fe941b8fd87c7f168a15 100644 Binary files a/sveltejs/public/build/bundle.js.map and b/sveltejs/public/build/bundle.js.map differ diff --git a/sveltejs/src/Project/ActionButton.svelte b/sveltejs/src/Project/ActionButton.svelte index 28f59602c9e040ba30dbc7db08981fd60f459844..26c5b4c34ae23cb0aa4ddcd36cb75b3c57e5de64 100644 --- a/sveltejs/src/Project/ActionButton.svelte +++ b/sveltejs/src/Project/ActionButton.svelte @@ -15,7 +15,6 @@ // eslint-disable-next-line import/no-mutable-exports,import/prefer-default-export export let project; - const drupalSetting = drupalSettings; const { Drupal } = window; const processMultipleProjects = MAX_SELECTIONS === null || MAX_SELECTIONS > 1; @@ -59,11 +58,7 @@ <ProjectStatusIndicator {project} statusText={Drupal.t('Not compatible')} /> {:else if project.status === 'active'} <ProjectStatusIndicator {project} statusText={Drupal.t('Installed')}> - {#if 'gin' in drupalSetting && drupalSetting.gin.darkmode === '1'} - <ProjectIcon type="greenInstalled" /> - {:else} - <ProjectIcon type="installed" /> - {/if} + <ProjectIcon type="installed" /> </ProjectStatusIndicator> {:else} <span> diff --git a/sveltejs/src/Project/ProjectIcon.svelte b/sveltejs/src/Project/ProjectIcon.svelte index 27a9501c02bebf46ea6ded24f60da69df248cb1d..fa19914a0452ffba41c8638408d7fd0ae903af53 100644 --- a/sveltejs/src/Project/ProjectIcon.svelte +++ b/sveltejs/src/Project/ProjectIcon.svelte @@ -1,8 +1,8 @@ <script> import { FULL_MODULE_PATH, DARK_COLOR_SCHEME } from '../constants'; - const { Drupal } = window; - // eslint-disable-next-line import/no-mutable-exports,import/prefer-default-export + const { Drupal, drupalSettings } = window; + export let type = ''; export let variant = false; export let classes = false; @@ -37,18 +37,22 @@ alt: Drupal.t('Installed'), title: Drupal.t('This project is installed.'), }, - greenInstalled: { - path: 'green-checkmark-icon', - alt: Drupal.t('Installed'), - title: Drupal.t('This module is installed.'), - }, }; + const { alt, title } = typeToImg[type]; + let { path } = typeToImg[type]; + if ( + 'gin' in drupalSettings && + drupalSettings.gin.darkmode === '1' && + type === 'installed' + ) { + path = 'green-checkmark-icon'; + } </script> {#if type === 'installed'} - <span class="pb-project__status-icon-span" title={typeToImg[type].title}> + <span class="pb-project__status-icon-span" {title}> <img - src="{FULL_MODULE_PATH}/images/{typeToImg[type].path}{DARK_COLOR_SCHEME + src="{FULL_MODULE_PATH}/images/{path}{DARK_COLOR_SCHEME ? '--dark-color-scheme' : ''}.svg" class={`pb-icon pb-icon--${variant} pb-icon--${type} ${classes}`} @@ -62,7 +66,7 @@ ? '--dark-color-scheme' : ''}.svg" class={`pb-icon pb-icon--${variant} pb-icon--${type} ${classes}`} - alt={typeToImg[type].alt} + {alt} /> </button> {/if}