Skip to content
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

SFD-143: Make dark mode error text easier to read #113

Merged
merged 6 commits into from
Jul 23, 2024
+25 −14
Merged

SFD-143: Make dark mode error text easier to read #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cb9e3e5
Move invalid input border style to styles.css
jantoun-scottlogic Jul 17, 2024
466636e
Add orange error colour for dark mode
jantoun-scottlogic Jul 17, 2024
64e2a1c
Change to white text on red background
jantoun-scottlogic Jul 18, 2024
3b390ae
Revert light mode error changes to original styling
jantoun-scottlogic Jul 18, 2024
16b89c4
Move dark mode styles to package-styles.css
jantoun-scottlogic Jul 22, 2024
18996bf
Move input, select styles to dark mode media block
jantoun-scottlogic Jul 22, 2024
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
8 changes: 4 additions & 4 deletions src/app/carbon-estimator-form/carbon-estimator-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
required
[attr.aria-describedby]="(headCount | invalidated) ? 'headCountError' : null" />
@if (headCount | invalidated) {
<div class="tce-text-error-red tce-flex tce-gap-1" aria-live="polite" id="headCountError">
<div class="tce-error-box tce-flex tce-gap-1" aria-live="polite" id="headCountError">
<span class="material-icons-outlined">error</span>
<p>The number of employees must be greater than 0.</p>
</div>
Expand Down Expand Up @@ -81,7 +81,7 @@
required
[attr.aria-describedby]="(numberOfServers | invalidated) ? 'numberOfServersError' : null" />
@if (numberOfServers | invalidated) {
<div class="tce-text-error-red tce-flex tce-gap-1" aria-live="polite" id="numberOfServersError">
<div class="tce-error-box tce-flex tce-gap-1" aria-live="polite" id="numberOfServersError">
<span class="material-icons-outlined">error</span>
<p>The number of servers must be greater than or equal to 0.</p>
</div>
Expand Down Expand Up @@ -210,7 +210,7 @@
required
[attr.aria-describedby]="(monthlyActiveUsers | invalidated) ? 'monthlyActiveUsersError' : null" />
@if (monthlyActiveUsers | invalidated) {
<div class="tce-text-error-red tce-flex tce-gap-1" aria-live="polite" id="monthlyActiveUsersError">
<div class="tce-error-box tce-flex tce-gap-1" aria-live="polite" id="monthlyActiveUsersError">
<span class="material-icons-outlined">error</span>
<p>
Monthly active users must be greater than 0. To specify no external users, use the
Expand Down Expand Up @@ -269,7 +269,7 @@
</div>
@if (estimatorForm | invalidated) {
<div
class="tce-text-error-red tce-flex tce-gap-1 tce-justify-end tce-mt-2"
class="tce-error-box tce-flex tce-gap-1 tce-justify-end tce-mt-2"
aria-live="polite"
id="calculateDisabledMessage">
<span class="material-icons-outlined">error</span>
Expand Down
1 change: 0 additions & 1 deletion src/app/carbon-estimator-form/carbon-estimator-form.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ const locationDescriptions: Record<WorldLocation, string> = {
selector: 'carbon-estimator-form',
standalone: true,
templateUrl: './carbon-estimator-form.component.html',
styles: ['input.ng-touched.ng-invalid { border-color: theme("colors.error-red"); }'],
imports: [
ReactiveFormsModule,
FormsModule,
Expand Down
18 changes: 13 additions & 5 deletions src/package-styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
input, select {
@apply dark:tce-text-slate-600
}

@media (prefers-color-scheme: dark) {
.apexcharts-legend-text {
@apply !tce-text-slate-50
}
}

input, select {
@apply tce-text-slate-600
}

input.ng-invalid.ng-touched {
@apply tce-border-red-700
}

.tce-error-box {
@apply tce-text-white tce-bg-red-700 tce-p-1 tce-rounded tce-border tce-border-white
}
}
8 changes: 8 additions & 0 deletions src/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
@tailwind components;
@tailwind utilities;

input.ng-invalid.ng-touched {
@apply tce-border-red-600 tce-border-2 tce-m-[-1px]
}

.tce-error-box {
@apply tce-text-red-600
}

.tce-note {
@apply tce-bg-sky-200 tce-border-sky-400 tce-text-slate-800
}
Expand Down
4 changes: 0 additions & 4 deletions tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { isolateInsideOfContainer, scopedPreflightStyles } from 'tailwindcss-scoped-preflight';
import form from '@tailwindcss/forms';
import { red } from 'tailwindcss/colors';

export default {
content: ['./src/**/*.{html,ts}'],
Expand All @@ -9,9 +8,6 @@ export default {
fontFamily: {
sans: ['objektiv-mk1', 'sans-serif'],
},
colors: {
'error-red': red['600'],
},
},
},
plugins: [
Expand Down