Skip to content

Fix/calendar colors #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
altaskur merged 8 commits into from
Jan 23, 2026
Merged

Fix/calendar colors #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2ef7995
Merge pull request #19 from altaskur/develop-to-main
altaskur Dec 8, 2025
092c17e
style(calendar): update color variables for light and dark modes
manurgdev Jan 14, 2026
d5c3541
style(styles): replace rgba color definitions with color-mix for impr…
manurgdev Jan 14, 2026
b6bf6f9
style(work-config-dialog): add new color variables for info and prima…
manurgdev Jan 14, 2026
581ff3a
style(open-time-entry-dialog): update background color to use new sub…
manurgdev Jan 14, 2026
4a970b8
style(open-day-override-dialog): update background and text colors to…
manurgdev Jan 14, 2026
5eeeff2
fix(run-sonar): add sonar.login parameter to sonar-scanner command fo…
manurgdev Jan 14, 2026
9a2ec53
Merge branch 'develop' into fix/calendar-colors
manurgdev Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/run-sonar.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ try {
console.log(`🔍 Running SonarQube scanner on ${SONAR_HOST}...`);

execSync(
`sonar-scanner -Dsonar.host.url="${SONAR_HOST}" -Dsonar.token="${SONAR_TOKEN}"`,
`sonar-scanner -Dsonar.host.url="${SONAR_HOST}" -Dsonar.token="${SONAR_TOKEN}" -Dsonar.login="${SONAR_TOKEN}"`,
{ stdio: "inherit" },
);

Expand Down
42 changes: 21 additions & 21 deletions src/app/components/open-calendar/open-calendar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
align-items: center;
padding: 0.25rem 0.75rem;
border-radius: var(--p-border-radius);
background: var(--p-surface-100);
background: var(--c-surface-muted);
}

.calendar__stat-label {
Expand All @@ -60,16 +60,16 @@
}

.calendar__stat.balance-positive {
background: var(--p-green-50);
background: var(--c-positive-bg);
.calendar__stat-value {
color: var(--p-green-600);
color: var(--c-positive-color);
}
}

.calendar__stat.balance-negative {
background: var(--p-red-50);
background: var(--c-negative-bg);
.calendar__stat-value {
color: var(--p-red-600);
color: var(--c-negative-color);
}
}

Expand Down Expand Up @@ -99,7 +99,7 @@
font-size: 0.75rem;
text-transform: uppercase;
color: var(--p-text-muted-color);
background: var(--p-surface-50);
background: var(--c-surface-subtle);
}

.calendar__days {
Expand Down Expand Up @@ -129,7 +129,7 @@
}

.calendar__day--other-month {
background: var(--p-surface-50);
background: var(--c-surface-subtle);

.calendar__day-number {
color: var(--p-text-muted-color);
Expand Down Expand Up @@ -217,7 +217,7 @@
font-size: 0.625rem;
padding: 0.25rem 0.375rem;
border-radius: var(--p-border-radius-sm);
background: var(--p-surface-100);
background: var(--c-surface-muted);
margin-bottom: 0.25rem;
}

Expand All @@ -235,21 +235,21 @@
}

.calendar__hours--complete {
background: var(--p-green-50);
background: var(--c-positive-bg);
.calendar__hours-worked {
color: var(--p-green-600);
color: var(--c-positive-color);
}
}

.calendar__hours--over {
background: var(--p-blue-50);
background: var(--c-over-bg);
.calendar__hours-worked {
color: var(--p-blue-600);
color: var(--c-over-color);
}
}

.calendar__day--non-work {
background: var(--p-surface-50);
background: var(--c-surface-subtle);

.calendar__day-number {
color: var(--p-text-muted-color);
Expand Down Expand Up @@ -328,7 +328,7 @@
}

.calendar__task--no-task {
background: var(--p-surface-100);
background: var(--c-surface-muted);
border-left-color: var(--p-text-muted-color);
color: var(--p-text-muted-color);
font-style: italic;
Expand Down Expand Up @@ -357,7 +357,7 @@
}

.calendar__weekday--summary {
background: var(--p-surface-100);
background: var(--c-surface-muted);
font-size: 0.625rem;
display: flex;
align-items: center;
Expand All @@ -370,7 +370,7 @@
align-items: center;
justify-content: center;
padding: 0.5rem;
background: var(--p-surface-50);
background: var(--c-surface-subtle);
border-bottom: 1px solid var(--p-surface-border);
font-size: 0.75rem;
gap: 0.125rem;
Expand All @@ -392,18 +392,18 @@
}

.calendar__week-summary--complete {
background: var(--p-green-50);
background: var(--c-positive-bg);

.calendar__week-worked {
color: var(--p-green-600);
color: var(--c-positive-color);
}
}

.calendar__week-summary--over {
background: var(--p-blue-50);
background: var(--c-over-bg);

.calendar__week-worked {
color: var(--p-blue-600);
color: var(--c-over-color);
}
}

Expand All @@ -426,7 +426,7 @@
align-items: center;
gap: 0.5rem;
padding: 0.75rem 1rem;
background: var(--p-surface-100);
background: var(--c-surface-muted);
border-radius: var(--p-border-radius);
font-size: 1rem;
}
Expand Down
8 changes: 4 additions & 4 deletions src/app/components/open-day-override-dialog/open-day-override-dialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
align-items: center;
gap: 0.75rem;
padding: 1rem;
background: var(--p-surface-50);
background: var(--c-surface-subtle);
border-radius: var(--p-border-radius);
font-size: 1rem;
font-weight: 500;
Expand Down Expand Up @@ -63,9 +63,9 @@
align-items: center;
gap: 0.5rem;
padding: 0.75rem;
background: var(--p-primary-50);
background: var(--c-primary-bg);
border-radius: var(--p-border-radius);
color: var(--p-primary-700);
color: var(--c-primary-color);
font-size: 0.875rem;

