diff --git a/src/components/CardFull.svelte b/src/components/CardFull.svelte index 25fe3de..056d627 100644 --- a/src/components/CardFull.svelte +++ b/src/components/CardFull.svelte @@ -323,13 +323,6 @@ overflow-y: auto; } - .preview_body { - flex-direction: column; - align-items: stretch; - overflow: visible; - min-height: auto; - } - .preview-container { flex: none; width: 100%; diff --git a/src/components/CardSmall.svelte b/src/components/CardSmall.svelte index 0c9c262..c5bc369 100644 --- a/src/components/CardSmall.svelte +++ b/src/components/CardSmall.svelte @@ -209,11 +209,6 @@ align-items: flex-start; } - .color-switcher-container { - margin-left: 0; - margin-top: 0.5rem; - } - .logo-actions { flex-wrap: wrap; } diff --git a/src/components/ColorSwitcher.svelte b/src/components/ColorSwitcher.svelte index d28c94e..8ba9519 100644 --- a/src/components/ColorSwitcher.svelte +++ b/src/components/ColorSwitcher.svelte @@ -2,7 +2,6 @@ import { generateColorSetCircle, getNoColorCircle } from '../utils/colorCircles.js'; import ColorsVariants from './ColorsVariants.svelte'; export let logo; - export let theme; export let mode = 'standard'; // 'standard' or 'compact' export let onSelect = (color, setName) => {}; @@ -67,20 +66,8 @@ on:blur={handleDropdownBlur} >
- handleCircleClick(undefined, undefined, e)} - on:keydown|stopPropagation={(e) => (e.key === 'Enter' || e.key === ' ') && handleCircleClick(undefined, undefined, e)} - > - {@html getNoColorCircle()} - {#if logo.sets} - handleCircleClick(Object.values(logo.colors)[Object.keys(logo.sets).indexOf(setName) % Object.keys(logo.colors).length], setName)} /> + handleCircleClick(setName ? Object.values(logo.colors)[Object.keys(logo.sets).indexOf(setName) % Object.keys(logo.colors).length] : undefined, setName)} /> {/if}
@@ -88,20 +75,8 @@ {:else}
- handleCircleClick(undefined, undefined, e)} - on:keydown|stopPropagation={(e) => (e.key === 'Enter' || e.key === ' ') && handleCircleClick(undefined, undefined, e)} - > - {@html getNoColorCircle()} - {#if logo.sets} - handleCircleClick(Object.values(logo.colors)[Object.keys(logo.sets).indexOf(setName) % Object.keys(logo.colors).length], setName)} /> + handleCircleClick(setName ? Object.values(logo.colors)[Object.keys(logo.sets).indexOf(setName) % Object.keys(logo.colors).length] : undefined, setName)} /> {/if}
{/if} @@ -131,9 +106,6 @@ .color-circle:hover { transform: scale(1.1); } - .color-circle.active { - box-shadow: 0 0 8px 7px rgba(70, 25, 194, 0.68); - } .color-dropdown { position: absolute; bottom: 32px; @@ -150,10 +122,7 @@ min-width: 120px; flex-wrap: wrap; } - .color-option { - border: 1px solid var(--color-border, #ddd); - margin: 0 2px 2px 0; - } + .color-reset { background: none !important; width: 24px; diff --git a/src/components/ColorsVariants.svelte b/src/components/ColorsVariants.svelte index cc14544..655e1e8 100644 --- a/src/components/ColorsVariants.svelte +++ b/src/components/ColorsVariants.svelte @@ -1,54 +1,70 @@ {#if sets && Object.keys(sets).length} -
- {#each Object.entries(sets) as [setName, setConfig], i} - onSelect(setName)} - on:keydown|stopPropagation={(e) => (e.key === 'Enter' || e.key === ' ') && onSelect(setName)} - style="padding: 0; overflow: hidden;" - > - {@html generateColorSetCircle(colors, sets[setName], 24)} - - {/each} -
+
+ {#if showNoColor} + onSelect(undefined)} + on:keydown|stopPropagation={(e) => + (e.key === "Enter" || e.key === " ") && onSelect(undefined)} + > + {@html getNoColorCircle()} + + {/if} + {#each Object.entries(sets) as [setName, setConfig], i} + onSelect(setName)} + on:keydown|stopPropagation={(e) => + (e.key === "Enter" || e.key === " ") && onSelect(setName)} + style="padding: 0; overflow: hidden;" + > + {@html generateColorSetCircle(colors, sets[setName], 24)} + + {/each} +
{/if}