Skip to content

Commit 727c26c

Browse files
committed
Merge branch 'cardsboard' of https://github.com/edufeed-org/kanban-editor into cardsboard
2 parents 4314aab + 605f95f commit 727c26c

File tree

6 files changed

+35
-59
lines changed

6 files changed

+35
-59
lines changed

src/app.css

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@
2727
--card-foreground: oklch(38% .02 250);
2828
--popover: oklch(97% 0 0);
2929
--popover-foreground: oklch(38% .02 250);
30-
--primary: oklch(58% .19 35);
30+
--primary: oklch(33% 0.16 264);
3131
--primary-foreground: oklch(100% 0 0);
32-
--secondary: oklch(94% 0 0);
32+
--secondary: oklch(76% 0.19 65);
3333
--secondary-foreground: oklch(38% .02 250);
3434
--muted: oklch(94% 0 0);
3535
--muted-foreground: oklch(55% .01 250);
36-
--accent: oklch(58% .19 35);
36+
--accent: oklch(76% 0.19 65);
3737
--accent-foreground: oklch(100% 0 0);
3838
--destructive: oklch(65% .2 25);
3939
--destructive-foreground: oklch(100% 0 0);
4040
--border: oklch(88% .005 250);
4141
--input: oklch(91% 0 0);
42-
--ring: oklch(58% .19 35);
42+
--ring: oklch(76% 0.19 65);
4343

4444
/* Semantic Status Colors */
4545
--info: oklch(72% .11 230);
@@ -50,21 +50,21 @@
5050
--warning-foreground: oklch(20% 0 0);
5151

5252
/* Chart Colors */
53-
--chart-1: oklch(58% .19 35);
53+
--chart-1: oklch(33% 0.16 264);
5454
--chart-2: oklch(72% .15 150);
5555
--chart-3: oklch(72% .11 230);
56-
--chart-4: oklch(82% .17 85);
56+
--chart-4: oklch(76% 0.19 65);
5757
--chart-5: oklch(65% .2 25);
5858

5959
/* Sidebar */
6060
--sidebar: oklch(97% 0 0);
6161
--sidebar-foreground: oklch(38% .02 250);
62-
--sidebar-primary: oklch(58% .19 35);
62+
--sidebar-primary: oklch(33% 0.16 264);
6363
--sidebar-primary-foreground: oklch(100% 0 0);
6464
--sidebar-accent: oklch(94% 0 0);
6565
--sidebar-accent-foreground: oklch(38% .02 250);
6666
--sidebar-border: oklch(88% .005 250);
67-
--sidebar-ring: oklch(58% .19 35);
67+
--sidebar-ring: oklch(76% 0.19 65);
6868

6969
/* Board */
7070
--column-border: oklch(85% .01 250);
@@ -93,19 +93,19 @@
9393
--card-foreground: oklch(90% 0 0);
9494
--popover: oklch(18% .01 250);
9595
--popover-foreground: oklch(90% 0 0);
96-
--primary: oklch(58% .19 35);
96+
--primary: oklch(54% 0.1466 268.46);
9797
--primary-foreground: oklch(100% 0 0);
98-
--secondary: oklch(50% .02 250);
98+
--secondary: oklch(76% 0.19 65);
9999
--secondary-foreground: oklch(100% 0 0);
100100
--muted: oklch(30% .01 250);
101101
--muted-foreground: oklch(65% .01 250);
102-
--accent: oklch(58% .19 35);
102+
--accent: oklch(76% 0.19 65);
103103
--accent-foreground: oklch(100% 0 0);
104104
--destructive: oklch(65% .2 25);
105105
--destructive-foreground: oklch(100% 0 0);
106106
--border: oklch(35% .01 250);
107107
--input: oklch(26% .01 250);
108-
--ring: oklch(58% .19 35);
108+
--ring: oklch(76% 0.19 65);
109109

110110
/* Semantic Status Colors */
111111
--info: oklch(72% .11 230);
@@ -116,21 +116,21 @@
116116
--warning-foreground: oklch(15% 0 0);
117117

118118
/* Chart Colors */
119-
--chart-1: oklch(58% .19 35);
119+
--chart-1: oklch(54% 0.1466 268.46);
120120
--chart-2: oklch(72% .15 150);
121121
--chart-3: oklch(72% .11 230);
122-
--chart-4: oklch(82% .17 85);
122+
--chart-4: oklch(76% 0.19 65);
123123
--chart-5: oklch(65% .2 25);
124124