i {
Expand Down Expand Up @@ -118,7 +118,7 @@
justify-content: space-between;
align-items: center;
padding: 1rem;
background: var(--p-surface-100);
background: var(--c-surface-muted);
border-radius: var(--p-border-radius);
border-left: 4px solid var(--p-primary-color);
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/open-time-entry-dialog/open-time-entry-dialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
justify-content: space-between;
align-items: center;
padding: 1rem;
background: var(--p-surface-50);
background: var(--c-surface-subtle);
border-radius: var(--p-border-radius);
}

Expand Down
16 changes: 8 additions & 8 deletions src/app/components/open-work-config-dialog/open-work-config-dialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
align-items: center;
gap: 0.75rem;
padding: 0.5rem 0.75rem;
background: var(--p-surface-50);
background: var(--c-surface-subtle);
border-radius: var(--p-border-radius);
transition: all 0.2s;

Expand All @@ -57,8 +57,8 @@
}

&--last {
background: var(--p-primary-50);
border: 1px solid var(--p-primary-200);
background: var(--c-primary-bg);
border: 1px solid var(--c-primary-border);
}
}

Expand Down Expand Up @@ -90,14 +90,14 @@
.work-config__auto-label {
font-size: 0.875rem;
font-weight: 600;
color: var(--p-primary-600);
color: var(--c-primary-color);
}

.work-config__auto-badge {
font-size: 0.625rem;
padding: 0.125rem 0.375rem;
background: var(--p-primary-100);
color: var(--p-primary-700);
background: var(--c-primary-bg);
color: var(--c-primary-color);
border-radius: 9999px;
text-transform: uppercase;
font-weight: 600;
Expand All @@ -109,10 +109,10 @@
align-items: flex-start;
gap: 0.5rem;
padding: 0.75rem;
background: var(--p-blue-50);
background: var(--c-info-bg);
border-radius: var(--p-border-radius);
font-size: 0.75rem;
color: var(--p-blue-700);
color: var(--c-info-color);

i {
margin-top: 0.125rem;
Expand Down
30 changes: 30 additions & 0 deletions src/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,41 @@

html {
font-size: 14px;

/* Custom semantic colors - Light mode */
--c-positive-bg: var(--p-green-50);
--c-positive-color: var(--p-green-600);
--c-negative-bg: var(--p-red-50);
--c-negative-color: var(--p-red-600);
--c-over-bg: var(--p-blue-50);
--c-over-color: var(--p-blue-600);
--c-info-bg: var(--p-blue-50);
--c-info-color: var(--p-blue-700);
--c-primary-bg: var(--p-primary-50);
--c-primary-color: var(--p-primary-600);
--c-primary-border: var(--p-primary-200);
--c-surface-subtle: var(--p-surface-50);
--c-surface-muted: var(--p-surface-100);
}

html.my-app-dark {
background-color: var(--p-surface-900);
color: var(--p-surface-0);

/* Custom semantic colors - Dark mode */
--c-positive-bg: color-mix(in srgb, var(--p-green-500) 15%, transparent);
--c-positive-color: var(--p-green-400);
--c-negative-bg: color-mix(in srgb, var(--p-red-500) 15%, transparent);
--c-negative-color: var(--p-red-400);
--c-over-bg: color-mix(in srgb, var(--p-blue-500) 15%, transparent);
--c-over-color: var(--p-blue-400);
--c-info-bg: color-mix(in srgb, var(--p-blue-500) 15%, transparent);
--c-info-color: var(--p-blue-400);
--c-primary-bg: color-mix(in srgb, var(--p-primary-500) 15%, transparent);
--c-primary-color: var(--p-primary-400);
--c-primary-border: color-mix(in srgb, var(--p-primary-500) 30%, transparent);
--c-surface-subtle: color-mix(in srgb, var(--p-surface-0) 3%, transparent);
--c-surface-muted: color-mix(in srgb, var(--p-surface-0) 8%, transparent);
}

body {
Expand Down