125125
/* Sidebar */
126126
--sidebar: oklch(18% .01 250);
127127
--sidebar-foreground: oklch(90% 0 0);
128-
--sidebar-primary: oklch(58% .19 35);
128+
--sidebar-primary: oklch(54% 0.1466 268.46);
129129
--sidebar-primary-foreground: oklch(100% 0 0);
130130
--sidebar-accent: oklch(30% .01 250);
131131
--sidebar-accent-foreground: oklch(90% 0 0);
132132
--sidebar-border: oklch(35% .01 250);
133-
--sidebar-ring: oklch(58% .19 35);
133+
--sidebar-ring: oklch(76% 0.19 65);
134134

135135
/* Board */
136136
--column-border: oklch(35% .01 250);

src/lib/components/ui/button/button.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
base: "focus-visible:border-accent focus-visible:ring-accent/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive inline-flex shrink-0 items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium outline-none transition-all focus-visible:ring-[3px] disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
88
variants: {
99
variant: {
10-
default: "bg-primary focus-visible:border-accent focus-visible:ring-accent/50 text-primary-foreground shadow-xs hover:bg-primary/90",
10+
default: "bg-primary focus-visible:border-accent focus-visible:ring-accent/50 text-primary-foreground shadow-xs hover:bg-primary/60",
1111
destructive:
1212
"bg-destructive shadow-xs hover:bg-destructive/90 focus-visible:border-accent focus-visible:ring-accent/50 dark:bg-destructive/60 text-white",
1313
outline:
1414
"bg-background shadow-xs hover:bg-accent hover:text-accent-foreground focus-visible:border-accent focus-visible:ring-accent/50 dark:bg-input/30 dark:border-input dark:hover:bg-accent/50 border",
15-
secondary: "bg-secondary focus-visible:border-accent focus-visible:ring-accent/50 text-secondary-foreground shadow-xs hover:bg-secondary/80",
16-
ghost: "hover:bg-accent focus-visible:border focus-visible:border-accent focus-visible:ring-accent/50 hover:text-accent-foreground dark:hover:bg-accent/50",
15+
secondary: "bg-background border border-primary text-primary focus-visible:border-accent focus-visible:ring-accent/50 shadow-xs hover:bg-muted",
16+
ghost: "hover:bg-accent focus-visible:border focus-visible:border-accent focus-visible:ring-accent hover:text-accent-foreground dark:hover:bg-accent",
1717
link: "text-primary underline-offset-4 hover:underline focus-visible:border-accent focus-visible:ring-accent/50",
1818
},
1919
size: {

src/routes/cardsboard/BoardsList.svelte

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -405,10 +405,10 @@
405405
<!-- Expandable Menu (Dropdown-Style) -->
406406
{#if hamburgerMenuOpen}
407407
<div transition:slide={{ duration: 200 }} class="border-b rounded -mx-0 -mt-2 mb-1 max-h-[40vh] overflow-y-auto bg-[var(--card)]">
408-
<!-- 1. Eigenschaften (Board Settings) -->
408+
<!-- 1. Einstellungen (Board Settings) -->
409409
<MenuItem
410410
icon={PackageOpenIcon}
411-
label="Eigenschaften"
411+
label="Einstellungen"
412412
onclick={() => {
413413
settingsDialogOpen = true;
414414
hamburgerMenuOpen = false;
@@ -845,8 +845,8 @@
845845
<Button
846846
onclick={authStore.isAuthenticated ? handleCreateBoard : null}
847847
disabled={authStore.isAuthenticated ? false : true}
848-
class="w-full gap-2 h-auto py-2 whitespace-normal add-board-button"
849-
variant="ghost"
848+
class="w-full gap-2 h-auto py-2 whitespace-normal"
849+
variant="default"
850850
data-testid="create-board-button"
851851
>
852852
{#if isCreating}

src/routes/cardsboard/CardDetailsDialog.svelte

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@
786786
<h3 class="text-sm font-semibold text-muted-foreground">Beschreibung</h3>
787787
{#if !readOnly && !isEditingDescription}
788788
<Button
789-
variant="ghost"
789+
variant="secondary"
790790
size="sm"
791791
onclick={() => isEditingDescription = true}
792792
class="h-6 px-2 text-xs"
@@ -871,7 +871,7 @@
871871
{#if !readOnly}
872872
<div bind:this={actionBarRef} class="flex justify-center gap-3 py-2">
873873
<Button
874-
variant={isEditingImage ? 'default' : 'ghost'}
874+
variant={isEditingImage ? 'default' : 'secondary'}
875875
size="sm"
876876
onclick={() => {
877877
isEditingImage = !isEditingImage;
@@ -891,7 +891,7 @@
891891
</span>
892892
</Button>
893893
<Button
894-
variant={isAddingLink ? 'default' : 'ghost'}
894+
variant={isAddingLink ? 'default' : 'secondary'}
895895
size="sm"
896896
onclick={() => {
897897
isAddingLink = !isAddingLink;
@@ -922,15 +922,13 @@
922922
<!-- Mode Toggle -->
923923
<div class="flex gap-1">
924924
<Button
925-
type="button"
926925
variant={imageMode === 'url' ? 'default' : 'outline'}
927926
size="sm"
928927
onclick={() => (imageMode = 'url')}
929928
>
930929
URL eingeben
931930
</Button>
932931
<Button
933-
type="button"
934932
variant={imageMode === 'oer' ? 'default' : 'outline'}
935933
size="sm"
936934
onclick={() => (imageMode = 'oer')}
@@ -1298,14 +1296,15 @@
12981296
size="sm"
12991297
onclick={handleAddComment}
13001298
disabled={isSubmitting || !commentText.trim()}
1301-
class="gap-2 bg-primary"
1299+
class="gap-2"
1300+
variant="secondary"
13021301
>
13031302
{#if isSubmitting}
13041303
<LoaderIcon class="h-4 w-4 animate-spin" />
13051304
<span>Wird gesendet...</span>
13061305
{:else}
13071306
<SendIcon class="h-4 w-4" />
1308-
<span>Absenden</span>
1307+
<span>Kommentar absenden</span>
13091308
{/if}
13101309
</Button>
13111310
</div>

src/routes/cardsboard/Column.svelte

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -381,30 +381,7 @@
381381
flex: 0 0 auto;
382382
}
383383
384-
/* Add-Card-Button: Inside scrollable area but outside dndzone */
385-
.add-card-button {
386-
border-radius: var(--radius-md);
387-
/* border: 2px dotted var(--accent); */
388-
background: var(--muted);
389-
color: var(--foreground);
390-
transition: all 0.2s ease;
391-
font-size: 0.9rem;
392-
cursor: pointer;
393-
width: 100%;
394-
margin-top: 0.5rem;
395-
flex-shrink: 0;
396-
align-items: center;
397-
justify-content: center;
398-
}
399-
400-
.add-card-button:hover {
401-
background: var(--primary);
402-
color: var(--primary-foreground);
403-
}
404-
405-
/* Hover style handled via pointer events on the element (no separate .hover selector to satisfy Svelte) */
406-
407-
.card-wrapper {
384+
.card-wrapper {
408385
margin-bottom: 0.75rem;
409386
}
410387
@@ -689,9 +666,9 @@
689666

690667
<!-- Add Card Button: OUTSIDE dndzone, INSIDE scrollable container -->
691668
{#if !readOnly}
692-
<button
693-
class="add-card-button flex items-center gap-2.5 px-4 py-5 rounded-md shadow-lg"
694-
type="button"
669+
<Button
670+
class="flex items-center gap-2.5 px-4 py-5 rounded-md shadow-lg"
671+
data-testid="add-card-button"
695672
onclick={(e) => {
696673
e.stopPropagation();
697674
e.preventDefault();
@@ -739,7 +716,7 @@
739716
>
740717
<SquarePlusIcon class="h-4.5 w-4.5" />
741718
<span>Karte hinzufügen</span>
742-
</button>
719+
</Button>
743720
{/if}
744721
</div>
745722
</div>

src/routes/cardsboard/LeftSidebarFooter.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
{#if isAuthenticated && currentUser}
8888
<!-- User ist angemeldet -->
8989
<DropdownMenu.Root>
90-
<DropdownMenu.Trigger class="bg-secondary rounded-md w-full">
90+
<DropdownMenu.Trigger class="rounded-md w-full">
9191
<div class="px-3 py-3 flex items-center gap-2" data-testid="auth-user-avatar">
9292
<Avatar.Root class="h-8 w-8 flex-shrink-0">
9393
<Avatar.Image

0 commit comments

Comments
 (0)