Skip to content

armgit / maybe

Public Imported from GitHub
0

The personal finance app for everyone

Maybe Design System Updates (#1856)

Zach Gollwitzer849c58dd3e18
diff --git a/.cursor/rules/ui-ux-design-guidelines.mdc b/.cursor/rules/ui-ux-design-guidelines.mdc
new file mode 100644
index 00000000..a6ad9158
--- /dev/null
+++ b/.cursor/rules/ui-ux-design-guidelines.mdc
@@ -0,0 +1,13 @@
+---
+description: This file describes Maybe's design system and how views should be styled
+globs: app/views/**,app/helpers/**,app/javascript/controllers/**
+---
+Use this rule whenever you are writing html, css, or even styles in Stimulus controllers that use D3.js.
+
+The codebase uses TailwindCSS v4.x (the newest version) with a custom design system defined in [maybe-design-system.css](mdc:app/assets/tailwind/maybe-design-system.css)
+
+- Always start by referencing [maybe-design-system.css](mdc:app/assets/tailwind/maybe-design-system.css) to see the base primitives and tokens we use in the codebase
+- Always generate semantic HTML
+- Never create new styles in [maybe-design-system.css](mdc:app/assets/tailwind/maybe-design-system.css) or [application.css](mdc:app/assets/tailwind/application.css) without explicitly receiving permission to do so
+- Always favor the "utility first" Tailwind approach. Reusable style classes should not be created often. Code should be reused primarily through ERB partials.
+- Always prefer using the utility "tokens" defined in [maybe-design-system.css](mdc:app/assets/tailwind/maybe-design-system.css) when possible. For example, use `text-primary` rather than `text-gray-900`.
\ No newline at end of file
diff --git a/app/assets/fonts/geist/Geist-Black.woff2 b/app/assets/fonts/geist/Geist-Black.woff2
new file mode 100644
index 00000000..32ccbc99
Binary files /dev/null and b/app/assets/fonts/geist/Geist-Black.woff2 differ
diff --git a/app/assets/fonts/geist/Geist-Bold.woff2 b/app/assets/fonts/geist/Geist-Bold.woff2
new file mode 100644
index 00000000..cb112fb5
Binary files /dev/null and b/app/assets/fonts/geist/Geist-Bold.woff2 differ
diff --git a/app/assets/fonts/geist/Geist-ExtraBold.woff2 b/app/assets/fonts/geist/Geist-ExtraBold.woff2
new file mode 100644
index 00000000..0c8065c8
Binary files /dev/null and b/app/assets/fonts/geist/Geist-ExtraBold.woff2 differ
diff --git a/app/assets/fonts/geist/Geist-ExtraLight.woff2 b/app/assets/fonts/geist/Geist-ExtraLight.woff2
new file mode 100644
index 00000000..d42a9be0
Binary files /dev/null and b/app/assets/fonts/geist/Geist-ExtraLight.woff2 differ
diff --git a/app/assets/fonts/geist/Geist-Light.woff2 b/app/assets/fonts/geist/Geist-Light.woff2
new file mode 100644
index 00000000..f67fafee
Binary files /dev/null and b/app/assets/fonts/geist/Geist-Light.woff2 differ
diff --git a/app/assets/fonts/geist/Geist-Medium.woff2 b/app/assets/fonts/geist/Geist-Medium.woff2
new file mode 100644
index 00000000..9f5717da
Binary files /dev/null and b/app/assets/fonts/geist/Geist-Medium.woff2 differ
diff --git a/app/assets/fonts/geist/Geist-Regular.woff2 b/app/assets/fonts/geist/Geist-Regular.woff2
new file mode 100644
index 00000000..a7b2ff8c
Binary files /dev/null and b/app/assets/fonts/geist/Geist-Regular.woff2 differ
diff --git a/app/assets/fonts/geist/Geist-SemiBold.woff2 b/app/assets/fonts/geist/Geist-SemiBold.woff2
new file mode 100644
index 00000000..91d63ebb
Binary files /dev/null and b/app/assets/fonts/geist/Geist-SemiBold.woff2 differ
diff --git a/app/assets/fonts/geist/Geist-Thin.woff2 b/app/assets/fonts/geist/Geist-Thin.woff2
new file mode 100644
index 00000000..d4dbf549
Binary files /dev/null and b/app/assets/fonts/geist/Geist-Thin.woff2 differ
diff --git a/app/assets/fonts/geist/Geist[wght].woff2 b/app/assets/fonts/geist/Geist[wght].woff2
new file mode 100644
index 00000000..6fd61c44
Binary files /dev/null and b/app/assets/fonts/geist/Geist[wght].woff2 differ
diff --git a/app/assets/fonts/geist_mono/GeistMono-Black.woff2 b/app/assets/fonts/geist_mono/GeistMono-Black.woff2
new file mode 100644
index 00000000..5609afd3
Binary files /dev/null and b/app/assets/fonts/geist_mono/GeistMono-Black.woff2 differ
diff --git a/app/assets/fonts/geist_mono/GeistMono-Bold.woff2 b/app/assets/fonts/geist_mono/GeistMono-Bold.woff2
new file mode 100644
index 00000000..3bb7b951
Binary files /dev/null and b/app/assets/fonts/geist_mono/GeistMono-Bold.woff2 differ
diff --git a/app/assets/fonts/geist_mono/GeistMono-Light.woff2 b/app/assets/fonts/geist_mono/GeistMono-Light.woff2
new file mode 100644
index 00000000..c43c125c
Binary files /dev/null and b/app/assets/fonts/geist_mono/GeistMono-Light.woff2 differ
diff --git a/app/assets/fonts/geist_mono/GeistMono-Medium.woff2 b/app/assets/fonts/geist_mono/GeistMono-Medium.woff2
new file mode 100644
index 00000000..67495e48
Binary files /dev/null and b/app/assets/fonts/geist_mono/GeistMono-Medium.woff2 differ
diff --git a/app/assets/fonts/geist_mono/GeistMono-Regular.woff2 b/app/assets/fonts/geist_mono/GeistMono-Regular.woff2
new file mode 100644
index 00000000..d6d865af
Binary files /dev/null and b/app/assets/fonts/geist_mono/GeistMono-Regular.woff2 differ
diff --git a/app/assets/fonts/geist_mono/GeistMono-SemiBold.woff2 b/app/assets/fonts/geist_mono/GeistMono-SemiBold.woff2
new file mode 100644
index 00000000..bf25a1da
Binary files /dev/null and b/app/assets/fonts/geist_mono/GeistMono-SemiBold.woff2 differ
diff --git a/app/assets/fonts/geist_mono/GeistMono-Thin.woff2 b/app/assets/fonts/geist_mono/GeistMono-Thin.woff2
new file mode 100644
index 00000000..76b4619d
Binary files /dev/null and b/app/assets/fonts/geist_mono/GeistMono-Thin.woff2 differ
diff --git a/app/assets/fonts/geist_mono/GeistMono-UltraBlack.woff2 b/app/assets/fonts/geist_mono/GeistMono-UltraBlack.woff2
new file mode 100644
index 00000000..ffb26733
Binary files /dev/null and b/app/assets/fonts/geist_mono/GeistMono-UltraBlack.woff2 differ
diff --git a/app/assets/fonts/geist_mono/GeistMono-UltraLight.woff2 b/app/assets/fonts/geist_mono/GeistMono-UltraLight.woff2
new file mode 100644
index 00000000..9c6469bf
Binary files /dev/null and b/app/assets/fonts/geist_mono/GeistMono-UltraLight.woff2 differ
diff --git a/app/assets/fonts/geist_mono/GeistMono[wght].woff2 b/app/assets/fonts/geist_mono/GeistMono[wght].woff2
new file mode 100644
index 00000000..dae00379
Binary files /dev/null and b/app/assets/fonts/geist_mono/GeistMono[wght].woff2 differ
diff --git a/app/assets/tailwind/application.css b/app/assets/tailwind/application.css
index 668e3a13..9153362f 100644
--- a/app/assets/tailwind/application.css
+++ b/app/assets/tailwind/application.css
@@ -1,305 +1,43 @@
@import 'tailwindcss';
-@plugin "@tailwindcss/typography";
-@plugin "@tailwindcss/forms";
-
-@theme {
- /* Base colors */
- --color-white: #ffffff;
- --color-black: #0B0B0B;
- --color-success: #10A861;
- --color-warning: #F79009;
- --color-error: #F13636;
-
- /* Gray scale */
- --color-gray-25: #FAFAFA;
- --color-gray-50: #F5F5F5;
- --color-gray-100: #F0F0F0;
- --color-gray-200: #E5E5E5;
- --color-gray-300: #D6D6D6;
- --color-gray-400: #A3A3A3;
- --color-gray-500: #737373;
- --color-gray-600: #525252;
- --color-gray-700: #3D3D3D;
- --color-gray-800: #212121;
- --color-gray-900: #141414;
-
- /* Alpha colors */
- --color-alpha-white-25: rgba(255, 255, 255, 0.03);
- --color-alpha-white-50: rgba(255, 255, 255, 0.05);
- --color-alpha-white-100: rgba(255, 255, 255, 0.08);
- --color-alpha-white-200: rgba(255, 255, 255, 0.1);
- --color-alpha-white-300: rgba(255, 255, 255, 0.15);
- --color-alpha-white-400: rgba(255, 255, 255, 0.2);
- --color-alpha-white-500: rgba(255, 255, 255, 0.3);
- --color-alpha-white-600: rgba(255, 255, 255, 0.4);
- --color-alpha-white-700: rgba(255, 255, 255, 0.5);
- --color-alpha-white-800: rgba(255, 255, 255, 0.6);
- --color-alpha-white-900: rgba(255, 255, 255, 0.7);
-
- --color-alpha-black-25: rgba(11, 11, 11, 0.03);
- --color-alpha-black-50: rgba(11, 11, 11, 0.05);
- --color-alpha-black-100: rgba(11, 11, 11, 0.08);
- --color-alpha-black-200: rgba(11, 11, 11, 0.1);
- --color-alpha-black-300: rgba(11, 11, 11, 0.15);
- --color-alpha-black-400: rgba(11, 11, 11, 0.2);
- --color-alpha-black-500: rgba(11, 11, 11, 0.3);
- --color-alpha-black-600: rgba(11, 11, 11, 0.4);
- --color-alpha-black-700: rgba(11, 11, 11, 0.5);
- --color-alpha-black-800: rgba(11, 11, 11, 0.6);
- --color-alpha-black-900: rgba(11, 11, 11, 0.7);
-
- /* Red scale */
- --color-red-25: #FFFBFB;
- --color-red-50: #FFF1F0;
- --color-red-100: #FFDEDB;
- --color-red-200: #FEB9B3;
- --color-red-300: #F88C86;
- --color-red-400: #ED4E4E;
- --color-red-500: #F13636;
- --color-red-600: #EC2222;
- --color-red-700: #C91313;
- --color-red-800: #A40E0E;
- --color-red-900: #7E0707;
-
- /* Green scale */
- --color-green-25: #F6FEF9;
- --color-green-50: #ECFDF3;
- --color-green-100: #D1FADF;
- --color-green-200: #A6F4C5;
- --color-green-300: #6CE9A6;
- --color-green-400: #32D583;
- --color-green-500: #12B76A;
- --color-green-600: #10A861;
- --color-green-700: #078C52;
- --color-green-800: #05603A;
- --color-green-900: #054F31;
-
- /* Yellow scale */
- --color-yellow-25: #FFFCF5;
- --color-yellow-50: #FFFAEB;
- --color-yellow-100: #FEF0C7;
- --color-yellow-200: #FEDF89;
- --color-yellow-300: #FEC84B;
- --color-yellow-400: #FDB022;
- --color-yellow-500: #F79009;
- --color-yellow-600: #DC6803;
- --color-yellow-700: #B54708;
- --color-yellow-800: #93370D;
- --color-yellow-900: #7A2E0E;
-
- /* Cyan scale */
- --color-cyan-25: #F5FEFF;
- --color-cyan-50: #ECFDFF;
- --color-cyan-100: #CFF9FE;
- --color-cyan-200: #A5F0FC;
- --color-cyan-300: #67E3F9;
- --color-cyan-400: #22CCEE;
- --color-cyan-500: #06AED4;
- --color-cyan-600: #088AB2;
- --color-cyan-700: #0E7090;
- --color-cyan-800: #155B75;
- --color-cyan-900: #155B75;
+@import "./maybe-design-system.css";
- /* Blue scale */
- --color-blue-25: #F5FAFF;
- --color-blue-50: #EFF8FF;
- --color-blue-100: #D1E9FF;
- --color-blue-200: #B2DDFF;
- --color-blue-300: #84CAFF;
- --color-blue-400: #53B1FD;
- --color-blue-500: #2E90FA;
- --color-blue-600: #1570EF;
- --color-blue-700: #175CD3;
- --color-blue-800: #1849A9;
- --color-blue-900: #194185;
+@import "./geist-font.css";
+@import "./geist-mono-font.css";
- /* Indigo scale */
- --color-indigo-25: #F5F8FF;
- --color-indigo-50: #EFF4FF;
- --color-indigo-100: #E0EAFF;
- --color-indigo-200: #C7D7FE;
- --color-indigo-300: #A4BCFD;
- --color-indigo-400: #8098F9;
- --color-indigo-500: #6172F3;
- --color-indigo-600: #444CE7;
- --color-indigo-700: #3538CD;
- --color-indigo-800: #2D31A6;
- --color-indigo-900: #2D3282;
-
- /* Violet scale */
- --color-violet-25: #FBFAFF;
- --color-violet-50: #F5F3FF;
- --color-violet-100: #ECE9FE;
- --color-violet-200: #DDD6FE;
- --color-violet-300: #C3B5FD;
- --color-violet-400: #A48AFB;
- --color-violet-500: #875BF7;
- --color-violet-600: #7839EE;
- --color-violet-700: #6927DA;
-
- /* Fuchsia scale */
- --color-fuchsia-25: #FEFAFF;
- --color-fuchsia-50: #FDF4FF;
- --color-fuchsia-100: #FBE8FF;
- --color-fuchsia-200: #F6D0FE;
- --color-fuchsia-300: #EEAAFD;
- --color-fuchsia-400: #E478FA;
- --color-fuchsia-500: #D444F1;
- --color-fuchsia-600: #BA24D5;
- --color-fuchsia-700: #9F1AB1;
- --color-fuchsia-800: #821890;
- --color-fuchsia-900: #6F1877;
-
- /* Pink scale */
- --color-pink-25: #FFFAFC;
- --color-pink-50: #FEF0F7;
- --color-pink-100: #FFD1E2;
- --color-pink-200: #FFB1CE;
- --color-pink-300: #FD8FBA;
- --color-pink-400: #F86BA7;
- --color-pink-500: #F23E94;
- --color-pink-600: #D5327F;
- --color-pink-700: #BA256B;
- --color-pink-800: #9E1958;
- --color-pink-900: #840B45;
-
- /* Orange scale */
- --color-orange-25: #FFF9F5;
- --color-orange-50: #FFF4ED;
- --color-orange-100: #FFE6D5;
- --color-orange-200: #FFD6AE;
- --color-orange-300: #FF9C66;
- --color-orange-400: #FF692E;
- --color-orange-500: #FF4405;
- --color-orange-600: #E62E05;
- --color-orange-700: #BC1B06;
- --color-orange-800: #97180C;
- --color-orange-900: #771A0D;
-
- /* Shadows */
- --shadow-none: 0 0 #0000;
- --shadow-xs: 0px 1px 2px 0px rgba(11, 11, 11, 0.05);
- --shadow-sm: 0px 1px 2px 0px rgba(11, 11, 11, 0.06), 0px 1px 3px 0px rgba(11, 11, 11, 0.10);
- --shadow-md: 0px 2px 4px -2px rgba(11, 11, 11, 0.06), 0px 4px 8px -2px rgba(11, 11, 11, 0.10);
- --shadow-lg: 0px 4px 6px -2px rgba(11, 11, 11, 0.03), 0px 12px 16px -4px rgba(11, 11, 11, 0.08);
- --shadow-xl: 0px 8px 8px -4px rgba(11, 11, 11, 0.03), 0px 20px 24px -4px rgba(11, 11, 11, 0.08);
- --shadow-2xl: 0px 24px 48px -12px rgba(11, 11, 11, 0.12);
- --shadow-3xl: 0px 32px 64px -12px rgba(11, 11, 11, 0.14);
-
- /* Border radius */
- --border-radius-none: 0;
- --border-radius-full: 9999px;
- --border-radius-xs: 2px;
- --border-radius-sm: 4px;
- --border-radius-md: 8px;
- --border-radius-lg: 10px;
- --border-radius-xl: 12px;
- --border-radius-2xl: 16px;
- --border-radius-3xl: 24px;
-}
-
-.form-field {
- @apply flex flex-col gap-1 relative px-3 py-2 rounded-md border bg-white border-alpha-black-100 shadow-xs w-full;
- @apply focus-within:border-gray-900 focus-within:shadow-none focus-within:ring-4 focus-within:ring-gray-100;
-}
-
-.form-field__label {
- @apply block text-xs text-gray-500 peer-disabled:text-gray-400;
-}
-
-.hw-combobox__label {
- @apply block text-xs text-gray-500 peer-disabled:text-gray-400;
-}
-
-.form-field__input {
- @apply border-none bg-transparent text-sm opacity-100 w-full p-0;
- @apply focus:opacity-100 focus:outline-hidden focus:ring-0;
- @apply placeholder-shown:opacity-50;
- @apply disabled:text-gray-400;
- @apply text-ellipsis overflow-hidden whitespace-nowrap;
-
- &select {
- @apply pr-8;
- }
-}
-
-.form-field__radio {
- @apply text-gray-900;
-}
-
-.form-field__submit {
- @apply cursor-pointer rounded-lg bg-black p-3 text-center text-white hover:bg-gray-700;
-}
-
-.toggle-switch-dot {
- input:checked + label + & {
- transform: translateX(100%);
- }
-}
-
-.maybe-checkbox {
- &[type='checkbox'] {
- @apply rounded-sm;
- }
-}
-
-.maybe-checkbox--light {
- &[type='checkbox'] {
- @apply border-alpha-black-200 checked:bg-gray-900 checked:ring-gray-900 focus:ring-gray-900 focus-visible:ring-gray-900 checked:hover:bg-gray-500;
- }
-
- &[type='checkbox']:disabled {
- @apply cursor-not-allowed opacity-80 bg-gray-50 border-gray-200 checked:bg-gray-400 checked:ring-gray-400;
- }
-}
-
-.maybe-checkbox--dark {
- &[type='checkbox'] {
- @apply ring-gray-900 checked:text-white;
- }
-
- &[type='checkbox']:disabled {
- @apply cursor-not-allowed opacity-80 ring-gray-600;
- }
+@plugin "@tailwindcss/typography";
+@plugin "@tailwindcss/forms";
- &[type='checkbox']:checked {
- background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='111827' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e");
+@utility combobox {
+ .hw-combobox__main__wrapper,
+ .hw-combobox__input {
+ @apply w-full;
}
-}
-
-.maybe-switch {
- @apply block bg-gray-100 w-9 h-5 rounded-full cursor-pointer;
- @apply after:content-[''] after:block after:absolute after:top-0.5 after:left-0.5 after:bg-white after:w-4 after:h-4 after:rounded-full after:transition-transform after:duration-300 after:ease-in-out;
- @apply peer-checked:bg-green-600 peer-checked:after:translate-x-4;
-}
-.prose {
- @apply max-w-none;
-
- h2 {
- @apply text-xl font-medium;
+ .hw-combobox__main__wrapper {
+ @apply border-0 p-0 focus:border-0 ring-0 focus:ring-0 shadow-none focus:shadow-none focus-within:shadow-none;
}
- h3 {
- @apply text-lg font-medium;
+ .hw-combobox__listbox {
+ @apply absolute top-[160%] right-0 w-full bg-transparent rounded z-30;
}
- li {
- @apply m-0;
+ .hw-combobox__label {
+ @apply block text-xs text-gray-500 peer-disabled:text-gray-400;
}
- details {
- @apply mb-4 rounded-xl mt-3.5;
- }
+ .hw_combobox__pagination__wrapper {
+ @apply h-px;
- summary {
- @apply flex items-center gap-1;
+ &:only-child {
+ @apply bg-transparent;
+ }
}
- video {
- @apply m-0 rounded-b-xl;
- }
+ --hw-border-color: rgba(0, 0, 0, 0.2);
+ --hw-handle-width: 20px;
+ --hw-handle-height: 20px;
+ --hw-handle-offset-right: 0px;
}
.prose--github-release-notes {
@@ -316,114 +54,33 @@
}
}
-.tooltip {
- @apply hidden absolute;
-}
-
-.btn {
- @apply px-3 py-2 rounded-lg text-sm font-medium cursor-pointer disabled:cursor-not-allowed focus:outline-gray-500;
-}
-
-.btn--primary {
- @apply bg-gray-900 text-white hover:bg-gray-700 disabled:bg-gray-50 disabled:hover:bg-gray-50 disabled:text-gray-400;
-}
-
-.btn--secondary {
- @apply bg-gray-50 hover:bg-gray-100 text-gray-900;
-}
-
-.btn--outline {
- @apply border border-alpha-black-200 text-gray-900 hover:bg-gray-50 disabled:bg-gray-50 disabled:hover:bg-gray-50 disabled:text-gray-400;
-}
-
-.btn--ghost {
- @apply border border-transparent text-gray-900 hover:bg-gray-50;
-}
-.scrollbar {
- &::-webkit-scrollbar {
+/* Custom scrollbar implementation for Windows browsers */
+.windows {
+ ::-webkit-scrollbar {
width: 4px;
}
- &::-webkit-scrollbar-thumb {
+ ::-webkit-scrollbar-thumb {
background: #d6d6d6;
border-radius: 10px;
}
- &::-webkit-scrollbar-thumb:hover {
+ ::-webkit-scrollbar-thumb:hover {
background: #a6a6a6;
- }
-}
-
-/* Reset rules, default styles applied to plain HTML */
-@layer base {
- details>summary::-webkit-details-marker {
- @apply hidden;
- }
-
- details>summary {
- @apply list-none;
- }
-}
-
-@layer components {
- select[multiple="multiple"] {
- @apply py-2 pr-2 space-y-0.5 overflow-y-auto;
- }
-
- select[multiple="multiple"] option {
- @apply py-2 rounded-md;
- }
-
- select[multiple="multiple"] option:checked {
- @apply after:content-['\2713'] bg-white after:text-gray-500 after:ml-2;
- }
-
- select[multiple="multiple"] option:active,
- select[multiple="multiple"] option:focus {
- @apply bg-white;
- }
-}
-
-@utility combobox {
- .hw-combobox__main__wrapper,
- .hw-combobox__input {
- @apply w-full;
- }
-
- .hw-combobox__main__wrapper {
- @apply border-0 p-0 focus:border-0 ring-0 focus:ring-0 shadow-none focus:shadow-none focus-within:shadow-none;
- }
-
- .hw-combobox__listbox {
- @apply absolute top-[160%] right-0 w-full bg-transparent rounded z-30;
- }
-
- .hw_combobox__pagination__wrapper {
- @apply h-px;
-
- &:only-child {
- @apply bg-transparent;
- }
- }
-
- --hw-border-color: rgba(0, 0, 0, 0.2);
- --hw-handle-width: 20px;
- --hw-handle-height: 20px;
- --hw-handle-offset-right: 0px;
+ }
}
-/* Custom scrollbar implementation for Windows browsers */
-.windows {
- ::-webkit-scrollbar {
+.scrollbar {
+ &::-webkit-scrollbar {
width: 4px;
}
- ::-webkit-scrollbar-thumb {
+ &::-webkit-scrollbar-thumb {
background: #d6d6d6;
border-radius: 10px;
}
- ::-webkit-scrollbar-thumb:hover {
+ &::-webkit-scrollbar-thumb:hover {
background: #a6a6a6;
- }
+ }
}
\ No newline at end of file
diff --git a/app/assets/tailwind/geist-font.css b/app/assets/tailwind/geist-font.css
new file mode 100644
index 00000000..7c2f048a
--- /dev/null
+++ b/app/assets/tailwind/geist-font.css
@@ -0,0 +1,83 @@
+/* Variable font */
+@font-face {
+ font-family: 'Geist';
+ src: url('../fonts/geist/Geist[wght].woff2') format('woff2-variations');
+ font-weight: 100 900;
+ font-style: normal;
+ font-display: swap;
+}
+
+/* Static fonts (fallback) */
+@supports not (font-variation-settings: normal) {
+ @font-face {
+ font-family: 'Geist';
+ src: url('../fonts/geist/Geist-Thin.woff2') format('woff2');
+ font-weight: 100;
+ font-style: normal;
+ font-display: swap;
+ }
+
+ @font-face {
+ font-family: 'Geist';
+ src: url('../fonts/geist/Geist-ExtraLight.woff2') format('woff2');
+ font-weight: 200;
+ font-style: normal;
+ font-display: swap;
+ }
+
+ @font-face {
+ font-family: 'Geist';
+ src: url('../fonts/geist/Geist-Light.woff2') format('woff2');
+ font-weight: 300;
+ font-style: normal;
+ font-display: swap;
+ }
+
+ @font-face {
+ font-family: 'Geist';
+ src: url('../fonts/geist/Geist-Regular.woff2') format('woff2');
+ font-weight: 400;
+ font-style: normal;
+ font-display: swap;
+ }
+
+ @font-face {
+ font-family: 'Geist';
+ src: url('../fonts/geist/Geist-Medium.woff2') format('woff2');
+ font-weight: 500;
+ font-style: normal;
+ font-display: swap;
+ }
+
+ @font-face {
+ font-family: 'Geist';
+ src: url('../fonts/geist/Geist-SemiBold.woff2') format('woff2');
+ font-weight: 600;
+ font-style: normal;
+ font-display: swap;
+ }
+
+ @font-face {
+ font-family: 'Geist';
+ src: url('../fonts/geist/Geist-Bold.woff2') format('woff2');
+ font-weight: 700;
+ font-style: normal;
+ font-display: swap;
+ }
+
+ @font-face {
+ font-family: 'Geist';
+ src: url('../fonts/geist/Geist-ExtraBold.woff2') format('woff2');
+ font-weight: 800;
+ font-style: normal;
+ font-display: swap;
+ }
+
+ @font-face {
+ font-family: 'Geist';
+ src: url('../fonts/geist/Geist-Black.woff2') format('woff2');
+ font-weight: 900;
+ font-style: normal;
+ font-display: swap;
+ }
+}
diff --git a/app/assets/tailwind/geist-mono-font.css b/app/assets/tailwind/geist-mono-font.css
new file mode 100644
index 00000000..207351c7
--- /dev/null
+++ b/app/assets/tailwind/geist-mono-font.css
@@ -0,0 +1,83 @@
+/* Variable font */
+@font-face {
+ font-family: 'Geist Mono';
+ src: url('../fonts/geist_mono/GeistMono[wght].woff2') format('woff2-variations');
+ font-weight: 100 950;
+ font-style: normal;
+ font-display: swap;
+}
+
+/* Static fonts (fallback) */
+@supports not (font-variation-settings: normal) {
+ @font-face {
+ font-family: 'Geist Mono';
+ src: url('../fonts/geist_mono/GeistMono-Thin.woff2') format('woff2');
+ font-weight: 100;
+ font-style: normal;
+ font-display: swap;
+ }
+
+ @font-face {
+ font-family: 'Geist Mono';
+ src: url('../fonts/geist_mono/GeistMono-UltraLight.woff2') format('woff2');
+ font-weight: 200;
+ font-style: normal;
+ font-display: swap;
+ }
+
+ @font-face {
+ font-family: 'Geist Mono';
+ src: url('../fonts/geist_mono/GeistMono-Light.woff2') format('woff2');
+ font-weight: 300;
+ font-style: normal;
+ font-display: swap;
+ }
+
+ @font-face {
+ font-family: 'Geist Mono';
+ src: url('../fonts/geist_mono/GeistMono-Regular.woff2') format('woff2');
+ font-weight: 400;
+ font-style: normal;
+ font-display: swap;
+ }
+
+ @font-face {
+ font-family: 'Geist Mono';
+ src: url('../fonts/geist_mono/GeistMono-Medium.woff2') format('woff2');
+ font-weight: 500;
+ font-style: normal;
+ font-display: swap;
+ }
+
+ @font-face {
+ font-family: 'Geist Mono';
+ src: url('../fonts/geist_mono/GeistMono-SemiBold.woff2') format('woff2');
+ font-weight: 600;
+ font-style: normal;
+ font-display: swap;
+ }
+
+ @font-face {
+ font-family: 'Geist Mono';
+ src: url('../fonts/geist_mono/GeistMono-Bold.woff2') format('woff2');
+ font-weight: 700;
+ font-style: normal;
+ font-display: swap;
+ }
+
+ @font-face {
+ font-family: 'Geist Mono';
+ src: url('../fonts/geist_mono/GeistMono-Black.woff2') format('woff2');
+ font-weight: 900;
+ font-style: normal;
+ font-display: swap;
+ }
+
+ @font-face {
+ font-family: 'Geist Mono';
+ src: url('../fonts/geist_mono/GeistMono-UltraBlack.woff2') format('woff2');
+ font-weight: 950;
+ font-style: normal;
+ font-display: swap;
+ }
+}
diff --git a/app/assets/tailwind/maybe-design-system.css b/app/assets/tailwind/maybe-design-system.css
new file mode 100644
index 00000000..eaaa1cb2
--- /dev/null
+++ b/app/assets/tailwind/maybe-design-system.css
@@ -0,0 +1,448 @@
+/*
+ This file contains all of the Figma design tokens, components, etc. that
+ are used globally across the app.
+
+ One-off styling (3rd party overrides, etc.) should be done in the application.css file.
+*/
+
+@theme {
+ /* Font families */
+ --font-sans: 'Geist', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
+ --font-mono: 'Geist Mono', ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
+
+ /* Base colors */
+ --color-white: #ffffff;
+ --color-black: #0B0B0B;
+ --color-success: var(--color-green-600);
+ --color-warning: var(--color-yellow-600);
+ --color-destructive: var(--color-red-600);
+
+ /* Gray scale */
+ --color-gray-25: #FAFAFA;
+ --color-gray-50: #F7F7F7;
+ --color-gray-100: #F0F0F0;
+ --color-gray-200: #E7E7E7;
+ --color-gray-300: #CFCFCF;
+ --color-gray-400: #9E9E9E;
+ --color-gray-500: #737373;
+ --color-gray-600: #5C5C5C;
+ --color-gray-700: #363636;
+ --color-gray-800: #242424;
+ --color-gray-900: #171717;
+ --color-gray: var(--color-gray-500);
+ --color-gray-tint-5: --alpha(var(--color-gray-500) / 5%);
+ --color-gray-tint-10: --alpha(var(--color-gray-500) / 10%);
+
+ /* Alpha colors */
+ --color-alpha-white-25: --alpha(var(--color-white) / 3%);
+ --color-alpha-white-50: --alpha(var(--color-white) / 5%);
+ --color-alpha-white-100: --alpha(var(--color-white) / 8%);
+ --color-alpha-white-200: --alpha(var(--color-white) / 10%);
+ --color-alpha-white-300: --alpha(var(--color-white) / 15%);
+ --color-alpha-white-400: --alpha(var(--color-white) / 20%);
+ --color-alpha-white-500: --alpha(var(--color-white) / 30%);
+ --color-alpha-white-600: --alpha(var(--color-white) / 40%);
+ --color-alpha-white-700: --alpha(var(--color-white) / 50%);
+ --color-alpha-white-800: --alpha(var(--color-white) / 70%);
+ --color-alpha-white-900: --alpha(var(--color-white) / 85%);
+
+ --color-alpha-black-25: --alpha(var(--color-black) / 3%);
+ --color-alpha-black-50: --alpha(var(--color-black) / 5%);
+ --color-alpha-black-100: --alpha(var(--color-black) / 8%);
+ --color-alpha-black-200: --alpha(var(--color-black) / 10%);
+ --color-alpha-black-300: --alpha(var(--color-black) / 15%);
+ --color-alpha-black-400: --alpha(var(--color-black) / 20%);
+ --color-alpha-black-500: --alpha(var(--color-black) / 30%);
+ --color-alpha-black-600: --alpha(var(--color-black) / 40%);
+ --color-alpha-black-700: --alpha(var(--color-black) / 50%);
+ --color-alpha-black-800: --alpha(var(--color-black) / 70%);
+ --color-alpha-black-900: --alpha(var(--color-black) / 85%);
+
+ /* Red scale */
+ --color-red-25: #FFFBFB;
+ --color-red-50: #FFF1F0;
+ --color-red-100: #FFDEDB;
+ --color-red-200: #FEB9B3;
+ --color-red-300: #F88C86;
+ --color-red-400: #ED4E4E;
+ --color-red-500: #F13636;
+ --color-red-600: #EC2222;
+ --color-red-700: #C91313;
+ --color-red-800: #A40E0E;
+ --color-red-900: #7E0707;
+ --color-red-tint-5: --alpha(var(--color-red-500) / 5%);
+ --color-red-tint-10: --alpha(var(--color-red-500) / 10%);
+
+ /* Green scale */
+ --color-green-25: #F6FEF9;
+ --color-green-50: #ECFDF3;
+ --color-green-100: #D1FADF;
+ --color-green-200: #A6F4C5;
+ --color-green-300: #6CE9A6;
+ --color-green-400: #32D583;
+ --color-green-500: #12B76A;
+ --color-green-600: #10A861;
+ --color-green-700: #078C52;
+ --color-green-800: #05603A;
+ --color-green-900: #054F31;
+ --color-green-tint-5: --alpha(var(--color-green-500) / 5%);
+ --color-green-tint-10: --alpha(var(--color-green-500) / 10%);
+
+ /* Yellow scale */
+ --color-yellow-25: #FFFCF5;
+ --color-yellow-50: #FFFAEB;
+ --color-yellow-100: #FEF0C7;
+ --color-yellow-200: #FEDF89;
+ --color-yellow-300: #FEC84B;
+ --color-yellow-400: #FDB022;
+ --color-yellow-500: #F79009;
+ --color-yellow-600: #DC6803;
+ --color-yellow-700: #B54708;
+ --color-yellow-800: #93370D;
+ --color-yellow-900: #7A2E0E;
+ --color-yellow-tint-5: --alpha(var(--color-yellow-500) / 5%);
+ --color-yellow-tint-10: --alpha(var(--color-yellow-500) / 10%);
+
+ /* Cyan scale */
+ --color-cyan-25: #F5FEFF;
+ --color-cyan-50: #ECFDFF;
+ --color-cyan-100: #CFF9FE;
+ --color-cyan-200: #A5F0FC;
+ --color-cyan-300: #67E3F9;
+ --color-cyan-400: #22CCEE;
+ --color-cyan-500: #06AED4;
+ --color-cyan-600: #088AB2;
+ --color-cyan-700: #0E7090;
+ --color-cyan-800: #155B75;
+ --color-cyan-900: #155B75;
+ --color-cyan-tint-5: --alpha(var(--color-cyan-500) / 5%);
+ --color-cyan-tint-10: --alpha(var(--color-cyan-500) / 10%);
+
+ /* Blue scale */
+ --color-blue-25: #F5FAFF;
+ --color-blue-50: #EFF8FF;
+ --color-blue-100: #D1E9FF;
+ --color-blue-200: #B2DDFF;
+ --color-blue-300: #84CAFF;
+ --color-blue-400: #53B1FD;
+ --color-blue-500: #2E90FA;
+ --color-blue-600: #1570EF;
+ --color-blue-700: #175CD3;
+ --color-blue-800: #1849A9;
+ --color-blue-900: #194185;
+ --color-blue-tint-5: --alpha(var(--color-blue-500) / 5%);
+ --color-blue-tint-10: --alpha(var(--color-blue-500) / 10%);
+
+ /* Indigo scale */
+ --color-indigo-25: #F5F8FF;
+ --color-indigo-50: #EFF4FF;
+ --color-indigo-100: #E0EAFF;
+ --color-indigo-200: #C7D7FE;
+ --color-indigo-300: #A4BCFD;
+ --color-indigo-400: #8098F9;
+ --color-indigo-500: #6172F3;
+ --color-indigo-600: #444CE7;
+ --color-indigo-700: #3538CD;
+ --color-indigo-800: #2D31A6;
+ --color-indigo-900: #2D3282;
+ --color-indigo-tint-5: --alpha(var(--color-indigo-500) / 5%);
+ --color-indigo-tint-10: --alpha(var(--color-indigo-500) / 10%);
+
+ /* Violet scale */
+ --color-violet-25: #FBFAFF;
+ --color-violet-50: #F5F3FF;
+ --color-violet-100: #ECE9FE;
+ --color-violet-200: #DDD6FE;
+ --color-violet-300: #C3B5FD;
+ --color-violet-400: #A48AFB;
+ --color-violet-500: #875BF7;
+ --color-violet-600: #7839EE;
+ --color-violet-700: #6927DA;
+ --color-violet-tint-5: --alpha(var(--color-violet-500) / 5%);
+ --color-violet-tint-10: --alpha(var(--color-violet-500) / 10%);
+
+ /* Fuchsia scale */
+ --color-fuchsia-25: #FEFAFF;
+ --color-fuchsia-50: #FDF4FF;
+ --color-fuchsia-100: #FBE8FF;
+ --color-fuchsia-200: #F6D0FE;
+ --color-fuchsia-300: #EEAAFD;
+ --color-fuchsia-400: #E478FA;
+ --color-fuchsia-500: #D444F1;
+ --color-fuchsia-600: #BA24D5;
+ --color-fuchsia-700: #9F1AB1;
+ --color-fuchsia-800: #821890;
+ --color-fuchsia-900: #6F1877;
+ --color-fuchsia-tint-5: --alpha(var(--color-fuchsia-500) / 5%);
+ --color-fuchsia-tint-10: --alpha(var(--color-fuchsia-500) / 10%);
+
+ /* Pink scale */
+ --color-pink-25: #FFFAFC;
+ --color-pink-50: #FEF0F7;
+ --color-pink-100: #FFD1E2;
+ --color-pink-200: #FFB1CE;
+ --color-pink-300: #FD8FBA;
+ --color-pink-400: #F86BA7;
+ --color-pink-500: #F23E94;
+ --color-pink-600: #D5327F;
+ --color-pink-700: #BA256B;
+ --color-pink-800: #9E1958;
+ --color-pink-900: #840B45;
+ --color-pink-tint-5: --alpha(var(--color-pink-500) / 5%);
+ --color-pink-tint-10: --alpha(var(--color-pink-500) / 10%);
+
+ /* Orange scale */
+ --color-orange-25: #FFF9F5;
+ --color-orange-50: #FFF4ED;
+ --color-orange-100: #FFE6D5;
+ --color-orange-200: #FFD6AE;
+ --color-orange-300: #FF9C66;
+ --color-orange-400: #FF692E;
+ --color-orange-500: #FF4405;
+ --color-orange-600: #E62E05;
+ --color-orange-700: #BC1B06;
+ --color-orange-800: #97180C;
+ --color-orange-900: #771A0D;
+ --color-orange-tint-5: --alpha(var(--color-orange-500) / 5%);
+ --color-orange-tint-10: --alpha(var(--color-orange-500) / 10%);
+
+ /* Border radius overrides */
+ --border-radius-md: 8px;
+ --border-radius-lg: 10px;
+
+ --shadow-xs: 0px 1px 2px 0px --alpha(var(--color-black) / 6%);
+ --shadow-sm: 0px 1px 6px 0px --alpha(var(--color-black) / 6%);
+ --shadow-md: 0px 4px 8px -2px --alpha(var(--color-black) / 6%);
+ --shadow-lg: 0px 12px 16px -4px --alpha(var(--color-black) / 6%);
+ --shadow-xl: 0px 20px 24px -4px --alpha(var(--color-black) / 6%);
+}
+
+/* Custom shadow borders used for surfaces / containers */
+@utility shadow-border-xs {
+ box-shadow: var(--shadow-xs), 0px 0px 0px 1px var(--color-alpha-black-50);
+}
+
+@utility shadow-border-sm {
+ box-shadow: var(--shadow-sm), 0px 0px 0px 1px var(--color-alpha-black-50);
+}
+
+@utility shadow-border-md {
+ box-shadow: var(--shadow-md), 0px 0px 0px 1px var(--color-alpha-black-50);
+}
+
+@utility shadow-border-lg {
+ box-shadow: var(--shadow-lg), 0px 0px 0px 1px var(--color-alpha-black-50);
+}
+
+@utility shadow-border-xl {
+ box-shadow: var(--shadow-xl), 0px 0px 0px 1px var(--color-alpha-black-50);
+}
+
+/* Design system color utilities */
+@utility text-primary {
+ @apply text-gray-900;
+}
+
+@utility text-secondary {
+ @apply text-gray-500;
+}
+
+@utility text-subdued {
+ @apply text-gray-400;
+}
+
+@utility text-link {
+ @apply text-blue-600;
+}
+
+@utility bg-surface {
+ @apply bg-gray-50 hover:bg-gray-100;
+}
+
+@utility bg-surface-inset {
+ @apply bg-gray-100 hover:bg-gray-200;
+}
+
+@utility bg-container {
+ @apply bg-white hover:bg-gray-50;
+}
+
+@utility bg-container-inset {
+ @apply bg-gray-50 hover:bg-gray-100;
+}
+
+@utility bg-inverse {
+ @apply bg-gray-800 hover:bg-gray-700;
+}
+
+@utility bg-overlay {
+ @apply bg-alpha-black-200;
+}
+
+@utility border-primary {
+ @apply border-alpha-black-300;
+}
+
+@utility border-secondary {
+ @apply border-alpha-black-200;
+}
+
+@utility border-tertiary {
+ @apply border-alpha-black-100;
+}
+
+@layer base {
+ details>summary::-webkit-details-marker {
+ @apply hidden;
+ }
+
+ details>summary {
+ @apply list-none;
+ }
+
+ select[multiple="multiple"] {
+ @apply py-2 pr-2 space-y-0.5 overflow-y-auto;
+ }
+
+ select[multiple="multiple"] option {
+ @apply py-2 rounded-md;
+ }
+
+ select[multiple="multiple"] option:checked {
+ @apply after:content-['\2713'] bg-white after:text-gray-500 after:ml-2;
+ }
+
+ select[multiple="multiple"] option:active,
+ select[multiple="multiple"] option:focus {
+ @apply bg-white;
+ }
+}
+
+@layer components {
+ /* Buttons */
+ .btn {
+ @apply px-3 py-2 rounded-lg text-sm font-medium cursor-pointer disabled:cursor-not-allowed focus:outline-gray-500;
+ }
+
+ .btn--primary {
+ @apply bg-gray-900 text-white hover:bg-gray-700 disabled:bg-gray-50 disabled:hover:bg-gray-50 disabled:text-gray-400;
+ }
+
+ .btn--secondary {
+ @apply bg-gray-50 hover:bg-gray-100 text-gray-900;
+ }
+
+ .btn--outline {
+ @apply border border-alpha-black-200 text-gray-900 hover:bg-gray-50 disabled:bg-gray-50 disabled:hover:bg-gray-50 disabled:text-gray-400;
+ }
+
+ .btn--ghost {
+ @apply border border-transparent text-gray-900 hover:bg-gray-50;
+ }
+
+ .btn--destructive {
+ @apply bg-red-500 text-white hover:bg-red-600 disabled:bg-red-50 disabled:hover:bg-red-50 disabled:text-red-400;
+ }
+
+ /* Forms */
+ .form-field {
+ @apply flex flex-col gap-1 relative px-3 py-2 rounded-md border bg-white border-alpha-black-100 shadow-xs w-full;
+ @apply focus-within:border-gray-900 focus-within:shadow-none focus-within:ring-4 focus-within:ring-gray-100;
+ }
+
+ .form-field__label {
+ @apply block text-xs text-gray-500 peer-disabled:text-gray-400;
+ }
+
+ .form-field__input {
+ @apply border-none bg-transparent text-sm opacity-100 w-full p-0;
+ @apply focus:opacity-100 focus:outline-hidden focus:ring-0;
+ @apply placeholder-shown:opacity-50;
+ @apply disabled:text-gray-400;
+ @apply text-ellipsis overflow-hidden whitespace-nowrap;
+
+ &select {
+ @apply pr-8;
+ }
+ }
+
+ .form-field__radio {
+ @apply text-gray-900;
+ }
+
+ .form-field__submit {
+ @apply cursor-pointer rounded-lg bg-black p-3 text-center text-white hover:bg-gray-700;
+ }
+
+ /* Checkboxes */
+ .checkbox {
+ &[type='checkbox'] {
+ @apply rounded-sm;
+ }
+ }
+
+ .checkbox--light {
+ &[type='checkbox'] {
+ @apply border-alpha-black-200 checked:bg-gray-900 checked:ring-gray-900 focus:ring-gray-900 focus-visible:ring-gray-900 checked:hover:bg-gray-500;
+ }
+
+ &[type='checkbox']:disabled {
+ @apply cursor-not-allowed opacity-80 bg-gray-50 border-gray-200 checked:bg-gray-400 checked:ring-gray-400;
+ }
+ }
+
+ .checkbox--dark {
+ &[type='checkbox'] {
+ @apply ring-gray-900 checked:text-white;
+ }
+
+ &[type='checkbox']:disabled {
+ @apply cursor-not-allowed opacity-80 ring-gray-600;
+ }
+
+ &[type='checkbox']:checked {
+ background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='111827' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e");
+ }
+ }
+
+ /* Switches */
+ .switch {
+ @apply block bg-gray-100 w-9 h-5 rounded-full cursor-pointer;
+ @apply after:content-[''] after:block after:absolute after:top-0.5 after:left-0.5 after:bg-white after:w-4 after:h-4 after:rounded-full after:transition-transform after:duration-300 after:ease-in-out;
+ @apply peer-checked:bg-green-600 peer-checked:after:translate-x-4;
+ }
+
+ /* Typography */
+ .prose {
+ @apply max-w-none;
+
+ h2 {
+ @apply text-xl font-medium;
+ }
+
+ h3 {
+ @apply text-lg font-medium;
+ }
+
+ li {
+ @apply m-0;
+ }
+
+ details {
+ @apply mb-4 rounded-xl mt-3.5;
+ }
+
+ summary {
+ @apply flex items-center gap-1;
+ }
+
+ video {
+ @apply m-0 rounded-b-xl;
+ }
+ }
+
+ /* Tooltips */
+ .tooltip {
+ @apply hidden absolute;
+ }
+}
\ No newline at end of file
diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb
index 04be4b52..356798e5 100644
--- a/app/helpers/accounts_helper.rb
+++ b/app/helpers/accounts_helper.rb
@@ -76,12 +76,12 @@ module AccountsHelper
{
"CreditCard" => { text: "text-red-500", bg: "bg-red-500", bg_transparent: "bg-red-500/10", fill: "fill-red-500", hex: "#F13636" },
"Loan" => { text: "text-fuchsia-500", bg: "bg-fuchsia-500", bg_transparent: "bg-fuchsia-500/10", fill: "fill-fuchsia-500", hex: "#D444F1" },
- "OtherLiability" => { text: "text-gray-500", bg: "bg-gray-500", bg_transparent: "bg-gray-500/10", fill: "fill-gray-500", hex: "#737373" },
+ "OtherLiability" => { text: "text-secondary", bg: "bg-gray-500", bg_transparent: "bg-gray-500/10", fill: "fill-gray-500", hex: "#737373" },
"Depository" => { text: "text-violet-500", bg: "bg-violet-500", bg_transparent: "bg-violet-500/10", fill: "fill-violet-500", hex: "#875BF7" },
"Investment" => { text: "text-blue-600", bg: "bg-blue-600", bg_transparent: "bg-blue-600/10", fill: "fill-blue-600", hex: "#1570EF" },
"OtherAsset" => { text: "text-green-500", bg: "bg-green-500", bg_transparent: "bg-green-500/10", fill: "fill-green-500", hex: "#12B76A" },
"Property" => { text: "text-cyan-500", bg: "bg-cyan-500", bg_transparent: "bg-cyan-500/10", fill: "fill-cyan-500", hex: "#06AED4" },
"Vehicle" => { text: "text-pink-500", bg: "bg-pink-500", bg_transparent: "bg-pink-500/10", fill: "fill-pink-500", hex: "#F23E94" }
- }.fetch(accountable_type, { text: "text-gray-500", bg: "bg-gray-500", bg_transparent: "bg-gray-500/10", fill: "fill-gray-500", hex: "#737373" })
+ }.fetch(accountable_type, { text: "text-secondary", bg: "bg-gray-500", bg_transparent: "bg-gray-500/10", fill: "fill-gray-500", hex: "#737373" })
end
end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 033014e9..7549b6b5 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -76,8 +76,8 @@ module ApplicationHelper
is_current = current_page?(path) || (request.path.start_with?(path) && path != "/")
classes = [
- "flex items-center gap-2 px-3 py-2 rounded-xl border text-sm font-medium text-gray-500",
- (is_current ? "bg-white text-gray-900 shadow-xs border-alpha-black-50" : "hover:bg-gray-100 border-transparent")
+ "flex items-center gap-2 px-3 py-2 rounded-xl border text-sm font-medium text-secondary",
+ (is_current ? "bg-white text-primary shadow-xs border-alpha-black-50" : "hover:bg-gray-100 border-transparent")
].compact.join(" ")
link_to path, **options.merge(class: classes), aria: { current: ("page" if current_page?(path)) } do
@@ -106,7 +106,7 @@ module ApplicationHelper
end
def trend_styles(trend)
- fallback = { bg_class: "bg-gray-500/5", text_class: "text-gray-500", symbol: "", icon: "minus" }
+ fallback = { bg_class: "bg-gray-500/5", text_class: "text-secondary", symbol: "", icon: "minus" }
return fallback if trend.nil? || trend.direction.flat?
bg_class, text_class, symbol, icon = case trend.direction
@@ -115,7 +115,7 @@ module ApplicationHelper
when "down"
trend.favorable_direction.down? ? [ "bg-green-500/5", "text-green-500", "-", "arrow-down" ] : [ "bg-red-500/5", "text-red-500", "-", "arrow-down" ]
when "flat"
- [ "bg-gray-500/5", "text-gray-500", "", "minus" ]
+ [ "bg-gray-500/5", "text-secondary", "", "minus" ]
else
raise ArgumentError, "Invalid trend direction: #{trend.direction}"
end
diff --git a/app/helpers/forms_helper.rb b/app/helpers/forms_helper.rb
index a66c740e..39fa0740 100644
--- a/app/helpers/forms_helper.rb
+++ b/app/helpers/forms_helper.rb
@@ -17,7 +17,7 @@ module FormsHelper
end
end
- def period_select(form:, selected:, classes: "border border-alpha-black-100 shadow-xs rounded-lg text-sm pr-7 cursor-pointer text-gray-900 focus:outline-hidden focus:ring-0")
+ def period_select(form:, selected:, classes: "border border-tertiary shadow-xs rounded-lg text-sm pr-7 cursor-pointer text-primary focus:outline-hidden focus:ring-0")
periods_for_select = [
%w[CWD current_week], # Current Week to Date
%w[7D last_7_days],
@@ -39,7 +39,7 @@ end
private
def radio_tab_contents(label:, icon:)
- tag.div(class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-gray-400 group-has-checked:bg-white group-has-checked:text-gray-800 group-has-checked:shadow-sm") do
+ tag.div(class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-subdued group-has-checked:bg-white group-has-checked:text-gray-800 group-has-checked:shadow-sm") do
concat lucide_icon(icon, class: "w-5 h-5")
concat tag.span(label, class: "group-has-checked:font-semibold")
end
diff --git a/app/helpers/imports_helper.rb b/app/helpers/imports_helper.rb
index a202a697..b7718ecf 100644
--- a/app/helpers/imports_helper.rb
+++ b/app/helpers/imports_helper.rb
@@ -45,7 +45,7 @@ module ImportsHelper
end
def cell_class(row, field)
- base = "text-sm focus:ring-gray-900 focus:border-gray-900 w-full max-w-full disabled:text-gray-400"
+ base = "text-sm focus:ring-gray-900 focus:border-gray-900 w-full max-w-full disabled:text-subdued"
row.valid? # populate errors
diff --git a/app/helpers/menus_helper.rb b/app/helpers/menus_helper.rb
index 74ec8752..55ad55a3 100644
--- a/app/helpers/menus_helper.rb
+++ b/app/helpers/menus_helper.rb
@@ -7,8 +7,8 @@ module MenusHelper
end
def contextual_menu_modal_action_item(label, url, icon: "pencil-line", turbo_frame: :modal)
- link_to url, class: "flex items-center rounded-lg text-gray-900 hover:bg-gray-50 py-2 px-3 gap-2", data: { turbo_frame: } do
- concat(lucide_icon(icon, class: "shrink-0 w-5 h-5 text-gray-500"))
+ link_to url, class: "flex items-center rounded-lg text-primary hover:bg-gray-50 py-2 px-3 gap-2", data: { turbo_frame: } do
+ concat(lucide_icon(icon, class: "shrink-0 w-5 h-5 text-secondary"))
concat(tag.span(label, class: "text-sm"))
end
end
@@ -26,7 +26,7 @@ module MenusHelper
private
def contextual_menu_icon
tag.button class: "flex hover:bg-gray-100 p-2 rounded cursor-pointer", data: { menu_target: "button" } do
- lucide_icon "more-horizontal", class: "w-5 h-5 text-gray-500"
+ lucide_icon "more-horizontal", class: "w-5 h-5 text-secondary"
end
end
diff --git a/app/javascript/controllers/time_series_chart_controller.js b/app/javascript/controllers/time_series_chart_controller.js
index 0f687e0d..4ae37bfa 100644
--- a/app/javascript/controllers/time_series_chart_controller.js
+++ b/app/javascript/controllers/time_series_chart_controller.js
@@ -401,11 +401,11 @@ export default class extends Controller {
up:
datum.trend.favorable_direction === "up"
? "var(--color-success)"
- : "var(--color-error)",
+ : "var(--color-destructive)",
down:
datum.trend.favorable_direction === "down"
? "var(--color-success)"
- : "var(--color-error)",
+ : "var(--color-destructive)",
flat: "var(--color-gray-500)",
}[datum.trend.direction];
}
@@ -509,7 +509,7 @@ export default class extends Controller {
if (this._trendDirection === this._favorableDirection) {
return "var(--color-green-500)";
}
- return "var(--color-error)";
+ return "var(--color-destructive)";
}
get _trendDirection() {
diff --git a/app/views/account/entries/_empty.html.erb b/app/views/account/entries/_empty.html.erb
index 9cb5e3fa..60c296e9 100644
--- a/app/views/account/entries/_empty.html.erb
+++ b/app/views/account/entries/_empty.html.erb
@@ -1,4 +1,4 @@
<div class="flex flex-col items-center justify-center py-40">
- <p class="text-gray-500 mb-2"><%= t(".title") %></p>
- <p class="text-gray-400 max-w-xs text-center"><%= t(".description") %></p>
+ <p class="text-secondary mb-2"><%= t(".title") %></p>
+ <p class="text-subdued max-w-xs text-center"><%= t(".description") %></p>
</div>
diff --git a/app/views/account/entries/_entry_group.html.erb b/app/views/account/entries/_entry_group.html.erb
index a58d0f15..4006b070 100644
--- a/app/views/account/entries/_entry_group.html.erb
+++ b/app/views/account/entries/_entry_group.html.erb
@@ -1,10 +1,10 @@
<%# locals: (date:, entries:, content:, selectable:, totals: false) %>
<div id="entry-group-<%= date %>" class="bg-gray-25 rounded-xl p-1 w-full" data-bulk-select-target="group">
- <div class="py-2 px-4 flex items-center justify-between font-medium text-xs text-gray-500">
+ <div class="py-2 px-4 flex items-center justify-between font-medium text-xs text-secondary">
<div class="flex pl-0.5 items-center gap-4">
<% if selectable %>
<%= check_box_tag "#{date}_entries_selection",
- class: ["maybe-checkbox maybe-checkbox--light", "hidden": entries.size == 0],
+ class: ["checkbox checkbox--light", "hidden": entries.size == 0],
id: "selection_entry_#{date}",
data: { action: "bulk-select#toggleGroupSelection" } %>
<% end %>
diff --git a/app/views/account/entries/_loading.html.erb b/app/views/account/entries/_loading.html.erb
index 4f49ca61..7436f568 100644
--- a/app/views/account/entries/_loading.html.erb
+++ b/app/views/account/entries/_loading.html.erb
@@ -1,5 +1,5 @@
<div class="bg-white space-y-4 p-5 border border-alpha-black-25 rounded-xl shadow-xs">
<div class="p-5 flex justify-center items-center">
- <%= tag.p t(".loading"), class: "text-gray-500 animate-pulse text-sm" %>
+ <%= tag.p t(".loading"), class: "text-secondary animate-pulse text-sm" %>
</div>
</div>
diff --git a/app/views/account/entries/_selection_bar.html.erb b/app/views/account/entries/_selection_bar.html.erb
index 3bbf39d1..78d69c45 100644
--- a/app/views/account/entries/_selection_bar.html.erb
+++ b/app/views/account/entries/_selection_bar.html.erb
@@ -1,11 +1,11 @@
<div class="fixed bottom-6 z-10 flex items-center justify-between rounded-xl bg-gray-900 px-4 text-sm text-white w-[420px] py-1.5">
<div class="flex items-center gap-2">
- <%= check_box_tag "entry_selection", 1, true, class: "maybe-checkbox maybe-checkbox--dark", data: { action: "bulk-select#deselectAll" } %>
+ <%= check_box_tag "entry_selection", 1, true, class: "checkbox checkbox--dark", data: { action: "bulk-select#deselectAll" } %>
<p data-bulk-select-target="selectionBarText"></p>
</div>
- <div class="flex items-center gap-1 text-gray-500">
+ <div class="flex items-center gap-1 text-secondary">
<%= form_with url: bulk_delete_account_transactions_path, data: { turbo_confirm: true, turbo_frame: "_top" } do %>
<button type="button" data-bulk-select-scope-param="bulk_delete" data-action="bulk-select#submitBulkRequest" class="p-1.5 group hover:bg-gray-700 flex items-center justify-center rounded-md" title="Delete">
<%= lucide_icon "trash-2", class: "w-5 group-hover:text-white" %>
diff --git a/app/views/account/holdings/_cash.html.erb b/app/views/account/holdings/_cash.html.erb
index 51c62f28..0619df7f 100644
--- a/app/views/account/holdings/_cash.html.erb
+++ b/app/views/account/holdings/_cash.html.erb
@@ -2,13 +2,13 @@
<% currency = Money::Currency.new(account.currency) %>
-<div class="grid grid-cols-12 items-center text-gray-900 text-sm font-medium p-4">
+<div class="grid grid-cols-12 items-center text-primary text-sm font-medium p-4">
<div class="col-span-4 flex items-center gap-4">
<%= render "shared/circle_logo", name: currency.iso_code %>
<div class="space-y-0.5">
- <%= tag.p t(".brokerage_cash"), class: "text-gray-900" %>
- <%= tag.p account.currency, class: "text-gray-500 text-xs uppercase" %>
+ <%= tag.p t(".brokerage_cash"), class: "text-primary" %>
+ <%= tag.p account.currency, class: "text-secondary text-xs uppercase" %>
</div>
</div>
@@ -19,7 +19,7 @@
</div>
<div class="col-span-2 text-right">
- <%= tag.p "--", class: "text-gray-500" %>
+ <%= tag.p "--", class: "text-secondary" %>
</div>
<div class="col-span-2 text-right">
@@ -27,6 +27,6 @@
</div>
<div class="col-span-2 text-right">
- <%= tag.p "--", class: "text-gray-500" %>
+ <%= tag.p "--", class: "text-secondary" %>
</div>
</div>
diff --git a/app/views/account/holdings/_holding.html.erb b/app/views/account/holdings/_holding.html.erb
index e33f4f54..e07fcaac 100644
--- a/app/views/account/holdings/_holding.html.erb
+++ b/app/views/account/holdings/_holding.html.erb
@@ -1,7 +1,7 @@
<%# locals: (holding:) %>
<%= turbo_frame_tag dom_id(holding) do %>
- <div class="grid grid-cols-12 items-center text-gray-900 text-sm font-medium p-4">
+ <div class="grid grid-cols-12 items-center text-primary text-sm font-medium p-4">
<div class="col-span-4 flex items-center gap-4">
<%= image_tag "https://logo.synthfinance.com/ticker/#{holding.ticker}", class: "w-9 h-9 rounded-full", loading: "lazy" %>
@@ -9,7 +9,7 @@
<%= link_to holding.name, account_holding_path(holding), data: { turbo_frame: :drawer }, class: "hover:underline" %>
<% if holding.amount %>
- <%= tag.p holding.ticker, class: "text-gray-500 text-xs uppercase" %>
+ <%= tag.p holding.ticker, class: "text-secondary text-xs uppercase" %>
<% else %>
<%= render "missing_price_tooltip" %>
<% end %>
@@ -21,22 +21,22 @@
<%= render "shared/progress_circle", progress: holding.weight, text_class: "text-blue-500" %>
<%= tag.p number_to_percentage(holding.weight, precision: 1) %>
<% else %>
- <%= tag.p "--", class: "text-gray-500 mb-5" %>
+ <%= tag.p "--", class: "text-secondary mb-5" %>
<% end %>
</div>
<div class="col-span-2 text-right">
<%= tag.p format_money holding.avg_cost %>
- <%= tag.p t(".per_share"), class: "font-normal text-gray-500" %>
+ <%= tag.p t(".per_share"), class: "font-normal text-secondary" %>
</div>
<div class="col-span-2 text-right">
<% if holding.amount_money %>
<%= tag.p format_money holding.amount_money %>
<% else %>
- <%= tag.p "--", class: "text-gray-500" %>
+ <%= tag.p "--", class: "text-secondary" %>
<% end %>
- <%= tag.p t(".shares", qty: number_with_precision(holding.qty, precision: 1)), class: "font-normal text-gray-500" %>
+ <%= tag.p t(".shares", qty: number_with_precision(holding.qty, precision: 1)), class: "font-normal text-secondary" %>
</div>
<div class="col-span-2 text-right">
@@ -44,7 +44,7 @@
<%= tag.p format_money(holding.trend.value), style: "color: #{holding.trend.color};" %>
<%= tag.p "(#{number_to_percentage(holding.trend.percent, precision: 1)})", style: "color: #{holding.trend.color};" %>
<% else %>
- <%= tag.p "--", class: "text-gray-500 mb-4" %>
+ <%= tag.p "--", class: "text-secondary mb-4" %>
<% end %>
</div>
</div>
diff --git a/app/views/account/holdings/index.html.erb b/app/views/account/holdings/index.html.erb
index 195a2604..3c52da53 100644
--- a/app/views/account/holdings/index.html.erb
+++ b/app/views/account/holdings/index.html.erb
@@ -5,14 +5,14 @@
<%= link_to new_account_trade_path(account_id: @account.id),
id: dom_id(@account, "new_trade"),
data: { turbo_frame: :modal },
- class: "flex gap-1 font-medium items-center bg-gray-50 text-gray-900 p-2 rounded-lg" do %>
- <%= lucide_icon("plus", class: "w-5 h-5 text-gray-900") %>
+ class: "flex gap-1 font-medium items-center bg-gray-50 text-primary p-2 rounded-lg" do %>
+ <%= lucide_icon("plus", class: "w-5 h-5 text-primary") %>
<%= tag.span t(".new_holding"), class: "text-sm" %>
<% end %>
</div>
<div class="rounded-xl bg-gray-25 p-1">
- <div class="grid grid-cols-12 items-center uppercase text-xs font-medium text-gray-500 px-4 py-2">
+ <div class="grid grid-cols-12 items-center uppercase text-xs font-medium text-secondary px-4 py-2">
<%= tag.p t(".name"), class: "col-span-4" %>
<%= tag.p t(".weight"), class: "col-span-2 justify-self-end" %>
<%= tag.p t(".cost"), class: "col-span-2 justify-self-end" %>
@@ -26,7 +26,7 @@
<%= render "account/holdings/ruler" %>
<%= render partial: "account/holdings/holding", collection: @account.current_holdings, spacer_template: "ruler" %>
<% else %>
- <p class="text-gray-500 text-sm p-4"><%= t(".no_holdings") %></p>
+ <p class="text-secondary text-sm p-4"><%= t(".no_holdings") %></p>
<% end %>
</div>
</div>
diff --git a/app/views/account/holdings/show.html.erb b/app/views/account/holdings/show.html.erb
index cedaddbf..1dd09244 100644
--- a/app/views/account/holdings/show.html.erb
+++ b/app/views/account/holdings/show.html.erb
@@ -2,43 +2,43 @@
<div class="space-y-4">
<header class="flex justify-between">
<div>
- <%= tag.h3 @holding.name, class: "text-2xl font-medium text-gray-900" %>
- <%= tag.p @holding.ticker, class: "text-sm text-gray-500" %>
+ <%= tag.h3 @holding.name, class: "text-2xl font-medium text-primary" %>
+ <%= tag.p @holding.ticker, class: "text-sm text-secondary" %>
</div>
<%= image_tag "https://logo.synthfinance.com/ticker/#{@holding.ticker}", loading: "lazy", class: "w-9 h-9 rounded-full" %>
</header>
<details class="group space-y-2" open>
- <summary class="flex list-none items-center justify-between rounded-xl px-3 py-2 text-xs font-medium uppercase text-gray-500 bg-gray-25 focus-visible:outline-hidden">
+ <summary class="flex list-none items-center justify-between rounded-xl px-3 py-2 text-xs font-medium uppercase text-secondary bg-gray-25 focus-visible:outline-hidden">
<h4><%= t(".overview") %></h4>
- <%= lucide_icon "chevron-down", class: "group-open:transform group-open:rotate-180 text-gray-500 w-5" %>
+ <%= lucide_icon "chevron-down", class: "group-open:transform group-open:rotate-180 text-secondary w-5" %>
</summary>
<div class="pb-4">
<dl class="space-y-3 px-3 py-2">
<div class="flex items-center justify-between text-sm">
- <dt class="text-gray-500"><%= t(".ticker_label") %></dt>
- <dd class="text-gray-900"><%= @holding.ticker %></dd>
+ <dt class="text-secondary"><%= t(".ticker_label") %></dt>
+ <dd class="text-primary"><%= @holding.ticker %></dd>
</div>
<div class="flex items-center justify-between text-sm">
- <dt class="text-gray-500"><%= t(".current_market_price_label") %></dt>
- <dd class="text-gray-900"><%= @holding.security.current_price ? format_money(@holding.security.current_price) : t(".unknown") %></dd>
+ <dt class="text-secondary"><%= t(".current_market_price_label") %></dt>
+ <dd class="text-primary"><%= @holding.security.current_price ? format_money(@holding.security.current_price) : t(".unknown") %></dd>
</div>
<div class="flex items-center justify-between text-sm">
- <dt class="text-gray-500"><%= t(".portfolio_weight_label") %></dt>
- <dd class="text-gray-900"><%= @holding.weight ? number_to_percentage(@holding.weight, precision: 2) : t(".unknown") %></dd>
+ <dt class="text-secondary"><%= t(".portfolio_weight_label") %></dt>
+ <dd class="text-primary"><%= @holding.weight ? number_to_percentage(@holding.weight, precision: 2) : t(".unknown") %></dd>
</div>
<div class="flex items-center justify-between text-sm">
- <dt class="text-gray-500"><%= t(".avg_cost_label") %></dt>
- <dd class="text-gray-900"><%= @holding.avg_cost ? format_money(@holding.avg_cost) : t(".unknown") %></dd>
+ <dt class="text-secondary"><%= t(".avg_cost_label") %></dt>
+ <dd class="text-primary"><%= @holding.avg_cost ? format_money(@holding.avg_cost) : t(".unknown") %></dd>
</div>
<div class="flex items-center justify-between text-sm">
- <dt class="text-gray-500"><%= t(".trend_label") %></dt>
+ <dt class="text-secondary"><%= t(".trend_label") %></dt>
<dd style="color: <%= @holding.trend&.color %>;">
<%= @holding.trend ? render("shared/trend_change", trend: @holding.trend) : t(".unknown") %>
</dd>
@@ -48,9 +48,9 @@
</details>
<details class="group space-y-2" open>
- <summary class="flex list-none items-center justify-between rounded-xl px-3 py-2 text-xs font-medium uppercase text-gray-500 bg-gray-25 focus-visible:outline-hidden">
+ <summary class="flex list-none items-center justify-between rounded-xl px-3 py-2 text-xs font-medium uppercase text-secondary bg-gray-25 focus-visible:outline-hidden">
<h4><%= t(".history") %></h4>
- <%= lucide_icon "chevron-down", class: "group-open:transform group-open:rotate-180 text-gray-500 w-5" %>
+ <%= lucide_icon "chevron-down", class: "group-open:transform group-open:rotate-180 text-secondary w-5" %>
</summary>
<div class="space-y-2">
@@ -67,7 +67,7 @@
</div>
<div>
- <p class="text-gray-500 text-xs uppercase"><%= l(trade_entry.date, format: :long) %></p>
+ <p class="text-secondary text-xs uppercase"><%= l(trade_entry.date, format: :long) %></p>
<p><%= t(
".trade_history_entry",
@@ -81,29 +81,29 @@
</ul>
<% else %>
- <p class="text-gray-500">No trade history available for this holding.</p>
+ <p class="text-secondary">No trade history available for this holding.</p>
<% end %>
</div>
</div>
</details>
<details class="group space-y-2" open>
- <summary class="flex list-none items-center justify-between rounded-xl px-3 py-2 text-xs font-medium uppercase text-gray-500 bg-gray-25 focus-visible:outline-hidden">
+ <summary class="flex list-none items-center justify-between rounded-xl px-3 py-2 text-xs font-medium uppercase text-secondary bg-gray-25 focus-visible:outline-hidden">
<h4><%= t(".settings") %></h4>
- <%= lucide_icon "chevron-down", class: "group-open:transform group-open:rotate-180 text-gray-500 w-5" %>
+ <%= lucide_icon "chevron-down", class: "group-open:transform group-open:rotate-180 text-secondary w-5" %>
</summary>
<div class="pb-4">
<div class="flex items-center justify-between gap-2 p-3">
<div class="text-sm space-y-1">
- <h4 class="text-gray-900"><%= t(".delete_title") %></h4>
- <p class="text-gray-500"><%= t(".delete_subtitle") %></p>
+ <h4 class="text-primary"><%= t(".delete_title") %></h4>
+ <p class="text-secondary"><%= t(".delete_subtitle") %></p>
</div>
<%= button_to t(".delete"),
account_holding_path(@holding),
method: :delete,
- class: "rounded-lg px-3 py-2 text-red-500 text-sm font-medium border border-alpha-black-200",
+ class: "rounded-lg px-3 py-2 text-red-500 text-sm font-medium border border-secondary",
data: { turbo_confirm: true } %>
</div>
</div>
diff --git a/app/views/account/trades/_header.html.erb b/app/views/account/trades/_header.html.erb
index b89028af..7556790e 100644
--- a/app/views/account/trades/_header.html.erb
+++ b/app/views/account/trades/_header.html.erb
@@ -2,7 +2,7 @@
<div id="<%= dom_id(entry, :header) %>">
<%= tag.header class: "mb-4 space-y-1" do %>
- <span class="text-gray-500 text-sm">
+ <span class="text-secondary text-sm">
<%= entry.amount.negative? ? t(".sell") : t(".buy") %>
</span>
@@ -12,13 +12,13 @@
<%= format_money entry.amount_money %>
</span>
- <span class="text-lg text-gray-500">
+ <span class="text-lg text-secondary">
<%= entry.currency %>
</span>
</h3>
</div>
- <span class="text-sm text-gray-500">
+ <span class="text-sm text-secondary">
<%= I18n.l(entry.date, format: :long) %>
</span>
<% end %>
@@ -30,32 +30,32 @@
<div class="pb-4">
<dl class="space-y-3 px-3 py-2">
<div class="flex items-center justify-between text-sm">
- <dt class="text-gray-500"><%= t(".symbol_label") %></dt>
- <dd class="text-gray-900"><%= trade.security.ticker %></dd>
+ <dt class="text-secondary"><%= t(".symbol_label") %></dt>
+ <dd class="text-primary"><%= trade.security.ticker %></dd>
</div>
<% if trade.qty.positive? %>
<div class="flex items-center justify-between text-sm">
- <dt class="text-gray-500"><%= t(".purchase_qty_label") %></dt>
- <dd class="text-gray-900"><%= trade.qty.abs %></dd>
+ <dt class="text-secondary"><%= t(".purchase_qty_label") %></dt>
+ <dd class="text-primary"><%= trade.qty.abs %></dd>
</div>
<div class="flex items-center justify-between text-sm">
- <dt class="text-gray-500"><%= t(".purchase_price_label") %></dt>
- <dd class="text-gray-900"><%= format_money trade.price_money %></dd>
+ <dt class="text-secondary"><%= t(".purchase_price_label") %></dt>
+ <dd class="text-primary"><%= format_money trade.price_money %></dd>
</div>
<% end %>
<% if trade.security.current_price.present? %>
<div class="flex items-center justify-between text-sm">
- <dt class="text-gray-500"><%= t(".current_market_price_label") %></dt>
- <dd class="text-gray-900"><%= format_money trade.security.current_price %></dd>
+ <dt class="text-secondary"><%= t(".current_market_price_label") %></dt>
+ <dd class="text-primary"><%= format_money trade.security.current_price %></dd>
</div>
<% end %>
<% if trade.qty.positive? && trade.unrealized_gain_loss.present? %>
<div class="flex items-center justify-between text-sm">
- <dt class="text-gray-500"><%= t(".total_return_label") %></dt>
+ <dt class="text-secondary"><%= t(".total_return_label") %></dt>
<dd style="color: <%= trade.unrealized_gain_loss.color %>;">
<%= render "shared/trend_change", trend: trade.unrealized_gain_loss %>
</dd>
diff --git a/app/views/account/trades/_selection_bar.html.erb b/app/views/account/trades/_selection_bar.html.erb
index 3bbf39d1..78d69c45 100644
--- a/app/views/account/trades/_selection_bar.html.erb
+++ b/app/views/account/trades/_selection_bar.html.erb
@@ -1,11 +1,11 @@
<div class="fixed bottom-6 z-10 flex items-center justify-between rounded-xl bg-gray-900 px-4 text-sm text-white w-[420px] py-1.5">
<div class="flex items-center gap-2">
- <%= check_box_tag "entry_selection", 1, true, class: "maybe-checkbox maybe-checkbox--dark", data: { action: "bulk-select#deselectAll" } %>
+ <%= check_box_tag "entry_selection", 1, true, class: "checkbox checkbox--dark", data: { action: "bulk-select#deselectAll" } %>
<p data-bulk-select-target="selectionBarText"></p>
</div>
- <div class="flex items-center gap-1 text-gray-500">
+ <div class="flex items-center gap-1 text-secondary">
<%= form_with url: bulk_delete_account_transactions_path, data: { turbo_confirm: true, turbo_frame: "_top" } do %>
<button type="button" data-bulk-select-scope-param="bulk_delete" data-action="bulk-select#submitBulkRequest" class="p-1.5 group hover:bg-gray-700 flex items-center justify-center rounded-md" title="Delete">
<%= lucide_icon "trash-2", class: "w-5 group-hover:text-white" %>
diff --git a/app/views/account/trades/_trade.html.erb b/app/views/account/trades/_trade.html.erb
index 517dc64d..0f0f54af 100644
--- a/app/views/account/trades/_trade.html.erb
+++ b/app/views/account/trades/_trade.html.erb
@@ -2,11 +2,11 @@
<% trade, account = entry.account_trade, entry.account %>
-<div class="grid grid-cols-12 items-center <%= entry.excluded ? "text-gray-400 bg-gray-25" : "text-gray-900" %> text-sm font-medium p-4">
+<div class="grid grid-cols-12 items-center <%= entry.excluded ? "text-subdued bg-gray-25" : "text-primary" %> text-sm font-medium p-4">
<div class="col-span-6 flex items-center gap-4">
<% if selectable %>
<%= check_box_tag dom_id(entry, "selection"),
- class: "maybe-checkbox maybe-checkbox--light",
+ class: "checkbox checkbox--light",
data: { id: entry.id, "bulk-select-target": "row", action: "bulk-select#toggleRowSelection" } %>
<% end %>
@@ -43,10 +43,10 @@
<div class="col-span-2 justify-self-end">
<% if balance_trend&.trend %>
<div class="flex items-center gap-2">
- <%= tag.p format_money(balance_trend.trend.current), class: "font-medium text-sm text-gray-900" %>
+ <%= tag.p format_money(balance_trend.trend.current), class: "font-medium text-sm text-primary" %>
</div>
<% else %>
- <%= tag.p "--", class: "font-medium text-sm text-gray-400" %>
+ <%= tag.p "--", class: "font-medium text-sm text-subdued" %>
<% end %>
</div>
</div>
diff --git a/app/views/account/trades/index.html.erb b/app/views/account/trades/index.html.erb
index c538a87c..4427aba1 100644
--- a/app/views/account/trades/index.html.erb
+++ b/app/views/account/trades/index.html.erb
@@ -4,17 +4,17 @@
<h3 class="font-medium text-lg"><%= t(".trades") %></h3>
<%= link_to new_account_trade_path(@account),
id: dom_id(@account, "new_trade"),
- class: "flex gap-1 font-medium items-center bg-gray-50 text-gray-900 p-2 rounded-lg",
+ class: "flex gap-1 font-medium items-center bg-gray-50 text-primary p-2 rounded-lg",
data: { turbo_frame: :modal } do %>
- <%= lucide_icon("plus", class: "w-5 h-5 text-gray-900") %>
+ <%= lucide_icon("plus", class: "w-5 h-5 text-primary") %>
<span class="text-sm"><%= t(".new") %></span>
<% end %>
</div>
- <div class="bg-gray-25 rounded-xl grid grid-cols-12 items-center uppercase text-xs font-medium text-gray-500 px-5 py-3">
+ <div class="bg-gray-25 rounded-xl grid grid-cols-12 items-center uppercase text-xs font-medium text-secondary px-5 py-3">
<div class="pl-0.5 col-span-6 flex items-center gap-4">
<%= check_box_tag "selection_entry",
- class: "maybe-checkbox maybe-checkbox--light",
+ class: "checkbox checkbox--light",
data: { action: "bulk-select#togglePageSelection" } %>
<%= tag.p t(".trade") %>
</div>
@@ -29,7 +29,7 @@
</div>
<% if @entries.empty? %>
- <p class="text-gray-500 py-4"><%= t(".no_trades") %></p>
+ <p class="text-secondary py-4"><%= t(".no_trades") %></p>
<% else %>
<div class="space-y-6">
<%= entries_by_date(@entries) do |entries, _transfers| %>
diff --git a/app/views/account/trades/show.html.erb b/app/views/account/trades/show.html.erb
index affd2952..b45b55af 100644
--- a/app/views/account/trades/show.html.erb
+++ b/app/views/account/trades/show.html.erb
@@ -68,8 +68,8 @@
data: { controller: "auto-submit-form" } do |f| %>
<div class="flex cursor-pointer items-center gap-2 justify-between">
<div class="text-sm space-y-1">
- <h4 class="text-gray-900"><%= t(".exclude_title") %></h4>
- <p class="text-gray-500"><%= t(".exclude_subtitle") %></p>
+ <h4 class="text-primary"><%= t(".exclude_title") %></h4>
+ <p class="text-secondary"><%= t(".exclude_subtitle") %></p>
</div>
<div class="relative inline-block select-none">
@@ -77,7 +77,7 @@
class: "sr-only peer",
"data-auto-submit-form-target": "auto" %>
<label for="account_entry_excluded"
- class="maybe-switch"></label>
+ class="switch"></label>
</div>
</div>
<% end %>
@@ -85,15 +85,15 @@
<!-- Delete Trade Form -->
<div class="flex items-center justify-between gap-2 p-3">
<div class="text-sm space-y-1">
- <h4 class="text-gray-900"><%= t(".delete_title") %></h4>
- <p class="text-gray-500"><%= t(".delete_subtitle") %></p>
+ <h4 class="text-primary"><%= t(".delete_title") %></h4>
+ <p class="text-secondary"><%= t(".delete_subtitle") %></p>
</div>
<%= button_to t(".delete"),
account_entry_path(@entry),
method: :delete,
class: "rounded-lg px-3 py-2 text-red-500 text-sm
- font-medium border border-alpha-black-200",
+ font-medium border border-secondary",
data: { turbo_confirm: true } %>
</div>
</div>
diff --git a/app/views/account/transactions/_form.html.erb b/app/views/account/transactions/_form.html.erb
index f3290c5b..8ca19c39 100644
--- a/app/views/account/transactions/_form.html.erb
+++ b/app/views/account/transactions/_form.html.erb
@@ -8,7 +8,7 @@
<fieldset class="bg-gray-50 rounded-lg p-1 grid grid-flow-col justify-stretch gap-x-2">
<%= radio_tab_tag form: f, name: :nature, value: :outflow, label: t(".expense"), icon: "minus-circle", checked: params[:nature] == "outflow" || params[:nature].nil? %>
<%= radio_tab_tag form: f, name: :nature, value: :inflow, label: t(".income"), icon: "plus-circle", checked: params[:nature] == "inflow" %>
- <%= link_to new_transfer_path, data: { turbo_frame: :modal }, class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-gray-400 group-has-checked:bg-white group-has-checked:text-gray-800 group-has-checked:shadow-sm" do %>
+ <%= link_to new_transfer_path, data: { turbo_frame: :modal }, class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-subdued group-has-checked:bg-white group-has-checked:text-gray-800 group-has-checked:shadow-sm" do %>
<%= lucide_icon "arrow-right-left", class: "w-5 h-5" %>
<%= tag.span t(".transfer") %>
<% end %>
diff --git a/app/views/account/transactions/_header.html.erb b/app/views/account/transactions/_header.html.erb
index 401157f1..83f9d1b6 100644
--- a/app/views/account/transactions/_header.html.erb
+++ b/app/views/account/transactions/_header.html.erb
@@ -7,17 +7,17 @@
<%= format_money -entry.amount_money %>
</span>
- <span class="text-lg text-gray-500">
+ <span class="text-lg text-secondary">
<%= entry.currency %>
</span>
</h3>
<% if entry.account_transaction.transfer? %>
- <%= lucide_icon "arrow-left-right", class: "text-gray-500 mt-1 w-5 h-5" %>
+ <%= lucide_icon "arrow-left-right", class: "text-secondary mt-1 w-5 h-5" %>
<% end %>
</div>
- <span class="text-sm text-gray-500">
+ <span class="text-sm text-secondary">
<%= I18n.l(entry.date, format: :long) %>
</span>
<% end %>
diff --git a/app/views/account/transactions/_selection_bar.html.erb b/app/views/account/transactions/_selection_bar.html.erb
index 1c38f869..5f8007af 100644
--- a/app/views/account/transactions/_selection_bar.html.erb
+++ b/app/views/account/transactions/_selection_bar.html.erb
@@ -1,11 +1,11 @@
<div class="fixed bottom-6 z-10 flex items-center justify-between rounded-xl bg-gray-900 px-4 text-sm text-white w-[420px] py-1.5">
<div class="flex items-center gap-2">
- <%= check_box_tag "entry_selection", 1, true, class: "maybe-checkbox maybe-checkbox--dark", data: { action: "bulk-select#deselectAll" } %>
+ <%= check_box_tag "entry_selection", 1, true, class: "checkbox checkbox--dark", data: { action: "bulk-select#deselectAll" } %>
<p data-bulk-select-target="selectionBarText"></p>
</div>
- <div class="flex items-center gap-1 text-gray-500">
+ <div class="flex items-center gap-1 text-secondary">
<%= turbo_frame_tag "bulk_transaction_edit_drawer" %>
<%= link_to bulk_edit_account_transactions_path,
diff --git a/app/views/account/transactions/_transaction.html.erb b/app/views/account/transactions/_transaction.html.erb
index 3b679db0..77eb0134 100644
--- a/app/views/account/transactions/_transaction.html.erb
+++ b/app/views/account/transactions/_transaction.html.erb
@@ -1,11 +1,11 @@
<%# locals: (entry:, selectable: true, balance_trend: nil) %>
-<div class="grid grid-cols-12 items-center text-gray-900 text-sm font-medium p-4 <%= @focused_record == entry ? "border border-gray-900 rounded-lg" : "" %>">
+<div class="grid grid-cols-12 items-center text-primary text-sm font-medium p-4 <%= @focused_record == entry ? "border border-gray-900 rounded-lg" : "" %>">
<div class="pr-10 flex items-center gap-4 <%= balance_trend ? "col-span-6" : "col-span-8" %>">
<% if selectable %>
<%= check_box_tag dom_id(entry, "selection"),
disabled: entry.entryable.transfer?,
- class: "maybe-checkbox maybe-checkbox--light",
+ class: "checkbox checkbox--light",
data: { id: entry.id, "bulk-select-target": "row", action: "bulk-select#toggleRowSelection" } %>
<% end %>
@@ -40,7 +40,7 @@
<% end %>
</div>
- <div class="text-gray-500 text-xs font-normal">
+ <div class="text-secondary text-xs font-normal">
<% if entry.entryable.transfer? %>
<%= render "transfers/account_links", transfer: entry.entryable.transfer, is_inflow: entry.entryable.transfer_as_inflow.present? %>
<% else %>
@@ -66,9 +66,9 @@
<% if balance_trend %>
<div class="col-span-2 justify-self-end">
<% if balance_trend.trend %>
- <%= tag.p format_money(balance_trend.trend.current), class: "font-medium text-sm text-gray-900" %>
+ <%= tag.p format_money(balance_trend.trend.current), class: "font-medium text-sm text-primary" %>
<% else %>
- <%= tag.p "--", class: "font-medium text-sm text-gray-400" %>
+ <%= tag.p "--", class: "font-medium text-sm text-subdued" %>
<% end %>
</div>
<% end %>
diff --git a/app/views/account/transactions/_transfer_match.html.erb b/app/views/account/transactions/_transfer_match.html.erb
index 810611d2..18665a45 100644
--- a/app/views/account/transactions/_transfer_match.html.erb
+++ b/app/views/account/transactions/_transfer_match.html.erb
@@ -12,7 +12,7 @@
<%= button_to transfer_path(entry.account_transaction.transfer, transfer: { status: "confirmed" }),
method: :patch,
- class: "text-gray-500 hover:text-gray-800 flex items-center justify-center",
+ class: "text-secondary hover:text-gray-800 flex items-center justify-center",
title: "Confirm match" do %>
<%= lucide_icon "check", class: "w-4 h-4 text-indigo-400 hover:text-indigo-600" %>
<% end %>
@@ -20,9 +20,9 @@
<%= button_to transfer_path(entry.account_transaction.transfer, transfer: { status: "rejected" }),
method: :patch,
data: { turbo: false },
- class: "text-gray-500 hover:text-gray-800 flex items-center justify-center",
+ class: "text-secondary hover:text-gray-800 flex items-center justify-center",
title: "Reject match" do %>
- <%= lucide_icon "x", class: "w-4 h-4 text-gray-400 hover:text-gray-600" %>
+ <%= lucide_icon "x", class: "w-4 h-4 text-subdued hover:text-gray-600" %>
<% end %>
<% end %>
</div>
diff --git a/app/views/account/transactions/bulk_edit.html.erb b/app/views/account/transactions/bulk_edit.html.erb
index 075733bd..7f462acf 100644
--- a/app/views/account/transactions/bulk_edit.html.erb
+++ b/app/views/account/transactions/bulk_edit.html.erb
@@ -21,9 +21,9 @@
<div class="space-y-2">
<details class="group space-y-2" open>
- <summary class="flex list-none items-center justify-between rounded-xl px-3 py-2 text-xs font-medium uppercase text-gray-500 bg-gray-25 focus-visible:outline-hidden">
+ <summary class="flex list-none items-center justify-between rounded-xl px-3 py-2 text-xs font-medium uppercase text-secondary bg-gray-25 focus-visible:outline-hidden">
<h4><%= t(".overview") %></h4>
- <%= lucide_icon "chevron-down", class: "group-open:transform group-open:rotate-180 text-gray-500 w-5" %>
+ <%= lucide_icon "chevron-down", class: "group-open:transform group-open:rotate-180 text-secondary w-5" %>
</summary>
<div class="pb-6 space-y-2">
@@ -32,14 +32,14 @@
</details>
<details class="group space-y-2" open>
- <summary class="flex list-none items-center justify-between rounded-xl px-3 py-2 text-xs font-medium uppercase text-gray-500 bg-gray-25 focus-visible:outline-hidden">
+ <summary class="flex list-none items-center justify-between rounded-xl px-3 py-2 text-xs font-medium uppercase text-secondary bg-gray-25 focus-visible:outline-hidden">
<h4><%= t(".details") %></h4>
- <%= lucide_icon "chevron-down", class: "group-open:transform group-open:rotate-180 text-gray-500 w-5" %>
+ <%= lucide_icon "chevron-down", class: "group-open:transform group-open:rotate-180 text-secondary w-5" %>
</summary>
<div class="space-y-2">
- <%= form.collection_select :category_id, Current.family.categories.alphabetically, :id, :name, { prompt: t(".category_placeholder"), label: t(".category_label"), class: "text-gray-400" } %>
- <%= form.collection_select :merchant_id, Current.family.merchants.alphabetically, :id, :name, { prompt: t(".merchant_placeholder"), label: t(".merchant_label"), class: "text-gray-400" } %>
+ <%= form.collection_select :category_id, Current.family.categories.alphabetically, :id, :name, { prompt: t(".category_placeholder"), label: t(".category_label"), class: "text-subdued" } %>
+ <%= form.collection_select :merchant_id, Current.family.merchants.alphabetically, :id, :name, { prompt: t(".merchant_placeholder"), label: t(".merchant_label"), class: "text-subdued" } %>
<%= form.text_area :notes, label: t(".note_label"), placeholder: t(".note_placeholder"), rows: 5 %>
</div>
</details>
@@ -49,7 +49,7 @@
</div>
<div class="flex justify-end items-center gap-2">
- <%= link_to t(".cancel"), transactions_path, class: "text-sm font-medium text-gray-900 px-3 py-2" %>
+ <%= link_to t(".cancel"), transactions_path, class: "text-sm font-medium text-primary px-3 py-2" %>
<%= tag.button t(".save"),
type: "button",
diff --git a/app/views/account/transactions/index.html.erb b/app/views/account/transactions/index.html.erb
index 7855d1f6..9ae47a15 100644
--- a/app/views/account/transactions/index.html.erb
+++ b/app/views/account/transactions/index.html.erb
@@ -3,9 +3,9 @@
<div class="flex justify-between items-center">
<h3 class="font-medium text-lg"><%= t(".transactions") %></h3>
<%= link_to new_account_transaction_path(account_id: @account),
- class: "flex gap-1 font-medium items-center bg-gray-50 text-gray-900 p-2 rounded-lg",
+ class: "flex gap-1 font-medium items-center bg-gray-50 text-primary p-2 rounded-lg",
data: { turbo_frame: :modal } do %>
- <%= lucide_icon("plus", class: "w-5 h-5 text-gray-900") %>
+ <%= lucide_icon("plus", class: "w-5 h-5 text-primary") %>
<span class="text-sm"><%= t(".new") %></span>
<% end %>
</div>
@@ -16,7 +16,7 @@
</div>
<% if @entries.empty? %>
- <p class="text-gray-500 py-4"><%= t(".no_transactions") %></p>
+ <p class="text-secondary py-4"><%= t(".no_transactions") %></p>
<% else %>
<div class="space-y-6">
<%= entries_by_date(@entries) do |entries, _transfers| %>
diff --git a/app/views/account/transactions/show.html.erb b/app/views/account/transactions/show.html.erb
index 5658bd65..e101e8cf 100644
--- a/app/views/account/transactions/show.html.erb
+++ b/app/views/account/transactions/show.html.erb
@@ -38,7 +38,7 @@
Current.family.categories.alphabetically,
:id, :name,
{ label: t(".category_label"),
- class: "text-gray-400", include_blank: t(".uncategorized") },
+ class: "text-subdued", include_blank: t(".uncategorized") },
"data-auto-submit-form-target": "auto" %>
<% end %>
<% end %>
@@ -70,7 +70,7 @@
:id, :name,
{ include_blank: t(".none"),
label: t(".merchant_label"),
- class: "text-gray-400" },
+ class: "text-subdued" },
"data-auto-submit-form-target": "auto" %>
<%= ef.select :tag_ids,
@@ -105,8 +105,8 @@
data: { controller: "auto-submit-form" } do |f| %>
<div class="flex cursor-pointer items-center gap-4 justify-between">
<div class="text-sm space-y-1">
- <h4 class="text-gray-900">One-time <%= @entry.amount.negative? ? "Income" : "Expense" %></h4>
- <p class="text-gray-500">One-time transactions will be excluded from certain budgeting calculations and reports to help you see what's really important.</p>
+ <h4 class="text-primary">One-time <%= @entry.amount.negative? ? "Income" : "Expense" %></h4>
+ <p class="text-secondary">One-time transactions will be excluded from certain budgeting calculations and reports to help you see what's really important.</p>
</div>
<div class="relative inline-block select-none">
@@ -114,15 +114,15 @@
class: "sr-only peer",
"data-auto-submit-form-target": "auto" %>
<label for="account_entry_excluded"
- class="maybe-switch"></label>
+ class="switch"></label>
</div>
</div>
<% end %>
<div class="flex items-center justify-between gap-4 p-3">
<div class="text-sm space-y-1">
- <h4 class="text-gray-900">Transfer or Debt Payment?</h4>
- <p class="text-gray-500">Transfers and payments are special types of transactions that indicate money movement between 2 accounts.</p>
+ <h4 class="text-primary">Transfer or Debt Payment?</h4>
+ <p class="text-secondary">Transfers and payments are special types of transactions that indicate money movement between 2 accounts.</p>
</div>
<%= link_to new_account_transaction_transfer_match_path(@entry), class: "btn btn--outline flex items-center gap-2", data: { turbo_frame: :modal } do %>
@@ -134,15 +134,15 @@
<!-- Delete Transaction Form -->
<div class="flex items-center justify-between gap-2 p-3">
<div class="text-sm space-y-1">
- <h4 class="text-gray-900"><%= t(".delete_title") %></h4>
- <p class="text-gray-500"><%= t(".delete_subtitle") %></p>
+ <h4 class="text-primary"><%= t(".delete_title") %></h4>
+ <p class="text-secondary"><%= t(".delete_subtitle") %></p>
</div>
<%= button_to t(".delete"),
account_entry_path(@entry),
method: :delete,
class: "rounded-lg px-3 py-2 text-red-500 text-sm
- font-medium border border-alpha-black-200",
+ font-medium border border-secondary",
data: { turbo_confirm: true, turbo_frame: "_top" } %>
</div>
</div>
diff --git a/app/views/account/transfer_matches/_matching_fields.html.erb b/app/views/account/transfer_matches/_matching_fields.html.erb
index cc087123..0c5583bd 100644
--- a/app/views/account/transfer_matches/_matching_fields.html.erb
+++ b/app/views/account/transfer_matches/_matching_fields.html.erb
@@ -2,7 +2,7 @@
<% if candidates.any? %>
<div data-controller="transfer-match" class="space-y-2">
- <p class="text-sm text-gray-500">
+ <p class="text-sm text-secondary">
Select a method for matching your transactions.
</p>
@@ -29,7 +29,7 @@
</div>
</div>
<% else %>
- <p class="text-sm text-gray-500">
+ <p class="text-sm text-secondary">
We couldn't find any transactions to match from your other accounts.
Please select an account and we will create a new inflow transaction for you.
</p>
diff --git a/app/views/account/valuations/_header.html.erb b/app/views/account/valuations/_header.html.erb
index ca224bb7..1f19967a 100644
--- a/app/views/account/valuations/_header.html.erb
+++ b/app/views/account/valuations/_header.html.erb
@@ -1,7 +1,7 @@
<%# locals: (entry:) %>
<%= tag.header class: "mb-4 space-y-1", id: dom_id(entry, :header) do %>
- <span class="text-gray-500 text-sm">
+ <span class="text-secondary text-sm">
<%= t(".balance") %>
</span>
@@ -13,7 +13,7 @@
</h3>
</div>
- <span class="text-sm text-gray-500">
+ <span class="text-sm text-secondary">
<%= I18n.l(entry.date, format: :long) %>
</span>
<% end %>
diff --git a/app/views/account/valuations/_valuation.html.erb b/app/views/account/valuations/_valuation.html.erb
index a98d0ced..f321db74 100644
--- a/app/views/account/valuations/_valuation.html.erb
+++ b/app/views/account/valuations/_valuation.html.erb
@@ -3,11 +3,11 @@
<% color = balance_trend&.trend&.color || "#D444F1" %>
<% icon = balance_trend&.trend&.icon || "plus" %>
-<div class="p-4 grid grid-cols-12 items-center text-gray-900 text-sm font-medium">
+<div class="p-4 grid grid-cols-12 items-center text-primary text-sm font-medium">
<div class="col-span-8 flex items-center gap-4">
<% if selectable %>
<%= check_box_tag dom_id(entry, "selection"),
- class: "maybe-checkbox maybe-checkbox--light",
+ class: "checkbox checkbox--light",
data: { id: entry.id, "bulk-select-target": "row", action: "bulk-select#toggleRowSelection" } %>
<% end %>
@@ -16,7 +16,7 @@
<%= lucide_icon icon, class: "w-4 h-4 shrink-0" %>
<% end %>
- <div class="truncate text-gray-900">
+ <div class="truncate text-primary">
<% if entry.new_record? %>
<%= content_tag :p, entry.display_name %>
<% else %>
@@ -33,11 +33,11 @@
<% if balance_trend&.trend %>
<%= tag.span format_money(balance_trend.trend.value), style: "color: #{balance_trend.trend.color}" %>
<% else %>
- <%= tag.span "--", class: "text-gray-400" %>
+ <%= tag.span "--", class: "text-subdued" %>
<% end %>
</div>
<div class="col-span-2 justify-self-end">
- <%= tag.p format_money(entry.amount_money), class: "font-medium text-sm text-gray-900" %>
+ <%= tag.p format_money(entry.amount_money), class: "font-medium text-sm text-primary" %>
</div>
</div>
diff --git a/app/views/account/valuations/index.html.erb b/app/views/account/valuations/index.html.erb
index 41b7ada8..e962209d 100644
--- a/app/views/account/valuations/index.html.erb
+++ b/app/views/account/valuations/index.html.erb
@@ -4,14 +4,14 @@
<%= tag.h2 t(".valuations"), class: "font-medium text-lg" %>
<%= link_to new_account_valuation_path(@account),
data: { turbo_frame: dom_id(@account.entries.account_valuations.new) },
- class: "flex gap-1 font-medium items-center bg-gray-50 text-gray-900 p-2 rounded-lg" do %>
- <%= lucide_icon("plus", class: "w-5 h-5 text-gray-900") %>
+ class: "flex gap-1 font-medium items-center bg-gray-50 text-primary p-2 rounded-lg" do %>
+ <%= lucide_icon("plus", class: "w-5 h-5 text-primary") %>
<%= tag.span t(".new_entry"), class: "text-sm" %>
<% end %>
</div>
<div class="rounded-xl bg-gray-25 p-1">
- <div class="grid grid-cols-10 items-center uppercase text-xs font-medium text-gray-500 px-4 py-2">
+ <div class="grid grid-cols-10 items-center uppercase text-xs font-medium text-secondary px-4 py-2">
<%= tag.p t(".date"), class: "col-span-5" %>
<%= tag.p t(".value"), class: "col-span-2 justify-self-end" %>
<%= tag.p t(".change"), class: "col-span-2 justify-self-end" %>
@@ -27,7 +27,7 @@
as: :entry,
spacer_template: "account/entries/ruler" %>
<% else %>
- <p class="text-gray-500 text-sm p-4"><%= t(".no_valuations") %></p>
+ <p class="text-secondary text-sm p-4"><%= t(".no_valuations") %></p>
<% end %>
</div>
</div>
diff --git a/app/views/account/valuations/show.html.erb b/app/views/account/valuations/show.html.erb
index 89b40d8b..4deec8a6 100644
--- a/app/views/account/valuations/show.html.erb
+++ b/app/views/account/valuations/show.html.erb
@@ -51,14 +51,14 @@
<!-- Delete Valuation Form -->
<div class="flex items-center justify-between gap-2 p-3">
<div class="text-sm space-y-1">
- <h4 class="text-gray-900"><%= t(".delete_title") %></h4>
- <p class="text-gray-500"><%= t(".delete_subtitle") %></p>
+ <h4 class="text-primary"><%= t(".delete_title") %></h4>
+ <p class="text-secondary"><%= t(".delete_subtitle") %></p>
</div>
<%= button_to t(".delete"),
account_entry_path(entry),
method: :delete,
- class: "rounded-lg px-3 py-2 text-red-500 text-sm font-medium border border-alpha-black-200",
+ class: "rounded-lg px-3 py-2 text-red-500 text-sm font-medium border border-secondary",
data: { turbo_confirm: true, turbo_frame: "_top" } %>
</div>
</div>
diff --git a/app/views/accounts/_account.html.erb b/app/views/accounts/_account.html.erb
index 3fc486b9..a037416a 100644
--- a/app/views/accounts/_account.html.erb
+++ b/app/views/accounts/_account.html.erb
@@ -7,7 +7,7 @@
<div>
<% if account.scheduled_for_deletion? %>
- <p class="text-sm font-medium text-gray-900">
+ <p class="text-sm font-medium text-primary">
<span>
<%= account.name %>
</span>
@@ -16,7 +16,7 @@
</span>
</p>
<% else %>
- <%= link_to account.name, account, class: [(account.is_active ? "text-gray-900" : "text-gray-400"), "text-sm font-medium hover:underline"], data: { turbo_frame: "_top" } %>
+ <%= link_to account.name, account, class: [(account.is_active ? "text-primary" : "text-subdued"), "text-sm font-medium hover:underline"], data: { turbo_frame: "_top" } %>
<% if account.has_issues? %>
<div class="text-sm flex items-center gap-1 text-error">
<%= lucide_icon "alert-octagon", class: "shrink-0 w-4 h-4" %>
@@ -29,12 +29,12 @@
<% unless account.scheduled_for_deletion? %>
<%= link_to edit_account_path(account, return_to: return_to), data: { turbo_frame: :modal }, class: "group-hover/account:flex hidden hover:opacity-80 items-center justify-center" do %>
- <%= lucide_icon "pencil-line", class: "w-4 h-4 text-gray-500" %>
+ <%= lucide_icon "pencil-line", class: "w-4 h-4 text-secondary" %>
<% end %>
<% end %>
</div>
<div class="flex items-center gap-8">
- <p class="text-sm font-medium <%= account.is_active ? "text-gray-900" : "text-gray-400" %>">
+ <p class="text-sm font-medium <%= account.is_active ? "text-primary" : "text-subdued" %>">
<%= format_money account.balance_money %>
</p>
@@ -44,7 +44,7 @@
data: { controller: "auto-submit-form", turbo_frame: "_top" } do |form| %>
<div class="relative inline-block select-none">
<%= form.check_box :is_active, { class: "sr-only peer", data: { "auto-submit-form-target": "auto" } } %>
- <%= form.label :is_active, "&nbsp;".html_safe, class: "maybe-switch" %>
+ <%= form.label :is_active, "&nbsp;".html_safe, class: "switch" %>
</div>
<% end %>
<% end %>
diff --git a/app/views/accounts/_account_list.html.erb b/app/views/accounts/_account_list.html.erb
index 28103fae..dcd88418 100644
--- a/app/views/accounts/_account_list.html.erb
+++ b/app/views/accounts/_account_list.html.erb
@@ -10,9 +10,9 @@
<summary class="flex gap-4 px-3 py-2 items-center w-full rounded-[10px] font-medium
hover:bg-gray-100 cursor-pointer">
<%= lucide_icon("chevron-down",
- class: "hidden group-open:block text-gray-500 w-5 h-5") %>
+ class: "hidden group-open:block text-secondary w-5 h-5") %>
<%= lucide_icon("chevron-right",
- class: "group-open:hidden text-gray-500 w-5 h-5") %>
+ class: "group-open:hidden text-secondary w-5 h-5") %>
<div class="text-left"><%= type.model_name.human %></div>
@@ -36,7 +36,7 @@
<div class="overflow-hidden">
<p class="font-medium truncate"><%= account_value_node.name %></p>
<% if account.subtype %>
- <p class="text-xs text-gray-500"><%= account.subtype&.humanize %></p>
+ <p class="text-xs text-secondary"><%= account.subtype&.humanize %></p>
<% end %>
</div>
<div class="flex flex-col items-end font-medium text-right ml-auto">
@@ -53,7 +53,7 @@
</div>
<% end %>
<% end %>
- <%= link_to new_polymorphic_path(type, step: "method_select"), class: "flex items-center min-h-10 gap-4 px-3 py-2 mb-1 text-gray-500 text-sm font-medium rounded-[10px] hover:bg-gray-100", data: { turbo_frame: "modal" } do %>
+ <%= link_to new_polymorphic_path(type, step: "method_select"), class: "flex items-center min-h-10 gap-4 px-3 py-2 mb-1 text-secondary text-sm font-medium rounded-[10px] hover:bg-gray-100", data: { turbo_frame: "modal" } do %>
<%= lucide_icon("plus", class: "w-5 h-5") %>
<%= t(".new_account", type: type.model_name.human.downcase) %>
<% end %>
diff --git a/app/views/accounts/_chart_loader.html.erb b/app/views/accounts/_chart_loader.html.erb
index 56e244d4..f6a9c852 100644
--- a/app/views/accounts/_chart_loader.html.erb
+++ b/app/views/accounts/_chart_loader.html.erb
@@ -1,5 +1,5 @@
<div class="h-10">
</div>
<div class="h-64 flex items-center justify-center">
- <p class="text-gray-500 animate-pulse text-sm">Loading...</p>
+ <p class="text-secondary animate-pulse text-sm">Loading...</p>
</div>
diff --git a/app/views/accounts/_empty.html.erb b/app/views/accounts/_empty.html.erb
index e938c863..6a1b6c89 100644
--- a/app/views/accounts/_empty.html.erb
+++ b/app/views/accounts/_empty.html.erb
@@ -1,7 +1,7 @@
<div class="flex justify-center items-center h-[800px] text-sm">
<div class="text-center flex flex-col items-center max-w-[300px]">
- <%= tag.p t(".no_accounts"), class: "text-gray-900 mb-1 font-medium" %>
- <%= tag.p t(".empty_message"), class: "text-gray-500 mb-4" %>
+ <%= tag.p t(".no_accounts"), class: "text-primary mb-1 font-medium" %>
+ <%= tag.p t(".empty_message"), class: "text-secondary mb-4" %>
<%= link_to new_account_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %>
<%= lucide_icon("plus", class: "w-5 h-5") %>
diff --git a/app/views/accounts/_summary_card.html.erb b/app/views/accounts/_summary_card.html.erb
index 424a2a2c..384c1c8e 100644
--- a/app/views/accounts/_summary_card.html.erb
+++ b/app/views/accounts/_summary_card.html.erb
@@ -1,8 +1,8 @@
<%# locals: (title:, content:) %>
<div class="rounded-xl bg-white shadow-xs border border-alpha-black-25 p-4">
- <h4 class="text-gray-500 text-sm"><%= title %></h4>
- <p class="text-xl font-medium text-gray-900">
+ <h4 class="text-secondary text-sm"><%= title %></h4>
+ <p class="text-xl font-medium text-primary">
<%= content %>
</p>
</div>
diff --git a/app/views/accounts/chart.html.erb b/app/views/accounts/chart.html.erb
index 329edba2..153924ca 100644
--- a/app/views/accounts/chart.html.erb
+++ b/app/views/accounts/chart.html.erb
@@ -5,7 +5,7 @@
<%= turbo_frame_tag dom_id(@account, :chart_details) do %>
<div class="px-4">
<% if trend.direction.flat? %>
- <%= tag.span t(".no_change"), class: "text-gray-500" %>
+ <%= tag.span t(".no_change"), class: "text-secondary" %>
<% else %>
<%= tag.span "#{trend.value.positive? ? "+" : ""}#{format_money(trend.value)}", style: "color: #{trend.color}" %>
<% unless trend.percent.infinite? %>
@@ -13,7 +13,7 @@
<% end %>
<% end %>
- <%= tag.span period_label(period), class: "text-gray-500" %>
+ <%= tag.span period_label(period), class: "text-secondary" %>
</div>
<div class="h-64">
@@ -25,11 +25,11 @@
data-time-series-chart-data-value="<%= series.to_json %>"></div>
<% elsif series.empty? %>
<div class="w-full h-full flex items-center justify-center">
- <p class="text-gray-500 text-sm">No data available for the selected period.</p>
+ <p class="text-secondary text-sm">No data available for the selected period.</p>
</div>
<% else %>
<div class="w-full h-full flex items-center justify-center">
- <p class="text-gray-500 text-sm animate-pulse">Calculating latest balance data...</p>
+ <p class="text-secondary text-sm animate-pulse">Calculating latest balance data...</p>
</div>
<% end %>
</div>
diff --git a/app/views/accounts/index.html.erb b/app/views/accounts/index.html.erb
index a350e607..f0f39f12 100644
--- a/app/views/accounts/index.html.erb
+++ b/app/views/accounts/index.html.erb
@@ -3,7 +3,7 @@
<% end %>
<div class="space-y-4">
- <header class="flex justify-between items-center text-gray-900 font-medium">
+ <header class="flex justify-between items-center text-primary font-medium">
<h1 class="text-xl"><%= t(".accounts") %></h1>
<div class="flex items-center gap-5">
<div class="flex items-center gap-2">
diff --git a/app/views/accounts/index/_account_groups.erb b/app/views/accounts/index/_account_groups.erb
index 0b26b618..3137e477 100644
--- a/app/views/accounts/index/_account_groups.erb
+++ b/app/views/accounts/index/_account_groups.erb
@@ -2,9 +2,9 @@
<% accounts.group_by(&:accountable_type).sort_by { |group, _| group }.each do |group, accounts| %>
<div class="bg-gray-25 p-1 rounded-xl">
- <div class="flex items-center px-4 py-2 text-xs font-medium text-gray-500">
+ <div class="flex items-center px-4 py-2 text-xs font-medium text-secondary">
<p><%= to_accountable_title(Accountable.from_type(group)) %></p>
- <span class="text-gray-400 mx-2">&middot;</span>
+ <span class="text-subdued mx-2">&middot;</span>
<p><%= accounts.count %></p>
<p class="ml-auto"><%= totals_by_currency(collection: accounts, money_method: :balance_money) %></p>
</div>
diff --git a/app/views/accounts/index/_manual_accounts.html.erb b/app/views/accounts/index/_manual_accounts.html.erb
index 2d93a9eb..3e113b89 100644
--- a/app/views/accounts/index/_manual_accounts.html.erb
+++ b/app/views/accounts/index/_manual_accounts.html.erb
@@ -2,13 +2,13 @@
<details open class="group bg-white p-4 border border-alpha-black-25 shadow-xs rounded-xl">
<summary class="flex items-center gap-2 focus-visible:outline-hidden">
- <%= lucide_icon "chevron-right", class: "group-open:transform group-open:rotate-90 text-gray-500 w-5" %>
+ <%= lucide_icon "chevron-right", class: "group-open:transform group-open:rotate-90 text-secondary w-5" %>
<div class="flex items-center justify-center h-8 w-8 rounded-full bg-black/5">
- <%= lucide_icon("folder-pen", class: "w-5 h-5 text-gray-500") %>
+ <%= lucide_icon("folder-pen", class: "w-5 h-5 text-secondary") %>
</div>
- <span class="mr-auto text-sm font-medium text-gray-900"><%= t(".other_accounts") %></span>
+ <span class="mr-auto text-sm font-medium text-primary"><%= t(".other_accounts") %></span>
</summary>
<div class="space-y-4 mt-4">
diff --git a/app/views/accounts/new/_container.html.erb b/app/views/accounts/new/_container.html.erb
index 2ef85d8a..ca4ce59d 100644
--- a/app/views/accounts/new/_container.html.erb
+++ b/app/views/accounts/new/_container.html.erb
@@ -5,11 +5,11 @@
<div class="border-b border-alpha-black-25 p-4 text-gray-800 flex items-center space-x-3">
<% if back_path %>
<%= link_to back_path, class: "flex w-8 h-8 shrink-0 grow-0 items-center justify-center rounded-lg bg-alpha-black-50 focus:outline-gray-300 focus:outline" do %>
- <%= lucide_icon("arrow-left", class: "text-gray-500 w-5 h-5") %>
+ <%= lucide_icon("arrow-left", class: "text-secondary w-5 h-5") %>
<% end %>
<% end %>
- <span class="text-gray-400"><%= title %></span>
+ <span class="text-subdued"><%= title %></span>
</div>
<div class="p-2">
@@ -19,7 +19,7 @@
<%= yield %>
</div>
- <div class="border-t border-alpha-black-25 p-4 text-gray-500 text-sm flex justify-between">
+ <div class="border-t border-alpha-black-25 p-4 text-secondary text-sm flex justify-between">
<div class="flex space-x-5">
<div class="flex items-center space-x-2">
<span>Select</span>
diff --git a/app/views/accounts/new/_method_selector.html.erb b/app/views/accounts/new/_method_selector.html.erb
index 388f4028..e4115d9e 100644
--- a/app/views/accounts/new/_method_selector.html.erb
+++ b/app/views/accounts/new/_method_selector.html.erb
@@ -4,7 +4,7 @@
<div class="text-sm">
<%= link_to path, class: "flex items-center gap-4 w-full text-center focus:outline-hidden focus:bg-gray-50 border border-transparent focus:border focus:border-gray-200 px-2 hover:bg-gray-50 rounded-lg p-2" do %>
<span class="flex w-8 h-8 shrink-0 grow-0 items-center justify-center rounded-lg bg-alpha-black-50 shadow-[inset_0_0_0_1px_rgba(0,0,0,0.02)]">
- <%= lucide_icon("keyboard", class: "text-gray-500 w-5 h-5") %>
+ <%= lucide_icon("keyboard", class: "text-secondary w-5 h-5") %>
</span>
<%= t("accounts.new.method_selector.manual_entry") %>
<% end %>
@@ -13,7 +13,7 @@
<%# Default US-only Link %>
<button data-controller="plaid" data-action="plaid#open modal#close" data-plaid-region-value="us" data-plaid-link-token-value="<%= us_link_token %>" class="flex items-center gap-4 w-full text-center focus:outline-hidden focus:bg-gray-50 border border-transparent focus:border focus:border-gray-200 px-2 hover:bg-gray-50 rounded-lg p-2">
<span class="flex w-8 h-8 shrink-0 grow-0 items-center justify-center rounded-lg bg-alpha-black-50 shadow-[inset_0_0_0_1px_rgba(0,0,0,0.02)]">
- <%= lucide_icon("link-2", class: "text-gray-500 w-5 h-5") %>
+ <%= lucide_icon("link-2", class: "text-secondary w-5 h-5") %>
</span>
<%= t("accounts.new.method_selector.connected_entry") %>
</button>
@@ -23,7 +23,7 @@
<% if eu_link_token %>
<button data-controller="plaid" data-action="plaid#open modal#close" data-plaid-region-value="eu" data-plaid-link-token-value="<%= eu_link_token %>" class="flex items-center gap-4 w-full text-center focus:outline-hidden focus:bg-gray-50 border border-transparent focus:border focus:border-gray-200 px-2 hover:bg-gray-50 rounded-lg p-2">
<span class="flex w-8 h-8 shrink-0 grow-0 items-center justify-center rounded-lg bg-alpha-black-50 shadow-[inset_0_0_0_1px_rgba(0,0,0,0.02)]">
- <%= lucide_icon("link-2", class: "text-gray-500 w-5 h-5") %>
+ <%= lucide_icon("link-2", class: "text-secondary w-5 h-5") %>
</span>
<%= t("accounts.new.method_selector.connected_entry_eu") %>
</button>
diff --git a/app/views/accounts/show/_activity.html.erb b/app/views/accounts/show/_activity.html.erb
index e47e84fc..eb593e74 100644
--- a/app/views/accounts/show/_activity.html.erb
+++ b/app/views/accounts/show/_activity.html.erb
@@ -12,13 +12,13 @@
</button>
<div data-menu-target="content" class="z-10 hidden bg-white rounded-lg border border-alpha-black-25 shadow-xs p-1">
<%= link_to new_account_valuation_path(account_id: @account.id), data: { turbo_frame: :modal }, class: "block p-2 rounded-lg hover:bg-gray-50 flex items-center gap-2" do %>
- <%= lucide_icon("circle-dollar-sign", class: "text-gray-500 w-5 h-5") %>
+ <%= lucide_icon("circle-dollar-sign", class: "text-secondary w-5 h-5") %>
<%= tag.span t(".new_balance"), class: "text-sm" %>
<% end %>
<% unless @account.crypto? %>
<%= link_to @account.investment? ? new_account_trade_path(account_id: @account.id) : new_account_transaction_path(account_id: @account.id), data: { turbo_frame: :modal }, class: "block p-2 rounded-lg hover:bg-gray-50 flex items-center gap-2" do %>
- <%= lucide_icon("credit-card", class: "text-gray-500 w-5 h-5") %>
+ <%= lucide_icon("credit-card", class: "text-secondary w-5 h-5") %>
<%= tag.span t(".new_transaction"), class: "text-sm" %>
<% end %>
<% end %>
@@ -36,12 +36,12 @@
<div class="flex gap-2 mb-4">
<div class="grow">
<div class="flex items-center px-3 py-2 gap-2 border border-gray-200 rounded-lg focus-within:ring-gray-100 focus-within:border-gray-900">
- <%= lucide_icon("search", class: "w-5 h-5 text-gray-500") %>
+ <%= lucide_icon("search", class: "w-5 h-5 text-secondary") %>
<%= hidden_field_tag :account_id, @account.id %>
<%= form.search_field :search,
placeholder: "Search entries by name",
value: @q[:search],
- class: "form-field__input placeholder:text-sm placeholder:text-gray-500",
+ class: "form-field__input placeholder:text-sm placeholder:text-secondary",
"data-auto-submit-form-target": "auto" %>
</div>
</div>
@@ -50,7 +50,7 @@
</div>
<% if @entries.empty? %>
- <p class="text-gray-500 text-sm p-4"><%= t(".no_entries") %></p>
+ <p class="text-secondary text-sm p-4"><%= t(".no_entries") %></p>
<% else %>
<%= tag.div id: dom_id(@account, "entries_bulk_select"),
data: {
@@ -62,10 +62,10 @@
<%= render "account/entries/selection_bar" %>
</div>
- <div class="grid bg-gray-25 rounded-xl grid-cols-12 items-center uppercase text-xs font-medium text-gray-500 px-5 py-3 mb-4">
+ <div class="grid bg-gray-25 rounded-xl grid-cols-12 items-center uppercase text-xs font-medium text-secondary px-5 py-3 mb-4">
<div class="pl-0.5 col-span-8 flex items-center gap-4">
<%= check_box_tag "selection_entry",
- class: "maybe-checkbox maybe-checkbox--light",
+ class: "checkbox checkbox--light",
data: { action: "bulk-select#togglePageSelection" } %>
<p><%= t(".date") %></p>
</div>
diff --git a/app/views/accounts/show/_chart.html.erb b/app/views/accounts/show/_chart.html.erb
index 168182fd..c1f06dd6 100644
--- a/app/views/accounts/show/_chart.html.erb
+++ b/app/views/accounts/show/_chart.html.erb
@@ -7,11 +7,11 @@
<div class="flex justify-between px-4 pt-4 mb-2">
<div class="space-y-2">
<div class="flex items-center gap-1">
- <%= tag.p title || default_value_title, class: "text-sm font-medium text-gray-500" %>
+ <%= tag.p title || default_value_title, class: "text-sm font-medium text-secondary" %>
<%= tooltip %>
</div>
- <%= tag.p format_money(account.balance_money), class: "text-gray-900 text-3xl font-medium" %>
+ <%= tag.p format_money(account.balance_money), class: "text-primary text-3xl font-medium" %>
</div>
<%= form_with url: request.path, method: :get, data: { controller: "auto-submit-form" } do |form| %>
diff --git a/app/views/accounts/show/_header.html.erb b/app/views/accounts/show/_header.html.erb
index a6e925e9..8dbaf273 100644
--- a/app/views/accounts/show/_header.html.erb
+++ b/app/views/accounts/show/_header.html.erb
@@ -13,7 +13,7 @@
<div class="truncate">
<h2 class="font-medium text-xl truncate"><%= title || account.name %></h2>
<% if subtitle.present? %>
- <p class="text-sm text-gray-500"><%= subtitle %></p>
+ <p class="text-sm text-secondary"><%= subtitle %></p>
<% end %>
</div>
</div>
@@ -23,12 +23,12 @@
<% if account.plaid_account_id.present? %>
<% if Rails.env.development? %>
<%= button_to sync_plaid_item_path(account.plaid_account.plaid_item), disabled: account.syncing?, data: { turbo: false }, class: "flex items-center gap-2", title: "Sync Account" do %>
- <%= lucide_icon "refresh-cw", class: "w-4 h-4 text-gray-500 hover:text-gray-400" %>
+ <%= lucide_icon "refresh-cw", class: "w-4 h-4 text-secondary hover:text-subdued" %>
<% end %>
<% end %>
<% else %>
<%= button_to sync_account_path(account), disabled: account.syncing?, data: { turbo: false }, class: "flex items-center gap-2", title: "Sync Account" do %>
- <%= lucide_icon "refresh-cw", class: "w-4 h-4 text-gray-500 hover:text-gray-400" %>
+ <%= lucide_icon "refresh-cw", class: "w-4 h-4 text-secondary hover:text-subdued" %>
<% end %>
<% end %>
diff --git a/app/views/accounts/show/_loading.html.erb b/app/views/accounts/show/_loading.html.erb
index a4254988..26167412 100644
--- a/app/views/accounts/show/_loading.html.erb
+++ b/app/views/accounts/show/_loading.html.erb
@@ -1,3 +1,3 @@
<div class="p-5">
- <p class="text-gray-500 animate-pulse">Loading account...</p>
+ <p class="text-secondary animate-pulse">Loading account...</p>
</div>
diff --git a/app/views/accounts/show/_menu.html.erb b/app/views/accounts/show/_menu.html.erb
index 5d9efa44..f41723a6 100644
--- a/app/views/accounts/show/_menu.html.erb
+++ b/app/views/accounts/show/_menu.html.erb
@@ -1,20 +1,20 @@
<%# locals: (account:) %>
<%= contextual_menu do %>
- <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
+ <div class="w-48 p-1 text-sm leading-6 text-primary bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
<% if account.plaid_account_id.present? %>
<%= link_to accounts_path,
data: { turbo_frame: :_top },
- class: "block w-full py-2 px-3 space-x-2 text-gray-900 hover:bg-gray-50 flex items-center rounded-lg" do %>
- <%= lucide_icon "pencil-line", class: "w-5 h-5 text-gray-500" %>
+ class: "block w-full py-2 px-3 space-x-2 text-primary hover:bg-gray-50 flex items-center rounded-lg" do %>
+ <%= lucide_icon "pencil-line", class: "w-5 h-5 text-secondary" %>
<span><%= t(".manage") %></span>
<% end %>
<% else %>
<%= link_to edit_account_path(account),
data: { turbo_frame: :modal },
- class: "block w-full py-2 px-3 space-x-2 text-gray-900 hover:bg-gray-50 flex items-center rounded-lg" do %>
- <%= lucide_icon "pencil-line", class: "w-5 h-5 text-gray-500" %>
+ class: "block w-full py-2 px-3 space-x-2 text-primary hover:bg-gray-50 flex items-center rounded-lg" do %>
+ <%= lucide_icon "pencil-line", class: "w-5 h-5 text-secondary" %>
<span><%= t(".edit") %></span>
<% end %>
@@ -22,8 +22,8 @@
<% unless account.crypto? %>
<%= link_to new_import_path,
data: { turbo_frame: :modal },
- class: "block w-full py-2 px-3 space-x-2 text-gray-900 hover:bg-gray-50 flex items-center rounded-lg" do %>
- <%= lucide_icon "download", class: "w-5 h-5 text-gray-500" %>
+ class: "block w-full py-2 px-3 space-x-2 text-primary hover:bg-gray-50 flex items-center rounded-lg" do %>
+ <%= lucide_icon "download", class: "w-5 h-5 text-secondary" %>
<span><%= t(".import") %></span>
<% end %>
diff --git a/app/views/accounts/show/_tabs.html.erb b/app/views/accounts/show/_tabs.html.erb
index 6c69d803..2a0e2b2f 100644
--- a/app/views/accounts/show/_tabs.html.erb
+++ b/app/views/accounts/show/_tabs.html.erb
@@ -2,7 +2,7 @@
<% selected_tab = tabs.find { |tab| tab[:key] == params[:tab] } || tabs.first %>
-<div class="flex gap-2 text-sm text-gray-900 font-medium mb-4">
+<div class="flex gap-2 text-sm text-primary font-medium mb-4">
<% tabs.each do |tab| %>
<%= render "accounts/show/tab", account: account, key: tab[:key], is_selected: selected_tab[:key] == tab[:key] %>
<% end %>
diff --git a/app/views/accounts/summary.html.erb b/app/views/accounts/summary.html.erb
index 0894ee34..098b67c6 100644
--- a/app/views/accounts/summary.html.erb
+++ b/app/views/accounts/summary.html.erb
@@ -4,7 +4,7 @@
<%= render "accounts/summary/header" %>
- <div class="bg-white rounded-xl shadow-xs border border-alpha-black-100 flex divide-x divide-gray-200">
+ <div class="bg-white rounded-xl shadow-xs border border-tertiary flex divide-x divide-gray-200">
<div class="w-1/2 p-4 flex items-stretch justify-between">
<div class="space-y-2 grow">
<%= render partial: "shared/value_heading", locals: {
@@ -41,10 +41,10 @@
</div>
<div class="p-4 bg-white rounded-xl shadow-xs border border-alpha-black-25 space-y-4">
<div class="flex justify-between items-center mb-5">
- <h2 class="text-lg font-medium text-gray-900">Assets</h2>
+ <h2 class="text-lg font-medium text-primary">Assets</h2>
<div class="flex items-center gap-2">
<%= link_to new_account_path, class: "btn btn--secondary flex items-center gap-1", data: { turbo_frame: "modal" } do %>
- <%= lucide_icon("plus", class: "w-5 h-5 text-gray-500") %>
+ <%= lucide_icon("plus", class: "w-5 h-5 text-secondary") %>
<p><%= t(".new") %></p>
<% end %>
<%= form_with url: summary_accounts_path, method: :get, data: { controller: "auto-submit-form" } do |form| %>
@@ -58,18 +58,18 @@
<%= render partial: "pages/account_percentages_table", locals: { account_groups: @account_groups[:assets].children } %>
<% else %>
<div class="py-20 flex flex-col items-center">
- <%= lucide_icon "blocks", class: "w-6 h-6 shrink-0 text-gray-500" %>
- <p class="text-gray-900 text-sm font-medium mb-1 mt-4"><%= t(".no_assets") %></p>
- <p class="text-gray-500 text-sm max-w-xs text-center"><%= t(".no_assets_description") %></p>
+ <%= lucide_icon "blocks", class: "w-6 h-6 shrink-0 text-secondary" %>
+ <p class="text-primary text-sm font-medium mb-1 mt-4"><%= t(".no_assets") %></p>
+ <p class="text-secondary text-sm max-w-xs text-center"><%= t(".no_assets_description") %></p>
</div>
<% end %>
</div>
<div class="p-4 bg-white rounded-xl shadow-xs border border-alpha-black-25 space-y-4">
<div class="flex justify-between items-center mb-5">
- <h2 class="text-lg font-medium text-gray-900">Liabilities</h2>
+ <h2 class="text-lg font-medium text-primary">Liabilities</h2>
<div class="flex items-center gap-2">
<%= link_to new_account_path, class: "btn btn--secondary flex items-center gap-1", data: { turbo_frame: "modal" } do %>
- <%= lucide_icon("plus", class: "w-5 h-5 text-gray-500") %>
+ <%= lucide_icon("plus", class: "w-5 h-5 text-secondary") %>
<p><%= t(".new") %></p>
<% end %>
<%= form_with url: summary_accounts_path, method: :get, data: { controller: "auto-submit-form" } do |form| %>
@@ -83,9 +83,9 @@
<%= render partial: "pages/account_percentages_table", locals: { account_groups: @account_groups[:liabilities].children } %>
<% else %>
<div class="py-20 flex flex-col items-center">
- <%= lucide_icon "scale", class: "w-6 h-6 shrink-0 text-gray-500" %>
- <p class="text-gray-900 text-sm font-medium mb-1 mt-4"><%= t(".no_liabilities") %></p>
- <p class="text-gray-500 text-sm max-w-xs text-center"><%= t(".no_liabilities_description") %></p>
+ <%= lucide_icon "scale", class: "w-6 h-6 shrink-0 text-secondary" %>
+ <p class="text-primary text-sm font-medium mb-1 mt-4"><%= t(".no_liabilities") %></p>
+ <p class="text-secondary text-sm max-w-xs text-center"><%= t(".no_liabilities_description") %></p>
</div>
<% end %>
</div>
diff --git a/app/views/accounts/summary/_header.html.erb b/app/views/accounts/summary/_header.html.erb
index f8c8eb3e..1cf47f07 100644
--- a/app/views/accounts/summary/_header.html.erb
+++ b/app/views/accounts/summary/_header.html.erb
@@ -1,12 +1,12 @@
-<header class="flex justify-between items-center text-gray-900 font-medium">
+<header class="flex justify-between items-center text-primary font-medium">
<h1 class="text-xl"><%= t(".accounts") %></h1>
<div class="flex items-center gap-2">
<%= contextual_menu do %>
- <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
+ <div class="w-48 p-1 text-sm leading-6 text-primary bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
<%= link_to accounts_path(return_to: summary_accounts_path),
- class: "block w-full py-2 px-3 space-x-2 text-gray-900 hover:bg-gray-50 flex items-center rounded-lg font-normal" do %>
- <%= lucide_icon "settings", class: "w-5 h-5 text-gray-500" %>
+ class: "block w-full py-2 px-3 space-x-2 text-primary hover:bg-gray-50 flex items-center rounded-lg font-normal" do %>
+ <%= lucide_icon "settings", class: "w-5 h-5 text-secondary" %>
<span class="text-black"><%= t(".manage") %></span>
<% end %>
</div>
diff --git a/app/views/application/_pagination.html.erb b/app/views/application/_pagination.html.erb
index 10b27327..04685600 100644
--- a/app/views/application/_pagination.html.erb
+++ b/app/views/application/_pagination.html.erb
@@ -6,8 +6,8 @@
<% if pagy.prev %>
<%= link_to pagy_url_for(pagy, pagy.prev),
data: { turbo_frame: :_top },
- class: "inline-flex items-center p-2 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700" do %>
- <%= lucide_icon("chevron-left", class: "w-5 h-5 text-gray-500") %>
+ class: "inline-flex items-center p-2 text-sm font-medium text-secondary hover:border-gray-300 hover:text-gray-700" do %>
+ <%= lucide_icon("chevron-left", class: "w-5 h-5 text-secondary") %>
<% end %>
<% else %>
<div class="inline-flex items-center p-2 text-sm font-medium hover:border-gray-300">
@@ -20,17 +20,17 @@
<% if series_item.is_a?(Integer) %>
<%= link_to pagy_url_for(pagy, series_item),
data: { turbo_frame: :_top },
- class: "rounded-md px-2 py-1 inline-flex items-center text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700" do %>
+ class: "rounded-md px-2 py-1 inline-flex items-center text-sm font-medium text-secondary hover:border-gray-300 hover:text-gray-700" do %>
<%= series_item %>
<% end %>
<% elsif series_item.is_a?(String) %>
<%= link_to pagy_url_for(pagy, series_item),
data: { turbo_frame: :_top },
- class: "rounded-md px-2 py-1 bg-white border border-alpha-black-25 shadow-xs inline-flex items-center text-sm font-medium text-gray-900" do %>
+ class: "rounded-md px-2 py-1 bg-white border border-alpha-black-25 shadow-xs inline-flex items-center text-sm font-medium text-primary" do %>
<%= series_item %>
<% end %>
<% elsif series_item == :gap %>
- <span class="inline-flex items-center px-2 py-1 text-sm font-medium text-gray-500">...</span>
+ <span class="inline-flex items-center px-2 py-1 text-sm font-medium text-secondary">...</span>
<% end %>
<% end %>
</div>
@@ -38,8 +38,8 @@
<% if pagy.next %>
<%= link_to pagy_url_for(pagy, pagy.next),
data: { turbo_frame: :_top },
- class: "inline-flex items-center p-2 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700" do %>
- <%= lucide_icon("chevron-right", class: "w-5 h-5 text-gray-500") %>
+ class: "inline-flex items-center p-2 text-sm font-medium text-secondary hover:border-gray-300 hover:text-gray-700" do %>
+ <%= lucide_icon("chevron-right", class: "w-5 h-5 text-secondary") %>
<% end %>
<% else %>
<div class="inline-flex items-center p-2 text-sm font-medium hover:border-gray-300">
@@ -52,6 +52,6 @@
<%= select_tag :per_page,
options_for_select(["10", "20", "30", "50"], pagy.limit),
data: { controller: "selectable-link" },
- class: "py-1.5 pr-8 text-sm text-gray-900 font-medium border border-gray-200 rounded-lg focus:border-gray-900 focus:ring-gray-900 focus-visible:ring-gray-900" %>
+ class: "py-1.5 pr-8 text-sm text-primary font-medium border border-gray-200 rounded-lg focus:border-gray-900 focus:ring-gray-900 focus-visible:ring-gray-900" %>
</div>
</nav>
diff --git a/app/views/budget_categories/_allocation_progress.erb b/app/views/budget_categories/_allocation_progress.erb
index 8355a978..8302a57d 100644
--- a/app/views/budget_categories/_allocation_progress.erb
+++ b/app/views/budget_categories/_allocation_progress.erb
@@ -9,17 +9,17 @@
<% end %>
<% if budget.available_to_allocate.negative? %>
- <p class="text-gray-900 text-sm">&gt; 100% set</p>
+ <p class="text-primary text-sm">&gt; 100% set</p>
<% else %>
- <p class="text-gray-500 text-sm">
+ <p class="text-secondary text-sm">
<%= number_to_percentage(budget.allocated_percent, precision: 0) %> set
</p>
<% end %>
<p class="ml-auto text-sm space-x-1">
- <span class="<%= budget.available_to_allocate.negative? ? "text-red-500" : "text-gray-900" %>"><%= format_money(budget.allocated_spending_money) %></span>
- <span class="text-gray-500"> / </span>
- <span class="text-gray-500"><%= format_money(budget.budgeted_spending_money) %></span>
+ <span class="<%= budget.available_to_allocate.negative? ? "text-red-500" : "text-primary" %>"><%= format_money(budget.allocated_spending_money) %></span>
+ <span class="text-secondary"> / </span>
+ <span class="text-secondary"><%= format_money(budget.budgeted_spending_money) %></span>
</p>
</div>
@@ -33,12 +33,12 @@
<div class="text-sm">
<% if budget.available_to_allocate.negative? %>
- <p class="text-gray-500">
+ <p class="text-secondary">
Budget exceeded by <span class="text-red-500"><%= format_money(budget.available_to_allocate_money.abs) %></span>
</p>
<% else %>
- <span class="text-gray-900"><%= format_money(budget.available_to_allocate_money) %></span>
- <span class="text-gray-500">left to allocate</span>
+ <span class="text-primary"><%= format_money(budget.available_to_allocate_money) %></span>
+ <span class="text-secondary">left to allocate</span>
<% end %>
</div>
</div>
diff --git a/app/views/budget_categories/_budget_category.html.erb b/app/views/budget_categories/_budget_category.html.erb
index 27dc80d1..888d6daf 100644
--- a/app/views/budget_categories/_budget_category.html.erb
+++ b/app/views/budget_categories/_budget_category.html.erb
@@ -18,30 +18,30 @@
<% end %>
<div>
- <p class="text-sm font-medium text-gray-900"><%= budget_category.category.name %></p>
+ <p class="text-sm font-medium text-primary"><%= budget_category.category.name %></p>
<% if budget_category.initialized? %>
<% if budget_category.available_to_spend.negative? %>
<p class="text-sm font-medium text-red-500"><%= format_money(budget_category.available_to_spend_money.abs) %> over</p>
<% elsif budget_category.available_to_spend.zero? %>
- <p class="text-sm font-medium <%= budget_category.budgeted_spending.positive? ? "text-orange-500" : "text-gray-500" %>">
+ <p class="text-sm font-medium <%= budget_category.budgeted_spending.positive? ? "text-orange-500" : "text-secondary" %>">
<%= format_money(budget_category.available_to_spend_money) %> left
</p>
<% else %>
- <p class="text-sm text-gray-500 font-medium"><%= format_money(budget_category.available_to_spend_money) %> left</p>
+ <p class="text-sm text-secondary font-medium"><%= format_money(budget_category.available_to_spend_money) %> left</p>
<% end %>
<% else %>
- <p class="text-sm text-gray-500 font-medium">
+ <p class="text-sm text-secondary font-medium">
<%= format_money(budget_category.category.avg_monthly_total_money, precision: 0) %> avg
</p>
<% end %>
</div>
<div class="ml-auto text-right">
- <p class="text-sm font-medium text-gray-900"><%= format_money(budget_category.actual_spending_money) %></p>
+ <p class="text-sm font-medium text-primary"><%= format_money(budget_category.actual_spending_money) %></p>
<% if budget_category.initialized? %>
- <p class="text-sm text-gray-500">from <%= format_money(budget_category.budgeted_spending_money) %></p>
+ <p class="text-sm text-secondary">from <%= format_money(budget_category.budgeted_spending_money) %></p>
<% end %>
</div>
<% end %>
diff --git a/app/views/budget_categories/_budget_category_form.html.erb b/app/views/budget_categories/_budget_category_form.html.erb
index 08fd70e0..ee67345d 100644
--- a/app/views/budget_categories/_budget_category_form.html.erb
+++ b/app/views/budget_categories/_budget_category_form.html.erb
@@ -6,16 +6,16 @@
<div class="w-1 h-3 rounded-xl mt-1" style="background-color: <%= budget_category.category.color %>"></div>
<div class="text-sm mr-3">
- <p class="text-gray-900 font-medium mb-0.5"><%= budget_category.category.name %></p>
+ <p class="text-primary font-medium mb-0.5"><%= budget_category.category.name %></p>
- <p class="text-gray-500"><%= format_money(budget_category.category.avg_monthly_total_money, precision: 0) %>/m average</p>
+ <p class="text-secondary"><%= format_money(budget_category.category.avg_monthly_total_money, precision: 0) %>/m average</p>
</div>
<div class="ml-auto">
<%= form_with model: [budget_category.budget, budget_category], data: { controller: "auto-submit-form preserve-focus" } do |f| %>
<div class="form-field w-[120px]">
<div class="flex items-center">
- <span class="text-gray-500 text-sm mr-2"><%= currency.symbol %></span>
+ <span class="text-secondary text-sm mr-2"><%= currency.symbol %></span>
<%= f.number_field :budgeted_spending,
class: "form-field__input text-right [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none",
placeholder: "0",
diff --git a/app/views/budget_categories/_confirm_button.html.erb b/app/views/budget_categories/_confirm_button.html.erb
index 53c52533..6b473633 100644
--- a/app/views/budget_categories/_confirm_button.html.erb
+++ b/app/views/budget_categories/_confirm_button.html.erb
@@ -4,7 +4,7 @@
budget_path(budget),
class: "block btn btn--primary w-full text-center" %>
<% else %>
- <span class="block btn btn--secondary w-full text-center text-gray-400 cursor-not-allowed">
+ <span class="block btn btn--secondary w-full text-center text-subdued cursor-not-allowed">
Confirm
</span>
<% end %>
diff --git a/app/views/budget_categories/_no_categories.html.erb b/app/views/budget_categories/_no_categories.html.erb
index aaa0a865..8755d0b8 100644
--- a/app/views/budget_categories/_no_categories.html.erb
+++ b/app/views/budget_categories/_no_categories.html.erb
@@ -1,7 +1,7 @@
<div class="flex justify-center items-center">
<div class="text-center flex flex-col items-center max-w-[500px]">
- <h2 class="text-lg text-gray-900 font-medium">Oops!</h2>
- <p class="text-gray-500 text-sm max-w-sm mx-auto mb-4">
+ <h2 class="text-lg text-primary font-medium">Oops!</h2>
+ <p class="text-secondary text-sm max-w-sm mx-auto mb-4">
You have not created or assigned any expense categories to your transactions yet.
</p>
diff --git a/app/views/budget_categories/_uncategorized_budget_category_form.html.erb b/app/views/budget_categories/_uncategorized_budget_category_form.html.erb
index f26a9f80..70c887e3 100644
--- a/app/views/budget_categories/_uncategorized_budget_category_form.html.erb
+++ b/app/views/budget_categories/_uncategorized_budget_category_form.html.erb
@@ -6,14 +6,14 @@
<div class="w-1 h-3 rounded-xl mt-1" style="background-color: <%= budget_category.category.color %>"></div>
<div class="text-sm mr-3">
- <p class="text-gray-900 font-medium mb-0.5"><%= budget_category.category.name %></p>
- <p class="text-gray-500"><%= format_money(Money.new(budget_category.category.avg_monthly_total, budget_category.category.family.currency), precision: 0) %>/m average</p>
+ <p class="text-primary font-medium mb-0.5"><%= budget_category.category.name %></p>
+ <p class="text-secondary"><%= format_money(Money.new(budget_category.category.avg_monthly_total, budget_category.category.family.currency), precision: 0) %>/m average</p>
</div>
<div class="ml-auto">
<div class="form-field w-[120px]">
<div class="flex items-center">
- <span class="text-gray-400 text-sm mr-2">$</span>
+ <span class="text-subdued text-sm mr-2">$</span>
<%= text_field_tag :uncategorized, budget_category.budgeted_spending_money, autocomplete: "off", class: "form-field__input text-right [appearance:textfield] [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none", disabled: true %>
</div>
</div>
diff --git a/app/views/budget_categories/index.html.erb b/app/views/budget_categories/index.html.erb
index 1ae9ea97..db03a5a5 100644
--- a/app/views/budget_categories/index.html.erb
+++ b/app/views/budget_categories/index.html.erb
@@ -8,8 +8,8 @@
<div>
<div class="space-y-6">
<div class="text-center space-y-2">
- <h1 class="text-3xl text-gray-900 font-medium">Edit your category budgets</h1>
- <p class="text-gray-500 text-sm max-w-md mx-auto">
+ <h1 class="text-3xl text-primary font-medium">Edit your category budgets</h1>
+ <p class="text-secondary text-sm max-w-md mx-auto">
Adjust category budgets to set spending limits. Unallocated funds will be automatically assigned as uncategorized.
</p>
</div>
@@ -31,7 +31,7 @@
<div class="space-y-4">
<% group.budget_subcategories.each do |budget_subcategory| %>
<div class="w-full flex items-center gap-4">
- <div class="ml-4 flex items-center justify-center text-gray-400">
+ <div class="ml-4 flex items-center justify-center text-subdued">
<%= lucide_icon "corner-down-right", class: "w-5 h-5 shrink-0" %>
</div>
@@ -45,7 +45,7 @@
<%= render "budget_categories/uncategorized_budget_category_form", budget: @budget %>
</div>
- <%= render "budget_categories/confirm_button", budget: @budget %>
+ <%= render "budget_categories/confirm_button", budget: @budget %>
</div>
<% end %>
</div>
diff --git a/app/views/budget_categories/show.html.erb b/app/views/budget_categories/show.html.erb
index e7abe251..b7f891f8 100644
--- a/app/views/budget_categories/show.html.erb
+++ b/app/views/budget_categories/show.html.erb
@@ -2,14 +2,14 @@
<div class="space-y-4">
<header class="flex justify-between">
<div>
- <p class="text-sm text-gray-500">Category</p>
- <h3 class="text-2xl font-medium text-gray-900">
+ <p class="text-sm text-secondary">Category</p>
+ <h3 class="text-2xl font-medium text-primary">
<%= @budget_category.category.name %>
</h3>
<% if @budget_category.budget.initialized? %>
- <p class="text-sm text-gray-500">
- <span class="text-gray-900">
+ <p class="text-sm text-secondary">
+ <span class="text-primary">
<%= format_money(@budget_category.actual_spending_money) %>
</span>
<span>/</span>
@@ -28,26 +28,26 @@
<details class="group space-y-2" open>
<summary class="flex list-none items-center justify-between rounded-xl px-3 py-2
- text-xs font-medium uppercase text-gray-500 bg-gray-25 focus-visible:outline-hidden">
+ text-xs font-medium uppercase text-secondary bg-gray-25 focus-visible:outline-hidden">
<h4>Overview</h4>
<%= lucide_icon "chevron-down",
- class: "group-open:transform group-open:rotate-180 text-gray-500 w-5" %>
+ class: "group-open:transform group-open:rotate-180 text-secondary w-5" %>
</summary>
<div class="pb-4">
<dl class="space-y-3 px-3 py-2">
<div class="flex items-center justify-between text-sm">
- <dt class="text-gray-500">
+ <dt class="text-secondary">
<%= @budget_category.budget.start_date.strftime("%b %Y") %> spending
</dt>
- <dd class="text-gray-900 font-medium">
+ <dd class="text-primary font-medium">
<%= format_money @budget_category.actual_spending_money %>
</dd>
</div>
<% if @budget_category.budget.initialized? %>
<div class="flex items-center justify-between text-sm">
- <dt class="text-gray-500">Status</dt>
+ <dt class="text-secondary">Status</dt>
<% if @budget_category.available_to_spend.negative? %>
<dd class="text-red-500 flex items-center gap-1 text-red-500 font-medium">
<%= lucide_icon "alert-circle", class: "shrink-0 w-4 h-4 text-red-500" %>
@@ -61,7 +61,7 @@
<span>left</span>
</dd>
<% else %>
- <dd class="text-gray-900 flex items-center gap-1 text-green-500 font-medium">
+ <dd class="text-primary flex items-center gap-1 text-green-500 font-medium">
<%= lucide_icon "check-circle-2", class: "shrink-0 w-4 h-4 text-green-500" %>
<%= format_money @budget_category.available_to_spend_money %>
<span>left</span>
@@ -70,23 +70,23 @@
</div>
<div class="flex items-center justify-between text-sm">
- <dt class="text-gray-500">Budgeted</dt>
- <dd class="text-gray-900 font-medium">
+ <dt class="text-secondary">Budgeted</dt>
+ <dd class="text-primary font-medium">
<%= format_money @budget_category.budgeted_spending_money %>
</dd>
</div>
<% end %>
<div class="flex items-center justify-between text-sm">
- <dt class="text-gray-500">Monthly average spending</dt>
- <dd class="text-gray-900 font-medium">
+ <dt class="text-secondary">Monthly average spending</dt>
+ <dd class="text-primary font-medium">
<%= format_money @budget_category.category.avg_monthly_total_money, precision: 0 %>
</dd>
</div>
<div class="flex items-center justify-between text-sm">
- <dt class="text-gray-500">Monthly median spending</dt>
- <dd class="text-gray-900 font-medium">
+ <dt class="text-secondary">Monthly median spending</dt>
+ <dd class="text-primary font-medium">
<%= format_money @budget_category.category.median_monthly_total_money, precision: 0 %>
</dd>
</div>
@@ -96,10 +96,10 @@
<details class="group space-y-2" open>
<summary class="flex list-none items-center justify-between rounded-xl px-3 py-2
- text-xs font-medium uppercase text-gray-500 bg-gray-25 focus-visible:outline-hidden">
+ text-xs font-medium uppercase text-secondary bg-gray-25 focus-visible:outline-hidden">
<h4>Recent Transactions</h4>
<%= lucide_icon "chevron-down",
- class: "group-open:transform group-open:rotate-180 text-gray-500 w-5" %>
+ class: "group-open:transform group-open:rotate-180 text-secondary w-5" %>
</summary>
<div class="space-y-2">
@@ -117,12 +117,12 @@
<div class="flex justify-between w-full">
<div>
- <p class="text-gray-500 text-xs uppercase">
+ <p class="text-secondary text-xs uppercase">
<%= entry.date.strftime("%b %d") %>
</p>
- <p class="text-gray-900"><%= entry.name %></p>
+ <p class="text-primary"><%= entry.name %></p>
</div>
- <p class="text-gray-900 font-medium">
+ <p class="text-primary font-medium">
<%= format_money entry.amount_money %>
</p>
</div>
@@ -139,7 +139,7 @@
data: { turbo_frame: :_top },
class: "block text-center btn btn--outline w-full" %>
<% else %>
- <p class="text-gray-500 text-sm mb-4">
+ <p class="text-secondary text-sm mb-4">
No transactions found for this budget period.
</p>
<% end %>
diff --git a/app/views/budgets/_actuals_summary.html.erb b/app/views/budgets/_actuals_summary.html.erb
index 1ecebbae..67cac86b 100644
--- a/app/views/budgets/_actuals_summary.html.erb
+++ b/app/views/budgets/_actuals_summary.html.erb
@@ -2,11 +2,11 @@
<div>
<div class="p-4 border-b border-gray-100">
- <h3 class="text-sm text-gray-500 mb-2">Income</h3>
+ <h3 class="text-sm text-secondary mb-2">Income</h3>
<% income_totals = budget.income_categories_with_totals %>
<% income_categories = income_totals.category_totals.reject { |ct| ct.amount_money.zero? }.sort_by { |ct| ct.percentage }.reverse %>
- <span class="inline-block mb-2 text-xl font-medium text-gray-900">
+ <span class="inline-block mb-2 text-xl font-medium text-primary">
<%= format_money(income_totals.total_money) %>
</span>
@@ -22,8 +22,8 @@
<% income_categories.each do |item| %>
<div class="flex items-center gap-1.5">
<div class="w-2.5 h-2.5 rounded-full shrink-0" style="background-color: <%= item.category.color %>"></div>
- <span class="text-gray-500"><%= item.category.name %></span>
- <span class="text-gray-900"><%= number_to_percentage(item.percentage, precision: 0) %></span>
+ <span class="text-secondary"><%= item.category.name %></span>
+ <span class="text-primary"><%= number_to_percentage(item.percentage, precision: 0) %></span>
</div>
<% end %>
</div>
@@ -32,12 +32,12 @@
</div>
<div class="p-4">
- <h3 class="text-sm text-gray-500 mb-2">Expenses</h3>
+ <h3 class="text-sm text-secondary mb-2">Expenses</h3>
<% expense_totals = budget.expense_categories_with_totals %>
<% expense_categories = expense_totals.category_totals.reject { |ct| ct.amount_money.zero? || ct.category.subcategory? }.sort_by { |ct| ct.percentage }.reverse %>
- <span class="inline-block mb-2 text-xl font-medium text-gray-900"><%= format_money(expense_totals.total_money) %></span>
+ <span class="inline-block mb-2 text-xl font-medium text-primary"><%= format_money(expense_totals.total_money) %></span>
<% if expense_categories.any? %>
<div>
@@ -51,8 +51,8 @@
<% expense_categories.each do |item| %>
<div class="flex items-center gap-1.5">
<div class="w-2.5 h-2.5 rounded-full shrink-0" style="background-color: <%= item.category.color %>"></div>
- <span class="text-gray-500"><%= item.category.name %></span>
- <span class="text-gray-900"><%= number_to_percentage(item.percentage, precision: 0) %></span>
+ <span class="text-secondary"><%= item.category.name %></span>
+ <span class="text-primary"><%= number_to_percentage(item.percentage, precision: 0) %></span>
</div>
<% end %>
</div>
diff --git a/app/views/budgets/_budget_categories.html.erb b/app/views/budgets/_budget_categories.html.erb
index 86cc3012..122c8348 100644
--- a/app/views/budgets/_budget_categories.html.erb
+++ b/app/views/budgets/_budget_categories.html.erb
@@ -1,9 +1,9 @@
<%# locals: (budget:) %>
<div>
- <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-gray-500 uppercase">
+ <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-secondary uppercase">
<p>Categories</p>
- <span class="text-gray-400">&middot;</span>
+ <span class="text-subdued">&middot;</span>
<p><%= budget.budget_categories.count %></p>
<p class="ml-auto">Amount</p>
@@ -24,7 +24,7 @@
<div>
<% group.budget_subcategories.each do |budget_subcategory| %>
<div class="w-full flex items-center -mt-4">
- <div class="ml-8 flex items-center justify-center text-gray-400">
+ <div class="ml-8 flex items-center justify-center text-subdued">
<%= lucide_icon "corner-down-right", class: "w-5 h-5 shrink-0" %>
</div>
diff --git a/app/views/budgets/_budget_donut.html.erb b/app/views/budgets/_budget_donut.html.erb
index 035389f7..8ec57be3 100644
--- a/app/views/budgets/_budget_donut.html.erb
+++ b/app/views/budgets/_budget_donut.html.erb
@@ -8,18 +8,18 @@
<span>Spent</span>
</div>
- <div class="text-3xl font-medium <%= budget.available_to_spend.negative? ? "text-red-500" : "text-gray-900" %>">
+ <div class="text-3xl font-medium <%= budget.available_to_spend.negative? ? "text-red-500" : "text-primary" %>">
<%= format_money(budget.actual_spending_money) %>
</div>
<%= link_to edit_budget_path(budget), class: "btn btn--secondary flex items-center gap-1 mt-2" do %>
- <span class="text-gray-900 font-medium">
+ <span class="text-primary font-medium">
of <%= format_money(budget.budgeted_spending_money) %>
</span>
- <%= lucide_icon "pencil", class: "w-4 h-4 text-gray-500 hover:text-gray-600" %>
+ <%= lucide_icon "pencil", class: "w-4 h-4 text-secondary hover:text-gray-600" %>
<% end %>
<% else %>
- <div class="text-gray-400 text-3xl mb-2">
+ <div class="text-subdued text-3xl mb-2">
<span><%= format_money Money.new(0, budget.currency || budget.family.currency) %></span>
</div>
<%= link_to edit_budget_path(budget), class: "flex items-center gap-2 btn btn--primary" do %>
@@ -34,26 +34,26 @@
<div class="flex flex-col gap-2 items-center">
<div class="flex items-center gap-3">
<div class="w-1 h-3 rounded-xl" style="background-color: <%= bc.category.color %>"></div>
- <p class="text-sm text-gray-500"><%= bc.category.name %></p>
+ <p class="text-sm text-secondary"><%= bc.category.name %></p>
</div>
- <p class="text-3xl font-medium <%= bc.available_to_spend.negative? ? "text-red-500" : "text-gray-900" %>">
+ <p class="text-3xl font-medium <%= bc.available_to_spend.negative? ? "text-red-500" : "text-primary" %>">
<%= format_money(bc.actual_spending_money) %>
</p>
<%= link_to budget_budget_categories_path(budget), class: "btn btn--secondary flex items-center gap-1" do %>
<span>of <%= format_money(bc.budgeted_spending_money, precision: 0) %></span>
- <%= lucide_icon "pencil", class: "w-4 h-4 text-gray-500 shrink-0" %>
+ <%= lucide_icon "pencil", class: "w-4 h-4 text-secondary shrink-0" %>
<% end %>
</div>
</div>
<% end %>
<div id="segment_unused" class="hidden">
- <p class="text-sm text-gray-500 text-center mb-2">Unused</p>
+ <p class="text-sm text-secondary text-center mb-2">Unused</p>
- <p class="text-3xl font-medium text-gray-900">
+ <p class="text-3xl font-medium text-primary">
<%= format_money(budget.available_to_spend_money) %>
</p>
</div>
diff --git a/app/views/budgets/_budget_header.html.erb b/app/views/budgets/_budget_header.html.erb
index 5dd041dc..333c59b4 100644
--- a/app/views/budgets/_budget_header.html.erb
+++ b/app/views/budgets/_budget_header.html.erb
@@ -7,7 +7,7 @@
<%= lucide_icon "chevron-left" %>
<% end %>
<% else %>
- <%= lucide_icon "chevron-left", class: "text-gray-400" %>
+ <%= lucide_icon "chevron-left", class: "text-subdued" %>
<% end %>
<% if @next_budget %>
@@ -15,14 +15,14 @@
<%= lucide_icon "chevron-right" %>
<% end %>
<% else %>
- <%= lucide_icon "chevron-right", class: "text-gray-400" %>
+ <%= lucide_icon "chevron-right", class: "text-subdued" %>
<% end %>
</div>
<div data-controller="menu" data-menu-placement-value="bottom-start">
<%= tag.button data: { menu_target: "button" }, class: "flex items-center gap-1 hover:bg-gray-50 rounded-md p-2" do %>
- <span class="text-gray-900 font-medium"><%= @budget.name %></span>
- <%= lucide_icon "chevron-down", class: "w-5 h-5 shrink-0 text-gray-500" %>
+ <span class="text-primary font-medium"><%= @budget.name %></span>
+ <%= lucide_icon "chevron-down", class: "w-5 h-5 shrink-0 text-secondary" %>
<% end %>
<div data-menu-target="content" class="hidden z-10">
@@ -32,7 +32,7 @@
<div class="ml-auto">
<% if @budget.current? %>
- <span class="border border-alpha-black-200 text-gray-900 text-sm font-medium px-3 py-2 rounded-lg">Today</span>
+ <span class="border border-secondary text-primary text-sm font-medium px-3 py-2 rounded-lg">Today</span>
<% else %>
<%= link_to "Today", budget_path(@latest_budget), class: "btn btn--outline" %>
<% end %>
diff --git a/app/views/budgets/_budget_nav.html.erb b/app/views/budgets/_budget_nav.html.erb
index 2d336f4a..ec85965e 100644
--- a/app/views/budgets/_budget_nav.html.erb
+++ b/app/views/budgets/_budget_nav.html.erb
@@ -11,9 +11,9 @@
<% is_current = request.path == step[:path] %>
<% text_class = if is_current
- "text-gray-900"
+ "text-primary"
else
- step[:is_complete] ? "text-green-600" : "text-gray-500"
+ step[:is_complete] ? "text-green-600" : "text-secondary"
end %>
<% step_class = if is_current
"bg-gray-900 text-white"
diff --git a/app/views/budgets/_budgeted_summary.html.erb b/app/views/budgets/_budgeted_summary.html.erb
index 742d950c..ce55db5d 100644
--- a/app/views/budgets/_budgeted_summary.html.erb
+++ b/app/views/budgets/_budgeted_summary.html.erb
@@ -2,9 +2,9 @@
<div>
<div class="p-4 border-b border-gray-100">
- <h3 class="text-sm text-gray-500 mb-2">Expected income</h3>
+ <h3 class="text-sm text-secondary mb-2">Expected income</h3>
- <span class="inline-block mb-2 text-xl font-medium text-gray-900">
+ <span class="inline-block mb-2 text-xl font-medium text-primary">
<%= format_money(budget.expected_income_money) %>
</span>
@@ -19,12 +19,12 @@
<% end %>
</div>
<div class="flex justify-between text-sm">
- <p class="text-gray-500"><%= format_money(budget.actual_income_money) %> earned</p>
+ <p class="text-secondary"><%= format_money(budget.actual_income_money) %> earned</p>
<p class="font-medium">
<% if budget.remaining_expected_income.negative? %>
<span class="text-green-500"><%= format_money(budget.remaining_expected_income_money.abs) %> over</span>
<% else %>
- <span class="text-gray-900"><%= format_money(budget.remaining_expected_income_money) %> left</span>
+ <span class="text-primary"><%= format_money(budget.remaining_expected_income_money) %> left</span>
<% end %>
</p>
</div>
@@ -32,9 +32,9 @@
</div>
<div class="p-4">
- <h3 class="text-sm text-gray-500 mb-2">Budgeted</h3>
+ <h3 class="text-sm text-secondary mb-2">Budgeted</h3>
- <span class="inline-block mb-2 text-xl font-medium text-gray-900">
+ <span class="inline-block mb-2 text-xl font-medium text-primary">
<%= format_money(budget.budgeted_spending_money) %>
</span>
@@ -49,12 +49,12 @@
<% end %>
</div>
<div class="flex justify-between text-sm">
- <p class="text-gray-500"><%= format_money(budget.actual_spending_money) %> spent</p>
+ <p class="text-secondary"><%= format_money(budget.actual_spending_money) %> spent</p>
<p class="font-medium">
<% if budget.available_to_spend.negative? %>
<span class="text-red-500"><%= format_money(budget.available_to_spend_money.abs) %> over</span>
<% else %>
- <span class="text-gray-900"><%= format_money(budget.available_to_spend_money) %> left</span>
+ <span class="text-primary"><%= format_money(budget.available_to_spend_money) %> left</span>
<% end %>
</p>
</div>
diff --git a/app/views/budgets/_over_allocation_warning.html.erb b/app/views/budgets/_over_allocation_warning.html.erb
index 9999038c..95381811 100644
--- a/app/views/budgets/_over_allocation_warning.html.erb
+++ b/app/views/budgets/_over_allocation_warning.html.erb
@@ -2,12 +2,12 @@
<div class="flex flex-col gap-4 items-center justify-center h-full">
<%= lucide_icon "alert-triangle", class: "w-6 h-6 text-red-500" %>
- <p class="text-gray-500 text-sm text-center">You have over-allocated your budget. Please fix your allocations.</p>
+ <p class="text-secondary text-sm text-center">You have over-allocated your budget. Please fix your allocations.</p>
<%= link_to budget_budget_categories_path(budget), class: "btn btn--secondary flex items-center gap-1" do %>
- <span class="text-gray-900 font-medium">
+ <span class="text-primary font-medium">
Fix allocations
</span>
- <%= lucide_icon "pencil", class: "w-4 h-4 text-gray-500 hover:text-gray-600" %>
+ <%= lucide_icon "pencil", class: "w-4 h-4 text-secondary hover:text-gray-600" %>
<% end %>
</div>
diff --git a/app/views/budgets/_picker.html.erb b/app/views/budgets/_picker.html.erb
index 53ad6c76..16bc50e5 100644
--- a/app/views/budgets/_picker.html.erb
+++ b/app/views/budgets/_picker.html.erb
@@ -5,25 +5,25 @@
<div class="flex items-center gap-2 justify-between">
<% if year > family.oldest_entry_date.year %>
<%= link_to picker_budgets_path(year: year - 1), data: { turbo_frame: "budget_picker" }, class: "p-2 flex items-center justify-center hover:bg-alpha-black-25 rounded-md" do %>
- <%= lucide_icon "chevron-left", class: "w-5 h-5 shrink-0 text-gray-500" %>
+ <%= lucide_icon "chevron-left", class: "w-5 h-5 shrink-0 text-secondary" %>
<% end %>
<% else %>
<span class="p-2 flex items-center justify-center text-gray-300 rounded-md">
- <%= lucide_icon "chevron-left", class: "w-5 h-5 shrink-0 text-gray-400" %>
+ <%= lucide_icon "chevron-left", class: "w-5 h-5 shrink-0 text-subdued" %>
</span>
<% end %>
- <span class="w-40 text-center px-3 py-2 border border-alpha-black-100 rounded-md" data-budget-picker-target="year">
+ <span class="w-40 text-center px-3 py-2 border border-tertiary rounded-md" data-budget-picker-target="year">
<%= year %>
</span>
<% if year < Date.current.year %>
<%= link_to picker_budgets_path(year: year + 1), data: { turbo_frame: "budget_picker" }, class: "p-2 flex items-center justify-center hover:bg-alpha-black-25 rounded-md" do %>
- <%= lucide_icon "chevron-right", class: "w-5 h-5 shrink-0 text-gray-500" %>
+ <%= lucide_icon "chevron-right", class: "w-5 h-5 shrink-0 text-secondary" %>
<% end %>
<% else %>
<span class="p-2 flex items-center justify-center text-gray-300 rounded-md">
- <%= lucide_icon "chevron-right", class: "w-5 h-5 shrink-0 text-gray-400" %>
+ <%= lucide_icon "chevron-right", class: "w-5 h-5 shrink-0 text-subdued" %>
</span>
<% end %>
</div>
@@ -35,13 +35,13 @@
<% budget = family.budgets.for_date(start_date) %>
<% if budget %>
- <%= link_to month_name, budget_path(budget), data: { turbo_frame: "_top" }, class: "block px-3 py-2 text-sm text-gray-900 hover:bg-gray-100 rounded-md" %>
+ <%= link_to month_name, budget_path(budget), data: { turbo_frame: "_top" }, class: "block px-3 py-2 text-sm text-primary hover:bg-gray-100 rounded-md" %>
<% elsif start_date >= family.oldest_entry_date.beginning_of_month && start_date <= Date.current %>
- <%= button_to budgets_path(budget: { start_date: start_date }), data: { turbo_frame: "_top" }, class: "block w-full px-3 py-2 text-gray-900 hover:bg-gray-100 rounded-md" do %>
+ <%= button_to budgets_path(budget: { start_date: start_date }), data: { turbo_frame: "_top" }, class: "block w-full px-3 py-2 text-primary hover:bg-gray-100 rounded-md" do %>
<%= month_name %>
<% end %>
<% else %>
- <span class="px-3 py-2 text-gray-400 rounded-md"><%= month_name %></span>
+ <span class="px-3 py-2 text-subdued rounded-md"><%= month_name %></span>
<% end %>
<% end %>
</div>
diff --git a/app/views/budgets/edit.html.erb b/app/views/budgets/edit.html.erb
index f3a9854e..3728dc8c 100644
--- a/app/views/budgets/edit.html.erb
+++ b/app/views/budgets/edit.html.erb
@@ -8,8 +8,8 @@
<div>
<div class="space-y-4">
<div class="text-center space-y-2">
- <h1 class="text-3xl text-gray-900 font-medium">Setup your budget</h1>
- <p class="text-gray-500 text-sm max-w-sm mx-auto">
+ <h1 class="text-3xl text-primary font-medium">Setup your budget</h1>
+ <p class="text-secondary text-sm max-w-sm mx-auto">
Enter your monthly earnings and planned spending below to setup your budget.
</p>
</div>
@@ -20,11 +20,11 @@
<%= f.money_field :expected_income, label: "Expected income", required: true, disable_currency: true %>
<% if @budget.estimated_income && @budget.estimated_spending %>
- <div class="border border-alpha-black-100 rounded-lg p-3 flex">
- <%= lucide_icon "sparkles", class: "w-5 h-5 text-gray-500 shrink-0" %>
+ <div class="border border-tertiary rounded-lg p-3 flex">
+ <%= lucide_icon "sparkles", class: "w-5 h-5 text-secondary shrink-0" %>
<div class="ml-2 space-y-1 text-sm">
- <h4 class="text-gray-900">Autosuggest income & spending budget</h4>
- <p class="text-gray-500">
+ <h4 class="text-primary">Autosuggest income & spending budget</h4>
+ <p class="text-secondary">
This will be based on transaction history. AI can make mistakes, verify before continuing.
</p>
</div>
@@ -35,7 +35,7 @@
budget_form_income_param: { key: "budget_expected_income", value: sprintf("%.2f", @budget.estimated_income) },
budget_form_spending_param: { key: "budget_budgeted_spending", value: sprintf("%.2f", @budget.estimated_spending) }
} %>
- <label for="auto_fill" class="maybe-switch"></label>
+ <label for="auto_fill" class="switch"></label>
</div>
</div>
<% end %>
diff --git a/app/views/budgets/show.html.erb b/app/views/budgets/show.html.erb
index 0f63602b..2c98f805 100644
--- a/app/views/budgets/show.html.erb
+++ b/app/views/budgets/show.html.erb
@@ -25,16 +25,16 @@
budget_path(@budget, tab: "budgeted"),
class: class_names(
base_classes,
- "bg-white shadow-xs text-gray-900": selected_tab == "budgeted",
- "text-gray-500": selected_tab != "budgeted"
+ "bg-white shadow-xs text-primary": selected_tab == "budgeted",
+ "text-secondary": selected_tab != "budgeted"
) %>
<%= link_to "Actual",
budget_path(@budget, tab: "actuals"),
class: class_names(
base_classes,
- "bg-white shadow-xs text-gray-900": selected_tab == "actuals",
- "text-gray-500": selected_tab != "actuals"
+ "bg-white shadow-xs text-primary": selected_tab == "actuals",
+ "text-secondary": selected_tab != "actuals"
) %>
</div>
diff --git a/app/views/categories/_category.html.erb b/app/views/categories/_category.html.erb
index f74113a9..187979a0 100644
--- a/app/views/categories/_category.html.erb
+++ b/app/views/categories/_category.html.erb
@@ -3,14 +3,14 @@
<div id="<%= dom_id(category) %>" class="flex justify-between items-center px-4 pb-4 <%= "pt-4" unless category.subcategory? %> <%= "pb-4" unless category.subcategories.any? %> bg-white">
<div class="flex w-full items-center gap-2.5">
<% if category.subcategory? %>
- <%= lucide_icon "corner-down-right", class: "shrink-0 w-5 h-5 text-gray-400 ml-2" %>
+ <%= lucide_icon "corner-down-right", class: "shrink-0 w-5 h-5 text-subdued ml-2" %>
<% end %>
<%= render partial: "categories/badge", locals: { category: category } %>
</div>
<div class="justify-self-end">
<%= contextual_menu do %>
- <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
+ <div class="w-48 p-1 text-sm leading-6 text-primary bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
<%= contextual_menu_modal_action_item t(".edit"), edit_category_path(category) %>
<% if category.transactions.any? %>
diff --git a/app/views/categories/_category_list_group.html.erb b/app/views/categories/_category_list_group.html.erb
index 671e10dd..882f0710 100644
--- a/app/views/categories/_category_list_group.html.erb
+++ b/app/views/categories/_category_list_group.html.erb
@@ -1,9 +1,9 @@
<%# locals: (title:, categories:) %>
<div class="rounded-xl bg-gray-25 space-y-1 p-1">
- <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-gray-500 uppercase">
+ <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-secondary uppercase">
<p><%= title %></p>
- <span class="text-gray-400">&middot;</span>
+ <span class="text-subdued">&middot;</span>
<p><%= categories.count %></p>
</div>
diff --git a/app/views/categories/_menu.html.erb b/app/views/categories/_menu.html.erb
index 5a4627b3..ff098cb0 100644
--- a/app/views/categories/_menu.html.erb
+++ b/app/views/categories/_menu.html.erb
@@ -5,10 +5,10 @@
<%= render partial: "categories/badge", locals: { category: transaction.category } %>
</button>
<div data-menu-target="content" class="absolute z-10 hidden w-screen mt-2 max-w-min cursor-default">
- <div class="w-80 text-sm font-semibold leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
+ <div class="w-80 text-sm font-semibold leading-6 text-primary bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
<%= turbo_frame_tag "category_dropdown", src: category_dropdown_path(category_id: transaction.category_id, transaction_id: transaction.id), loading: :lazy do %>
<div class="p-6 flex items-center justify-center">
- <p class="text-sm text-gray-500 animate-pulse"><%= t(".loading") %></p>
+ <p class="text-sm text-secondary animate-pulse"><%= t(".loading") %></p>
</div>
<% end %>
</div>
diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb
index 64e6acb9..d440e633 100644
--- a/app/views/categories/index.html.erb
+++ b/app/views/categories/index.html.erb
@@ -4,7 +4,7 @@
<section class="space-y-4">
<header class="flex items-center justify-between">
- <h1 class="text-gray-900 text-xl font-medium"><%= t(".categories") %></h1>
+ <h1 class="text-primary text-xl font-medium"><%= t(".categories") %></h1>
<%= link_to new_category_path, class: "btn btn--primary flex items-center gap-1 justify-center", data: { turbo_frame: :modal } do %>
<%= lucide_icon "plus", class: "w-5 h-5" %>
@@ -26,7 +26,7 @@
<% else %>
<div class="flex justify-center items-center py-20">
<div class="text-center flex flex-col items-center max-w-[500px]">
- <p class="text-sm text-gray-500 mb-4"><%= t(".empty") %></p>
+ <p class="text-sm text-secondary mb-4"><%= t(".empty") %></p>
<div class="flex items-center gap-2">
<%= button_to t(".bootstrap"), bootstrap_categories_path, class: "btn btn--primary" %>
diff --git a/app/views/category/dropdowns/_row.html.erb b/app/views/category/dropdowns/_row.html.erb
index 45879b7c..d6b552f5 100644
--- a/app/views/category/dropdowns/_row.html.erb
+++ b/app/views/category/dropdowns/_row.html.erb
@@ -13,20 +13,20 @@
class: "flex w-full items-center gap-1.5 cursor-pointer" do %>
<span class="w-5 h-5">
- <%= lucide_icon("check", class: "w-5 h-5 text-gray-500") if is_selected %>
+ <%= lucide_icon("check", class: "w-5 h-5 text-secondary") if is_selected %>
</span>
<% if category.subcategory? %>
- <%= lucide_icon "corner-down-right", class: "shrink-0 w-5 h-5 text-gray-400" %>
+ <%= lucide_icon "corner-down-right", class: "shrink-0 w-5 h-5 text-subdued" %>
<% end %>
<%= render partial: "categories/badge", locals: { category: category } %>
<% end %>
<%= contextual_menu do %>
- <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
+ <div class="w-48 p-1 text-sm leading-6 text-primary bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
<%= link_to edit_category_path(category),
- class: "block w-full py-2 px-3 space-x-2 text-gray-900 hover:bg-gray-50 flex items-center rounded-lg",
+ class: "block w-full py-2 px-3 space-x-2 text-primary hover:bg-gray-50 flex items-center rounded-lg",
data: { turbo_frame: :modal } do %>
- <%= lucide_icon "pencil-line", class: "w-5 h-5 text-gray-500" %>
+ <%= lucide_icon "pencil-line", class: "w-5 h-5 text-secondary" %>
<span><%= t(".edit") %></span>
<% end %>
diff --git a/app/views/category/dropdowns/show.html.erb b/app/views/category/dropdowns/show.html.erb
index 4a0047cb..722fab82 100644
--- a/app/views/category/dropdowns/show.html.erb
+++ b/app/views/category/dropdowns/show.html.erb
@@ -2,12 +2,12 @@
<div class="flex flex-col relative" data-controller="list-filter">
<div class="grow p-1.5">
<div class="relative flex items-center bg-white border border-gray-200 rounded-lg">
- <input placeholder="<%= t(".search_placeholder") %>" autocomplete="nope" type="search" class="placeholder:text-sm placeholder:text-gray-500 font-normal h-10 relative pl-10 w-full border-none rounded-lg" data-list-filter-target="input" data-action="list-filter#filter">
- <%= lucide_icon("search", class: "w-5 h-5 text-gray-500 ml-2 absolute inset-0 transform top-1/2 -translate-y-1/2") %>
+ <input placeholder="<%= t(".search_placeholder") %>" autocomplete="nope" type="search" class="placeholder:text-sm placeholder:text-secondary font-normal h-10 relative pl-10 w-full border-none rounded-lg" data-list-filter-target="input" data-action="list-filter#filter">
+ <%= lucide_icon("search", class: "w-5 h-5 text-secondary ml-2 absolute inset-0 transform top-1/2 -translate-y-1/2") %>
</div>
</div>
<div data-list-filter-target="list" class="flex flex-col gap-0.5 p-1.5 mt-0.5 mr-2 max-h-64 overflow-y-scroll scrollbar">
- <div class="pb-2 pl-4 mr-2 text-gray-500 hidden" data-list-filter-target="emptyMessage">
+ <div class="pb-2 pl-4 mr-2 text-secondary hidden" data-list-filter-target="emptyMessage">
<%= t(".no_categories") %>
</div>
<% if @categories.any? %>
@@ -21,7 +21,7 @@
<% else %>
<div class="flex justify-center items-center py-12">
<div class="text-center flex flex-col items-center max-w-[500px]">
- <p class="text-sm text-gray-500 font-normal mb-4"><%= t(".empty") %></p>
+ <p class="text-sm text-secondary font-normal mb-4"><%= t(".empty") %></p>
<%= button_to t(".bootstrap"), bootstrap_categories_path, class: "btn btn--outline", data: { turbo_frame: :_top } %>
</div>
</div>
@@ -34,7 +34,7 @@
method: :patch,
data: { turbo_frame: dom_id(@transaction.entry) },
params: { account_entry: { entryable_type: "Account::Transaction", entryable_attributes: { id: @transaction.id, category_id: nil } } },
- class: "flex text-sm font-medium items-center gap-2 text-gray-500 w-full rounded-lg p-2 hover:bg-gray-100" do %>
+ class: "flex text-sm font-medium items-center gap-2 text-secondary w-full rounded-lg p-2 hover:bg-gray-100" do %>
<%= lucide_icon "minus", class: "w-5 h-5" %>
<%= t(".clear") %>
@@ -43,7 +43,7 @@
<% unless @transaction.transfer? %>
<%= link_to new_account_transaction_transfer_match_path(@transaction.entry),
- class: "flex text-sm font-medium items-center gap-2 text-gray-500 w-full rounded-lg p-2 hover:bg-gray-100",
+ class: "flex text-sm font-medium items-center gap-2 text-secondary w-full rounded-lg p-2 hover:bg-gray-100",
data: { turbo_frame: "modal" } do %>
<%= lucide_icon "refresh-cw", class: "w-5 h-5" %>
@@ -51,7 +51,7 @@
<% end %>
<% end %>
- <div class="flex text-sm font-medium items-center gap-2 text-gray-500 w-full rounded-lg p-2">
+ <div class="flex text-sm font-medium items-center gap-2 text-secondary w-full rounded-lg p-2">
<div class="flex items-center gap-2">
<%= form_with url: account_transaction_path(@transaction.entry),
method: :patch,
@@ -59,7 +59,7 @@
<%= f.hidden_field "account_entry[excluded]", value: [email protected] %>
<%= f.check_box "account_entry[excluded]",
checked: @transaction.entry.excluded,
- class: "maybe-checkbox maybe-checkbox--light",
+ class: "checkbox checkbox--light",
data: { auto_submit_form_target: "auto", autosubmit_trigger_event: "change" } %>
<% end %>
</div>
diff --git a/app/views/import/cleans/show.html.erb b/app/views/import/cleans/show.html.erb
index df6b8834..3325ce5b 100644
--- a/app/views/import/cleans/show.html.erb
+++ b/app/views/import/cleans/show.html.erb
@@ -6,12 +6,12 @@
<div class="space-y-4 mx-auto max-w-5xl">
<div class="text-center space-y-2 max-w-[400px] mx-auto mb-4">
- <h2 class="text-3xl text-gray-900 font-medium"><%= t(".title") %></h2>
- <p class="text-gray-500 text-sm"><%= t(".description") %></p>
+ <h2 class="text-3xl text-primary font-medium"><%= t(".title") %></h2>
+ <p class="text-secondary text-sm"><%= t(".description") %></p>
</div>
<% if @import.cleaned? %>
- <div class="bg-white border border-alpha-black-100 rounded-lg p-3 flex items-center justify-between">
+ <div class="bg-white border border-tertiary rounded-lg p-3 flex items-center justify-between">
<div class="flex items-center gap-2">
<%= lucide_icon "check-circle", class: "w-4 h-4 text-green-500" %>
<p class="text-green-500">Your data has been cleaned</p>
@@ -20,14 +20,14 @@
<%= link_to "Next step", import_confirm_path(@import), class: "btn btn--primary" %>
</div>
<% else %>
- <div class="bg-white border border-alpha-black-100 rounded-lg p-3 flex items-center justify-between">
+ <div class="bg-white border border-tertiary rounded-lg p-3 flex items-center justify-between">
<div class="flex items-center gap-2">
<%= lucide_icon "alert-triangle", class: "w-4 h-4 text-red-500" %>
<p class="text-red-500 text-sm"><%= t(".errors_notice") %></p>
</div>
<div class="flex justify-center">
- <div class="bg-gray-50 rounded-lg inline-flex p-1 space-x-2 text-sm text-gray-900 font-medium">
+ <div class="bg-gray-50 rounded-lg inline-flex p-1 space-x-2 text-sm text-primary font-medium">
<%= link_to "All rows", import_clean_path(@import, per_page: params[:per_page], view: "all"), class: "p-2 rounded-lg #{params[:view] != 'errors' ? 'bg-white' : ''}" %>
<%= link_to "Error rows", import_clean_path(@import, per_page: params[:per_page], view: "errors"), class: "p-2 rounded-lg #{params[:view] == 'errors' ? 'bg-white' : ''}" %>
</div>
@@ -37,13 +37,13 @@
<div class="pb-12">
<div class="bg-gray-25 rounded-xl p-1 mb-6">
- <div style="grid-template-columns: repeat(<%= @import.column_keys.count %>, 1fr)" class="grid items-center uppercase text-xs font-medium text-gray-500 py-3">
+ <div style="grid-template-columns: repeat(<%= @import.column_keys.count %>, 1fr)" class="grid items-center uppercase text-xs font-medium text-secondary py-3">
<% @import.column_keys.each do |key| %>
<div class="px-5"><%= import_col_label(key) %></div>
<% end %>
</div>
- <div class="bg-white border border-alpha-black-200 rounded-xl shadow-xs divide-y divide-alpha-black-200">
+ <div class="bg-white border border-secondary rounded-xl shadow-xs divide-y divide-alpha-black-200">
<% @rows.each do |row| %>
<%= render "import/rows/form", row: row %>
<% end %>
@@ -52,7 +52,7 @@
</div>
<div class="fixed bottom-0 left-1/2 -translate-x-1/2 w-full p-12">
- <div class="border border-alpha-black-100 rounded-lg p-3 max-w-2xl mx-auto bg-white shadow-xs">
+ <div class="border border-tertiary rounded-lg p-3 max-w-2xl mx-auto bg-white shadow-xs">
<%= render "application/pagination", pagy: @pagy %>
</div>
</div>
diff --git a/app/views/import/configurations/_mint_import.html.erb b/app/views/import/configurations/_mint_import.html.erb
index 6e07168a..1aabce75 100644
--- a/app/views/import/configurations/_mint_import.html.erb
+++ b/app/views/import/configurations/_mint_import.html.erb
@@ -1,8 +1,8 @@
<%# locals: (import:) %>
-<div class="flex items-center justify-between border border-alpha-black-200 rounded-lg bg-green-500/5 p-5 gap-4">
+<div class="flex items-center justify-between border border-secondary rounded-lg bg-green-500/5 p-5 gap-4">
<%= lucide_icon("check-circle", class: "w-5 h-5 shrink-0 text-green-500") %>
- <p class="text-sm text-gray-900 italic">We have pre-configured your Mint import for you. Please proceed to the next step.</p>
+ <p class="text-sm text-primary italic">We have pre-configured your Mint import for you. Please proceed to the next step.</p>
</div>
<%= styled_form_with model: @import, url: import_configuration_path(@import), scope: :import, method: :patch, class: "space-y-2" do |form| %>
diff --git a/app/views/import/configurations/show.html.erb b/app/views/import/configurations/show.html.erb
index c99bfebd..a807c97e 100644
--- a/app/views/import/configurations/show.html.erb
+++ b/app/views/import/configurations/show.html.erb
@@ -7,8 +7,8 @@
<div>
<div class="space-y-4">
<div class="text-center space-y-2">
- <h1 class="text-3xl text-gray-900 font-medium"><%= t(".title") %></h1>
- <p class="text-gray-500 text-sm"><%= t(".description") %></p>
+ <h1 class="text-3xl text-primary font-medium"><%= t(".title") %></h1>
+ <p class="text-secondary text-sm"><%= t(".description") %></p>
</div>
<div class="mx-auto max-w-lg">
diff --git a/app/views/import/confirms/_mappings.html.erb b/app/views/import/confirms/_mappings.html.erb
index 8e37172c..8883f9f2 100644
--- a/app/views/import/confirms/_mappings.html.erb
+++ b/app/views/import/confirms/_mappings.html.erb
@@ -5,13 +5,13 @@
<% if mapping_class == Import::AccountMapping %>
<% if import.requires_account? %>
- <div class="flex items-center justify-between p-4 mb-4 gap-4 text-gray-500 bg-red-100 border border-red-200 rounded-lg w-[650px]">
+ <div class="flex items-center justify-between p-4 mb-4 gap-4 text-secondary bg-red-100 border border-red-200 rounded-lg w-[650px]">
<%= tag.p t(".no_accounts"), class: "text-sm" %>
<%= link_to t(".create_account"), new_account_path(return_to: import_confirm_path(import)), class: "btn btn--primary whitespace-nowrap", data: { turbo_frame: :modal } %>
</div>
<% elsif import.has_unassigned_account? %>
- <div class="flex items-center justify-between p-4 mb-4 gap-4 text-gray-500 bg-yellow-100 border border-yellow-200 rounded-lg w-[650px]">
+ <div class="flex items-center justify-between p-4 mb-4 gap-4 text-secondary bg-yellow-100 border border-yellow-200 rounded-lg w-[650px]">
<%= tag.p t(".unassigned_account"), class: "text-sm" %>
<%= link_to t(".create_account"), new_account_path(return_to: import_confirm_path(import)), class: "btn btn--primary whitespace-nowrap", data: { turbo_frame: :modal } %>
@@ -21,7 +21,7 @@
<div class="space-y-4">
<div class="bg-gray-25 rounded-xl p-1 space-y-1 w-[650px]">
- <div class="grid grid-cols-3 gap-2 text-xs font-medium text-gray-500 uppercase px-5 py-3">
+ <div class="grid grid-cols-3 gap-2 text-xs font-medium text-secondary uppercase px-5 py-3">
<p><%= t(".csv_mapping_label", mapping: mapping_label(mapping_class)) %></p>
<p><%= t(".maybe_mapping_label", mapping: mapping_label(mapping_class)) %></p>
<p class="justify-self-end"><%= t(".rows_label") %></p>
diff --git a/app/views/import/confirms/show.html.erb b/app/views/import/confirms/show.html.erb
index 291e7409..d9fa481d 100644
--- a/app/views/import/confirms/show.html.erb
+++ b/app/views/import/confirms/show.html.erb
@@ -19,10 +19,10 @@
</div>
<div class="text-center space-y-2">
- <h1 class="text-3xl text-gray-900 font-medium">
+ <h1 class="text-3xl text-primary font-medium">
<%= t(".#{step_mapping_class.name.demodulize.underscore}_title", import_type: @import.type.underscore.humanize) %>
</h1>
- <p class="text-gray-500 text-sm">
+ <p class="text-secondary text-sm">
<%= t(".#{step_mapping_class.name.demodulize.underscore}_description", import_type: @import.type.underscore.humanize) %>
</p>
</div>
diff --git a/app/views/import/uploads/show.html.erb b/app/views/import/uploads/show.html.erb
index d6e65db7..2f126a1c 100644
--- a/app/views/import/uploads/show.html.erb
+++ b/app/views/import/uploads/show.html.erb
@@ -7,13 +7,13 @@
<div class="space-y-12">
<div class="space-y-4 mx-auto max-w-md">
<div class="text-center space-y-2">
- <h1 class="text-3xl text-gray-900 font-medium"><%= t(".title") %></h1>
- <p class="text-gray-500 text-sm"><%= t(".description") %></p>
+ <h1 class="text-3xl text-primary font-medium"><%= t(".title") %></h1>
+ <p class="text-secondary text-sm"><%= t(".description") %></p>
</div>
<div data-controller="tabs" data-tabs-active-class="bg-white" data-tabs-default-tab-value="csv-paste-tab">
<div class="flex justify-center mb-4">
- <div class="bg-gray-50 rounded-lg inline-flex p-1 space-x-2 text-sm text-gray-900 font-medium">
+ <div class="bg-gray-50 rounded-lg inline-flex p-1 space-x-2 text-sm text-primary font-medium">
<button type="button" data-id="csv-paste-tab" class="p-2 rounded-lg" data-tabs-target="btn" data-action="click->tabs#select">Copy & Paste</button>
<button type="button" data-id="csv-upload-tab" class="p-2 rounded-lg" data-tabs-target="btn" data-action="click->tabs#select">Upload CSV</button>
</div>
@@ -50,7 +50,7 @@
</div>
<div class="bg-alpha-black-25 rounded-xl p-1 mt-5 mx-auto max-w-7xl">
- <div class="text-gray-500 p-2 mb-2">
+ <div class="text-secondary p-2 mb-2">
<div class="flex gap-2 mb-2">
<%= lucide_icon("info", class: "w-5 h-5 shrink-0") %>
<p class="text-sm"><%= t(".instructions_1") %></p>
diff --git a/app/views/imports/_empty.html.erb b/app/views/imports/_empty.html.erb
index bf0f1e70..334ab4b6 100644
--- a/app/views/imports/_empty.html.erb
+++ b/app/views/imports/_empty.html.erb
@@ -1,6 +1,6 @@
<div class="flex justify-center items-center py-20">
<div class="text-center flex flex-col items-center max-w-[300px] gap-4">
- <p class="text-gray-900 mb-1 font-medium text-sm"><%= t(".message") %></p>
+ <p class="text-primary mb-1 font-medium text-sm"><%= t(".message") %></p>
<%= link_to new_import_path, class: "btn btn--primary flex items-center gap-2", data: { turbo_frame: "modal" } do %>
<%= lucide_icon("plus", class: "w-5 h-5") %>
<span><%= t(".new") %></span>
diff --git a/app/views/imports/_failure.html.erb b/app/views/imports/_failure.html.erb
index 9dc003d8..0ae9f2a5 100644
--- a/app/views/imports/_failure.html.erb
+++ b/app/views/imports/_failure.html.erb
@@ -7,8 +7,8 @@
</div>
<div class="text-center space-y-2">
- <h1 class="font-medium text-gray-900 text-center text-3xl">Import failed</h1>
- <p class="text-sm text-gray-500">Please check that your file format, for any errors and that all required fields are filled, then come back and try again.</p>
+ <h1 class="font-medium text-primary text-center text-3xl">Import failed</h1>
+ <p class="text-sm text-secondary">Please check that your file format, for any errors and that all required fields are filled, then come back and try again.</p>
</div>
<div>
diff --git a/app/views/imports/_import.html.erb b/app/views/imports/_import.html.erb
index edffa2c6..ae36869f 100644
--- a/app/views/imports/_import.html.erb
+++ b/app/views/imports/_import.html.erb
@@ -1,12 +1,12 @@
<div id="<%= dom_id import %>" class="flex items-center justify-between mx-4 py-4 border-b last:border-b-0 border-alpha-black-50">
<div class="flex items-center gap-2 mb-1">
- <%= link_to import_path(import), class: "text-sm text-gray-900 hover:underline" do %>
+ <%= link_to import_path(import), class: "text-sm text-primary hover:underline" do %>
<%= t(".label", type: import.type.titleize, datetime: import.updated_at.strftime("%b %-d, %Y at %l:%M %p")) %>
<% end %>
<% if import.pending? %>
- <span class="px-1 py text-xs rounded-full bg-gray-500/5 text-gray-500 border border-alpha-black-50">
+ <span class="px-1 py text-xs rounded-full bg-gray-500/5 text-secondary border border-alpha-black-50">
<%= t(".in_progress") %>
</span>
<% elsif import.importing? %>
@@ -33,10 +33,10 @@
</div>
<%= contextual_menu do %>
- <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
+ <div class="w-48 p-1 text-sm leading-6 text-primary bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
<%= link_to import_path(import),
- class: "block w-full py-2 px-3 space-x-2 text-gray-900 hover:bg-gray-50 flex items-center rounded-lg" do %>
- <%= lucide_icon "eye", class: "w-5 h-5 text-gray-500" %>
+ class: "block w-full py-2 px-3 space-x-2 text-primary hover:bg-gray-50 flex items-center rounded-lg" do %>
+ <%= lucide_icon "eye", class: "w-5 h-5 text-secondary" %>
<span><%= t(".view") %></span>
<% end %>
diff --git a/app/views/imports/_importing.html.erb b/app/views/imports/_importing.html.erb
index cf2f136c..df1c70a0 100644
--- a/app/views/imports/_importing.html.erb
+++ b/app/views/imports/_importing.html.erb
@@ -3,12 +3,12 @@
<div class="h-full flex flex-col justify-center items-center">
<div class="space-y-6 max-w-sm">
<div class="mx-auto bg-gray-500/5 h-8 w-8 rounded-full flex items-center justify-center">
- <%= lucide_icon "loader", class: "animate-pulse w-5 h-5 text-gray-500" %>
+ <%= lucide_icon "loader", class: "animate-pulse w-5 h-5 text-secondary" %>
</div>
<div class="text-center space-y-2">
- <h1 class="font-medium text-gray-900 text-center text-3xl">Import in progress</h1>
- <p class="text-sm text-gray-500">Your import is in progress. Check the imports menu for status updates or click 'Check Status' to refresh the page for updates. Feel free to continue using the app.</p>
+ <h1 class="font-medium text-primary text-center text-3xl">Import in progress</h1>
+ <p class="text-sm text-secondary">Your import is in progress. Check the imports menu for status updates or click 'Check Status' to refresh the page for updates. Feel free to continue using the app.</p>
</div>
<div class="space-y-2">
diff --git a/app/views/imports/_nav.html.erb b/app/views/imports/_nav.html.erb
index 101efcd1..b68b6ce1 100644
--- a/app/views/imports/_nav.html.erb
+++ b/app/views/imports/_nav.html.erb
@@ -14,9 +14,9 @@
<% is_current = request.path == step[:path] %>
<% text_class = if is_current
- "text-gray-900"
+ "text-primary"
else
- step[:is_complete] ? "text-green-600" : "text-gray-500"
+ step[:is_complete] ? "text-green-600" : "text-secondary"
end %>
<% step_class = if is_current
"bg-gray-900 text-white"
diff --git a/app/views/imports/_ready.html.erb b/app/views/imports/_ready.html.erb
index c564a777..95449039 100644
--- a/app/views/imports/_ready.html.erb
+++ b/app/views/imports/_ready.html.erb
@@ -1,13 +1,13 @@
<%# locals: (import:) %>
<div class="text-center space-y-2 mb-4 mx-auto max-w-md">
- <h1 class="text-3xl text-gray-900 font-medium"><%= t(".title") %></h1>
- <p class="text-gray-500 text-sm"><%= t(".description") %></p>
+ <h1 class="text-3xl text-primary font-medium"><%= t(".title") %></h1>
+ <p class="text-secondary text-sm"><%= t(".description") %></p>
</div>
<div class="mx-auto max-w-2xl space-y-4">
<div class="bg-gray-25 rounded-xl p-1 space-y-1">
- <div class="flex justify-between items-center text-xs font-medium text-gray-500 uppercase px-5 py-3">
+ <div class="flex justify-between items-center text-xs font-medium text-secondary uppercase px-5 py-3">
<p>item</p>
<p class="justify-self-end">count</p>
</div>
diff --git a/app/views/imports/_revert_failure.html.erb b/app/views/imports/_revert_failure.html.erb
index cfdb08c3..6566648d 100644
--- a/app/views/imports/_revert_failure.html.erb
+++ b/app/views/imports/_revert_failure.html.erb
@@ -7,8 +7,8 @@
</div>
<div class="text-center space-y-2">
- <h1 class="font-medium text-gray-900 text-center text-3xl">Reverting import failed</h1>
- <p class="text-sm text-gray-500">Please try again or contact support.</p>
+ <h1 class="font-medium text-primary text-center text-3xl">Reverting import failed</h1>
+ <p class="text-sm text-secondary">Please try again or contact support.</p>
</div>
<div>
diff --git a/app/views/imports/_success.html.erb b/app/views/imports/_success.html.erb
index a7e035c4..4c58e07b 100644
--- a/app/views/imports/_success.html.erb
+++ b/app/views/imports/_success.html.erb
@@ -7,8 +7,8 @@
</div>
<div class="text-center space-y-2">
- <h1 class="font-medium text-gray-900 text-center text-3xl">Import successful</h1>
- <p class="text-sm text-gray-500">Your imported data has been successfully added to the app and is now ready for use.</p>
+ <h1 class="font-medium text-primary text-center text-3xl">Import successful</h1>
+ <p class="text-sm text-secondary">Your imported data has been successfully added to the app and is now ready for use.</p>
</div>
<div>
diff --git a/app/views/imports/_table.html.erb b/app/views/imports/_table.html.erb
index 18b963b6..b084353c 100644
--- a/app/views/imports/_table.html.erb
+++ b/app/views/imports/_table.html.erb
@@ -1,6 +1,6 @@
<%# locals: (headers: [], rows: [], caption: nil) %>
<div class="overflow-x-auto">
- <div class="border border-alpha-black-200 rounded-md shadow-xs text-sm bg-white w-full">
+ <div class="border border-secondary rounded-md shadow-xs text-sm bg-white w-full">
<div class="grid border-b border-b-alpha-black-200" style="grid-template-columns: repeat(<%= headers.length %>, minmax(0, 1fr))">
<% headers.each_with_index do |header, index| %>
<div class="
@@ -29,7 +29,7 @@
<% end %>
<% if caption %>
- <div class="px-3 py-2.5 text-center text-xs text-gray-900 rounded-b-md italic bg-gray-25 overflow-x-auto">
+ <div class="px-3 py-2.5 text-center text-xs text-primary rounded-b-md italic bg-gray-25 overflow-x-auto">
<%= caption %>
</div>
<% end %>
diff --git a/app/views/imports/index.html.erb b/app/views/imports/index.html.erb
index 73aecf0d..f5d03362 100644
--- a/app/views/imports/index.html.erb
+++ b/app/views/imports/index.html.erb
@@ -4,7 +4,7 @@
<div class="space-y-4">
<div class="flex items-center justify-between">
- <h1 class="text-xl font-medium text-gray-900"><%= t(".title") %></h1>
+ <h1 class="text-xl font-medium text-primary"><%= t(".title") %></h1>
<%= link_to new_import_path, class: "btn btn--primary flex items-center gap-2", data: { turbo_frame: :modal } do %>
<%= lucide_icon("plus", class: "w-5 h-5") %>
@@ -16,7 +16,7 @@
<%= render partial: "imports/empty" %>
<% else %>
<div class="rounded-xl bg-gray-25 p-1">
- <h2 class="uppercase px-4 py-2 text-gray-500 text-xs"><%= t(".imports") %> · <%= @imports.size %></h2>
+ <h2 class="uppercase px-4 py-2 text-secondary text-xs"><%= t(".imports") %> · <%= @imports.size %></h2>
<div class="border border-alpha-gray-100 rounded-lg bg-white shadow-xs">
<%= render partial: "imports/import", collection: @imports.ordered %>
diff --git a/app/views/imports/new.html.erb b/app/views/imports/new.html.erb
index 7cbcf685..aaf0475e 100644
--- a/app/views/imports/new.html.erb
+++ b/app/views/imports/new.html.erb
@@ -2,17 +2,17 @@
<div class="p-4 space-y-4 max-w-[420px]">
<div class="space-y-2">
<div class="flex justify-between items-center">
- <h2 class="font-medium text-gray-900"><%= t(".title") %></h2>
+ <h2 class="font-medium text-primary"><%= t(".title") %></h2>
<button data-action="modal#close" tabindex="-1">
- <%= lucide_icon("x", class: "w-5 h-5 text-gray-900") %>
+ <%= lucide_icon("x", class: "w-5 h-5 text-primary") %>
</button>
</div>
- <p class="text-gray-500 text-sm"><%= t(".description") %></p>
+ <p class="text-secondary text-sm"><%= t(".description") %></p>
</div>
<div class="rounded-xl bg-gray-25 p-1">
- <h3 class="uppercase text-gray-500 text-xs font-medium px-3 py-1.5"><%= t(".sources") %></h3>
+ <h3 class="uppercase text-secondary text-xs font-medium px-3 py-1.5"><%= t(".sources") %></h3>
<ul class="bg-white border border-alpha-black-25 rounded-lg shadow-xs">
<li>
<% if @pending_import.present? && (params[:type].nil? || params[:type] == @pending_import.type) %>
@@ -21,11 +21,11 @@
<div class="bg-orange-500/5 rounded-md w-8 h-8 flex items-center justify-center">
<%= lucide_icon("loader", class: "w-5 h-5 text-orange-500") %>
</div>
- <span class="text-sm text-gray-900 group-hover:text-gray-700">
+ <span class="text-sm text-primary group-hover:text-gray-700">
<%= t(".resume", type: @pending_import.type.titleize) %>
</span>
</div>
- <%= lucide_icon("chevron-right", class: "w-5 h-5 text-gray-500") %>
+ <%= lucide_icon("chevron-right", class: "w-5 h-5 text-secondary") %>
<% end %>
<div class="pl-14 pr-3">
@@ -41,11 +41,11 @@
<div class="bg-indigo-500/5 rounded-md w-8 h-8 flex items-center justify-center">
<%= lucide_icon("file-spreadsheet", class: "w-5 h-5 text-indigo-500") %>
</div>
- <span class="text-sm text-gray-900 group-hover:text-gray-700">
+ <span class="text-sm text-primary group-hover:text-gray-700">
<%= t(".import_transactions") %>
</span>
</div>
- <%= lucide_icon("chevron-right", class: "w-5 h-5 text-gray-500") %>
+ <%= lucide_icon("chevron-right", class: "w-5 h-5 text-secondary") %>
<% end %>
<div class="pl-14 pr-3">
@@ -61,11 +61,11 @@
<div class="bg-yellow-500/5 rounded-md w-8 h-8 flex items-center justify-center">
<%= lucide_icon("square-percent", class: "w-5 h-5 text-yellow-500") %>
</div>
- <span class="text-sm text-gray-900 group-hover:text-gray-700">
+ <span class="text-sm text-primary group-hover:text-gray-700">
<%= t(".import_portfolio") %>
</span>
</div>
- <%= lucide_icon("chevron-right", class: "w-5 h-5 text-gray-500") %>
+ <%= lucide_icon("chevron-right", class: "w-5 h-5 text-secondary") %>
<% end %>
<div class="pl-14 pr-3">
@@ -81,11 +81,11 @@
<div class="bg-violet-500/5 rounded-md w-8 h-8 flex items-center justify-center">
<%= lucide_icon("building", class: "w-5 h-5 text-violet-500") %>
</div>
- <span class="text-sm text-gray-900 group-hover:text-gray-700">
+ <span class="text-sm text-primary group-hover:text-gray-700">
<%= t(".import_accounts") %>
</span>
</div>
- <%= lucide_icon("chevron-right", class: "w-5 h-5 text-gray-500") %>
+ <%= lucide_icon("chevron-right", class: "w-5 h-5 text-secondary") %>
<% end %>
<div class="pl-14 pr-3">
@@ -99,11 +99,11 @@
<%= button_to imports_path(import: { type: "MintImport" }), class: "flex items-center justify-between p-4 group w-full", data: { turbo: false } do %>
<div class="flex items-center gap-2">
<%= image_tag("mint-logo.jpeg", alt: "Mint logo", class: "w-8 h-8 rounded-md") %>
- <span class="text-sm text-gray-900">
+ <span class="text-sm text-primary">
<%= t(".import_mint") %>
</span>
</div>
- <%= lucide_icon("chevron-right", class: "w-5 h-5 text-gray-500") %>
+ <%= lucide_icon("chevron-right", class: "w-5 h-5 text-secondary") %>
<% end %>
<div class="pl-14 pr-3">
diff --git a/app/views/investments/_value_tooltip.html.erb b/app/views/investments/_value_tooltip.html.erb
index be275222..c311474a 100644
--- a/app/views/investments/_value_tooltip.html.erb
+++ b/app/views/investments/_value_tooltip.html.erb
@@ -1,7 +1,7 @@
<%# locals: (balance:, holdings:, cash:) %>
<div data-controller="tooltip" data-tooltip-placement-value="right" data-tooltip-offset-value=10 data-tooltip-cross-axis-value=50>
- <%= lucide_icon("info", class: "w-4 h-4 shrink-0 text-gray-500") %>
+ <%= lucide_icon("info", class: "w-4 h-4 shrink-0 text-secondary") %>
<div role="tooltip" data-tooltip-target="tooltip" class="tooltip bg-gray-700 text-sm p-2 rounded w-64">
<div class="text-white">
<%= t(".total_value_tooltip") %>
diff --git a/app/views/invite_codes/_invite_code.html.erb b/app/views/invite_codes/_invite_code.html.erb
index 9937cbdd..cabf65dc 100644
--- a/app/views/invite_codes/_invite_code.html.erb
+++ b/app/views/invite_codes/_invite_code.html.erb
@@ -4,7 +4,7 @@
<div>
<span data-clipboard-target="source" class="text-sm font-medium"><%= invite_code.token %></span>
</div>
- <button data-action="clipboard#copy" class="shrink-0 z-10 inline-flex items-center px-1 text-sm text-gray-500 font-sm text-center" type="button">
+ <button data-action="clipboard#copy" class="shrink-0 z-10 inline-flex items-center px-1 text-sm text-secondary font-sm text-center" type="button">
<span data-clipboard-target="iconDefault">
<%= lucide_icon "copy", class: "w-5 h-5" %>
</span>
diff --git a/app/views/invite_codes/index.html.erb b/app/views/invite_codes/index.html.erb
index d4d881d9..32ab048d 100644
--- a/app/views/invite_codes/index.html.erb
+++ b/app/views/invite_codes/index.html.erb
@@ -4,9 +4,9 @@
<%= render @invite_codes %>
<% else %>
<div class="flex flex-col items-center w-full h-64 bg-white text-center justify-center">
- <%= lucide_icon "binary", class: "w-6 h-6 text-sm text-gray-500" %>
+ <%= lucide_icon "binary", class: "w-6 h-6 text-sm text-secondary" %>
<p class="text-base pt-4"><%= t(".no_invite_codes") %></p>
- <p class="text-sm text-gray-500 pt-2 w-2/3"><%= t(".invite_code_description") %></p>
+ <p class="text-sm text-secondary pt-2 w-2/3"><%= t(".invite_code_description") %></p>
</div>
<% end %>
<% end %>
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 38cb51b4..ff5f59d6 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -1,6 +1,5 @@
-
<footer class="p-6">
- <div class="space-y-2 text-center text-xs text-gray-500">
+ <div class="space-y-2 text-center text-xs text-secondary">
<p>&copy; <%= Date.current.year %>, Maybe Finance, Inc.</p>
<p><%= link_to t(".privacy_policy"), "https://maybefinance.com/privacy", class: "underline hover:text-gray-600" %> &bull; <%= link_to t(".terms_of_service"), "https://maybefinance.com/tos", class: "underline hover:text-gray-600" %></p>
</div>
diff --git a/app/views/layouts/_sidebar.html.erb b/app/views/layouts/_sidebar.html.erb
index 189597e8..ea878657 100644
--- a/app/views/layouts/_sidebar.html.erb
+++ b/app/views/layouts/_sidebar.html.erb
@@ -15,23 +15,23 @@
</div>
<div class="overflow-hidden text-ellipsis">
- <span class="text-gray-900 font-medium text-sm"><%= Current.user.display_name %></span>
+ <span class="text-primary font-medium text-sm"><%= Current.user.display_name %></span>
<% if Current.user.display_name != Current.user.email %>
- <span class="text-gray-500 text-sm"><%= Current.user.email %></span>
+ <span class="text-secondary text-sm"><%= Current.user.email %></span>
<% end %>
</div>
</div>
- <div class="border-t border-b border-alpha-black-100 p-1">
+ <div class="border-t border-b border-tertiary p-1">
<%= link_to settings_profile_path(return_to: request.fullpath), class: "flex gap-2 items-center hover:bg-gray-50 rounded-lg px-3 py-2" do %>
- <%= lucide_icon("settings", class: "w-5 h-5 text-gray-500 shrink-0") %>
- <span class="text-gray-900 text-sm">Settings</span>
+ <%= lucide_icon("settings", class: "w-5 h-5 text-secondary shrink-0") %>
+ <span class="text-primary text-sm">Settings</span>
<% end %>
<div class="flex justify-between items-center gap-2">
<div class="flex items-center gap-2 rounded-lg px-3 py-2">
- <%= lucide_icon("app-window", class: "w-5 h-5 text-gray-500 shrink-0") %>
+ <%= lucide_icon("app-window", class: "w-5 h-5 text-secondary shrink-0") %>
<div>
- <span class="text-gray-900 text-sm">Demo mode</span>
- <span class="text-gray-500 text-xs block">Coming soon...</span>
+ <span class="text-primary text-sm">Demo mode</span>
+ <span class="text-secondary text-xs block">Coming soon...</span>
</div>
</div>
<%# TODO: This will be a form toggle when implemented %>
@@ -40,24 +40,24 @@
</div>
</div>
</div>
- <div class="border-t border-b border-alpha-black-100 p-1">
+ <div class="border-t border-b border-tertiary p-1">
<%= link_to changelog_path, class: "flex gap-2 items-center hover:bg-gray-50 rounded-lg px-3 py-2" do %>
- <%= lucide_icon("box", class: "w-5 h-5 text-gray-500 shrink-0") %>
- <span class="text-gray-900 text-sm">Changelog</span>
+ <%= lucide_icon("box", class: "w-5 h-5 text-secondary shrink-0") %>
+ <span class="text-primary text-sm">Changelog</span>
<% end %>
<%= link_to feedback_path, class: "flex gap-2 items-center hover:bg-gray-50 rounded-lg px-3 py-2" do %>
- <%= lucide_icon("megaphone", class: "w-5 h-5 text-gray-500 shrink-0") %>
- <span class="text-gray-900 text-sm">Feedback</span>
+ <%= lucide_icon("megaphone", class: "w-5 h-5 text-secondary shrink-0") %>
+ <span class="text-primary text-sm">Feedback</span>
<% end %>
<% if self_hosted? %>
<%= link_to "https://link.maybe.co/discord", class: "flex gap-2 items-center hover:bg-gray-50 rounded-lg px-3 py-2" do %>
- <%= lucide_icon("message-square-more", class: "w-5 h-5 text-gray-500 shrink-0") %>
- <span class="text-gray-900 text-sm">Contact</span>
+ <%= lucide_icon("message-square-more", class: "w-5 h-5 text-secondary shrink-0") %>
+ <span class="text-primary text-sm">Contact</span>
<% end %>
<% else %>
<%= link_to "mailto:[email protected]", class: "flex gap-2 items-center hover:bg-gray-50 rounded-lg px-3 py-2", onclick: "Intercom('showNewMessage'); return false;" do %>
- <%= lucide_icon("message-square-more", class: "w-5 h-5 text-gray-500 shrink-0") %>
- <span class="text-gray-900 text-sm">Contact</span>
+ <%= lucide_icon("message-square-more", class: "w-5 h-5 text-secondary shrink-0") %>
+ <span class="text-primary text-sm">Contact</span>
<% end %>
<% end %>
</div>
@@ -88,8 +88,8 @@
</nav>
<div class="flex flex-col mt-6">
<div class="flex items-center justify-between px-3 py-2 mb-2">
- <div class="flex items-center gap-2 text-xs uppercase text-gray-500">
- <%= link_to accounts_path, class: "text-xs uppercase text-gray-500 font-bold tracking-wide" do %>
+ <div class="flex items-center gap-2 text-xs uppercase text-secondary">
+ <%= link_to accounts_path, class: "text-xs uppercase text-secondary font-bold tracking-wide" do %>
<%= t(".portfolio") %>
<% end %>
<span class="font-bold tracking-wide">&bull;</span>
@@ -98,8 +98,8 @@
<%= period_select form: form, selected: "last_30_days", classes: "w-full border-none pl-2 pr-7 text-xs bg-transparent gap-1 cursor-pointer font-semibold tracking-wide focus:outline-hidden focus:ring-0" %>
<% end %>
</div>
- <%= link_to new_account_path, id: "sidebar-new-account", class: "block hover:bg-gray-100 font-semibold text-gray-900 flex items-center rounded p-1", title: t(".new_account"), data: { turbo_frame: "modal" } do %>
- <%= lucide_icon("plus", class: "w-5 h-5 text-gray-500") %>
+ <%= link_to new_account_path, id: "sidebar-new-account", class: "block hover:bg-gray-100 font-semibold text-primary flex items-center rounded p-1", title: t(".new_account"), data: { turbo_frame: "modal" } do %>
+ <%= lucide_icon("plus", class: "w-5 h-5 text-secondary") %>
<% end %>
</div>
@@ -109,7 +109,7 @@
<%= render "accounts/account_list", group: group %>
<% end %>
<% else %>
- <%= link_to new_account_path, class: "flex items-center min-h-10 gap-4 px-3 py-2 mb-1 text-gray-500 text-sm font-medium rounded-[10px] hover:bg-gray-100", data: { turbo_frame: "modal" } do %>
+ <%= link_to new_account_path, class: "flex items-center min-h-10 gap-4 px-3 py-2 mb-1 text-secondary text-sm font-medium rounded-[10px] hover:bg-gray-100", data: { turbo_frame: "modal" } do %>
<%= lucide_icon("plus", class: "w-5 h-5") %>
<%= tag.p t(".new_account") %>
<% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index ba805c3c..14fe57b5 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html class="h-full <%= @os %>" lang="en">
+<html class="font-sans text-primary h-full <%= @os %>" lang="en">
<head>
<title><%= content_for(:title) || "Maybe" %></title>
diff --git a/app/views/layouts/auth.html.erb b/app/views/layouts/auth.html.erb
index c7708763..5e581e92 100644
--- a/app/views/layouts/auth.html.erb
+++ b/app/views/layouts/auth.html.erb
@@ -7,17 +7,17 @@
</div>
<div class="space-y-2">
- <h2 class="text-3xl font-medium text-gray-900 text-center">
+ <h2 class="text-3xl font-medium text-primary text-center">
<%= content_for?(:header_title) ? yield(:header_title).html_safe : t(".your_account") %>
</h2>
<% if controller_name == "sessions" %>
<p class="text-sm text-center">
- <%= tag.span t(".no_account"), class: "text-gray-500" %> <%= link_to t(".sign_up"), new_registration_path, class: "font-medium text-gray-900 hover:underline transition" %>
+ <%= tag.span t(".no_account"), class: "text-secondary" %> <%= link_to t(".sign_up"), new_registration_path, class: "font-medium text-primary hover:underline transition" %>
</p>
<% elsif controller_name == "registrations" %>
<p class="text-sm text-center text-gray-600">
- <%= t(".existing_account") %> <%= link_to t(".sign_in"), new_session_path, class: "font-medium text-gray-900 hover:underline transition" %>
+ <%= t(".existing_account") %> <%= link_to t(".sign_in"), new_session_path, class: "font-medium text-primary hover:underline transition" %>
</p>
<% end %>
</div>
diff --git a/app/views/layouts/imports.html.erb b/app/views/layouts/imports.html.erb
index a304588e..1c2e771e 100644
--- a/app/views/layouts/imports.html.erb
+++ b/app/views/layouts/imports.html.erb
@@ -2,7 +2,7 @@
<div class="flex flex-col h-dvh">
<header class="flex items-center justify-between p-8">
<%= link_to content_for(:previous_path) || imports_path do %>
- <%= lucide_icon "arrow-left", class: "w-5 h-5 text-gray-500" %>
+ <%= lucide_icon "arrow-left", class: "w-5 h-5 text-secondary" %>
<% end %>
<nav>
@@ -10,7 +10,7 @@
</nav>
<%= link_to imports_path do %>
- <%= lucide_icon "x", class: "text-gray-500 w-5 h-5" %>
+ <%= lucide_icon "x", class: "text-secondary w-5 h-5" %>
<% end %>
</header>
diff --git a/app/views/layouts/wizard.html.erb b/app/views/layouts/wizard.html.erb
index 647580b2..f19ce346 100644
--- a/app/views/layouts/wizard.html.erb
+++ b/app/views/layouts/wizard.html.erb
@@ -2,7 +2,7 @@
<div class="flex flex-col h-dvh">
<header class="flex items-center justify-between p-8">
<%= link_to content_for(:previous_path) || root_path do %>
- <%= lucide_icon "arrow-left", class: "w-5 h-5 text-gray-500" %>
+ <%= lucide_icon "arrow-left", class: "w-5 h-5 text-secondary" %>
<% end %>
<nav>
@@ -10,7 +10,7 @@
</nav>
<%= link_to content_for(:cancel_path) || root_path do %>
- <%= lucide_icon "x", class: "text-gray-500 w-5 h-5" %>
+ <%= lucide_icon "x", class: "text-secondary w-5 h-5" %>
<% end %>
</header>
diff --git a/app/views/merchants/_merchant.html.erb b/app/views/merchants/_merchant.html.erb
index a454d41a..12e23c6c 100644
--- a/app/views/merchants/_merchant.html.erb
+++ b/app/views/merchants/_merchant.html.erb
@@ -10,13 +10,13 @@
<%= render partial: "shared/color_avatar", locals: { name: merchant.name, color: merchant.color } %>
<% end %>
- <p class="text-gray-900 text-sm truncate">
+ <p class="text-primary text-sm truncate">
<%= merchant.name %>
</p>
</div>
<div class="justify-self-end">
<%= contextual_menu do %>
- <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
+ <div class="w-48 p-1 text-sm leading-6 text-primary bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
<%= contextual_menu_modal_action_item t(".edit"), edit_merchant_path(merchant) %>
<%= contextual_menu_destructive_item t(".delete"),
diff --git a/app/views/merchants/index.html.erb b/app/views/merchants/index.html.erb
index e5fcfbfa..e511013f 100644
--- a/app/views/merchants/index.html.erb
+++ b/app/views/merchants/index.html.erb
@@ -4,7 +4,7 @@
<section class="space-y-4">
<header class="flex items-center justify-between">
- <h1 class="text-gray-900 text-xl font-medium"><%= t(".title") %></h1>
+ <h1 class="text-primary text-xl font-medium"><%= t(".title") %></h1>
<%= link_to new_merchant_path, class: "btn btn--primary flex items-center gap-1 justify-center", data: { turbo_frame: :modal } do %>
<%= lucide_icon "plus", class: "w-5 h-5" %>
@@ -15,9 +15,9 @@
<div class="bg-white shadow-xs border border-alpha-black-25 rounded-xl p-4">
<% if @merchants.any? %>
<div class="rounded-xl bg-gray-25 space-y-1 p-1">
- <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-gray-500 uppercase">
+ <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-secondary uppercase">
<p><%= t(".title") %></p>
- <span class="text-gray-400">&middot;</span>
+ <span class="text-subdued">&middot;</span>
<p><%= @merchants.count %></p>
</div>
@@ -30,7 +30,7 @@
<% else %>
<div class="flex justify-center items-center py-20">
<div class="text-center flex flex-col items-center max-w-[300px]">
- <p class="text-gray-900 mb-1 font-medium text-sm"><%= t(".empty") %></p>
+ <p class="text-primary mb-1 font-medium text-sm"><%= t(".empty") %></p>
<%= link_to new_merchant_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %>
<%= lucide_icon("plus", class: "w-5 h-5") %>
<span><%= t(".new") %></span>
diff --git a/app/views/mfa/backup_codes.html.erb b/app/views/mfa/backup_codes.html.erb
index 8adc5313..f93bba0b 100644
--- a/app/views/mfa/backup_codes.html.erb
+++ b/app/views/mfa/backup_codes.html.erb
@@ -8,7 +8,7 @@
<% end %>
<div class="space-y-4">
- <h1 class="text-gray-900 text-xl font-medium mb-4"><%= t(".page_title") %></h1>
+ <h1 class="text-primary text-xl font-medium mb-4"><%= t(".page_title") %></h1>
<%= settings_section title: t(".backup_codes_title"), subtitle: t(".backup_codes_description") do %>
<div class="space-y-6">
<div class="grid grid-cols-2 gap-4">
@@ -26,4 +26,5 @@
<% end %>
<%= settings_nav_footer %>
-</div>
\ No newline at end of file
+</div>
+
\ No newline at end of file
diff --git a/app/views/mfa/new.html.erb b/app/views/mfa/new.html.erb
index 37aa6731..65223d25 100644
--- a/app/views/mfa/new.html.erb
+++ b/app/views/mfa/new.html.erb
@@ -8,7 +8,7 @@
<% end %>
<div class="space-y-4">
- <h1 class="text-gray-900 text-xl font-medium mb-4"><%= t(".page_title") %></h1>
+ <h1 class="text-primary text-xl font-medium mb-4"><%= t(".page_title") %></h1>
<%= settings_section title: t(".scan_title"), subtitle: t(".scan_description") do %>
<div class="space-y-6">
<div>
@@ -16,8 +16,8 @@
</div>
<div class="mt-6">
- <h3 class="text-sm font-medium text-gray-900"><%= t(".secret_title") %></h3>
- <div class="mt-2 text-sm text-gray-500">
+ <h3 class="text-sm font-medium text-primary"><%= t(".secret_title") %></h3>
+ <div class="mt-2 text-sm text-secondary">
<p><%= t(".secret_description") %></p>
</div>
<div class="mt-2 flex items-center gap-2" data-controller="clipboard">
@@ -27,7 +27,7 @@
autocomplete="off"
value="<%= Current.user.otp_secret %>"
class="text-sm bg-gray-50 px-2 py-1 rounded border border-gray-200 w-96 font-mono">
- <button data-action="clipboard#copy" class="text-gray-500 hover:text-gray-700">
+ <button data-action="clipboard#copy" class="text-secondary hover:text-gray-700">
<span data-clipboard-target="iconDefault">
<%= lucide_icon "copy", class: "w-5 h-5" %>
</span>
@@ -39,8 +39,8 @@
</div>
<div>
- <h3 class="text-lg font-medium leading-6 text-gray-900"><%= t(".verify_title") %></h3>
- <div class="mt-2 text-sm text-gray-500">
+ <h3 class="text-lg font-medium leading-6 text-primary"><%= t(".verify_title") %></h3>
+ <div class="mt-2 text-sm text-secondary">
<p><%= t(".verify_description") %></p>
</div>
</div>
diff --git a/app/views/onboardings/_header.html.erb b/app/views/onboardings/_header.html.erb
index 2de8ec08..fc5ba847 100644
--- a/app/views/onboardings/_header.html.erb
+++ b/app/views/onboardings/_header.html.erb
@@ -1,8 +1,7 @@
-
<header class="flex justify-between items-center p-4">
<%= image_tag "logo.svg", class: "h-[22px]" %>
<div class="flex items-center gap-2">
- <%= lucide_icon "log-in", class: "w-5 h-5 shrink-0 text-gray-500 gap-2" %>
- <%= button_to t(".sign_out"), session_path(Current.session), method: :delete, class: "text-sm text-gray-900 font-medium" %>
+ <%= lucide_icon "log-in", class: "w-5 h-5 shrink-0 text-secondary gap-2" %>
+ <%= button_to t(".sign_out"), session_path(Current.session), method: :delete, class: "text-sm text-primary font-medium" %>
</div>
</header>
diff --git a/app/views/onboardings/preferences.html.erb b/app/views/onboardings/preferences.html.erb
index 93eee73b..f567cd0b 100644
--- a/app/views/onboardings/preferences.html.erb
+++ b/app/views/onboardings/preferences.html.erb
@@ -5,18 +5,18 @@
<div>
<div class="space-y-1 mb-6">
<h1 class="text-2xl font-medium"><%= t(".title") %></h1>
- <p class="text-gray-500 text-sm"><%= t(".subtitle") %></p>
+ <p class="text-secondary text-sm"><%= t(".subtitle") %></p>
</div>
<div class="p-1 bg-alpha-black-25 mb-2 rounded-lg">
<div class="bg-white p-4 rounded-lg flex gap-8 shadow-xs">
<div class="space-y-2">
- <%= tag.p t(".example"), class: "text-gray-500 text-sm" %>
- <%= tag.p "$2,323.25", class: "text-gray-900 font-medium text-2xl" %>
+ <%= tag.p t(".example"), class: "text-secondary text-sm" %>
+ <%= tag.p "$2,323.25", class: "text-primary font-medium text-2xl" %>
<p class="text-sm">
<span class="text-green-500 font-medium">+<%= format_money(Money.new(78.90, params[:currency] || @user.family.currency)) %></span>
<span class="text-green-500 font-medium">(+<%= format_money(Money.new(6.39, params[:currency] || @user.family.currency)) %>)</span>
- <span class="text-gray-500">as of <%= format_date(Date.parse("2024-10-23"), :default, format_code: params[:date_format] || @user.family.date_format) %></span>
+ <span class="text-secondary">as of <%= format_date(Date.parse("2024-10-23"), :default, format_code: params[:date_format] || @user.family.date_format) %></span>
</p>
</div>
@@ -52,7 +52,7 @@
</div>
</div>
- <p class="text-gray-500 text-xs mb-4"><%= t(".preview") %></p>
+ <p class="text-secondary text-xs mb-4"><%= t(".preview") %></p>
<%= styled_form_with model: @user do |form| %>
<%= form.hidden_field :onboarded_at, value: Time.current %>
diff --git a/app/views/onboardings/profile.html.erb b/app/views/onboardings/profile.html.erb
index 0e0b99f5..595fa3dd 100644
--- a/app/views/onboardings/profile.html.erb
+++ b/app/views/onboardings/profile.html.erb
@@ -5,7 +5,7 @@
<div>
<div class="space-y-1 mb-6">
<h1 class="text-2xl font-medium"><%= t(".title") %></h1>
- <p class="text-gray-500 text-sm"><%= t(".subtitle") %></p>
+ <p class="text-secondary text-sm"><%= t(".subtitle") %></p>
</div>
<%= styled_form_with model: @user do |form| %>
@@ -13,7 +13,7 @@
<%= form.hidden_field :onboarded_at, value: Time.current if @invitation %>
<div class="space-y-4 mb-4">
- <p class="text-gray-500 text-xs"><%= t(".profile_image") %></p>
+ <p class="text-secondary text-xs"><%= t(".profile_image") %></p>
<%= render "settings/user_avatar_field", form: form, user: @user %>
</div>
@@ -30,7 +30,7 @@
country_options,
{ label: t(".country") }, required: true %>
<% end %>
- </div>
+ </div>
<% end %>
<%= form.submit t(".submit") %>
diff --git a/app/views/onboardings/show.html.erb b/app/views/onboardings/show.html.erb
index 3b7657ae..aa6639ae 100644
--- a/app/views/onboardings/show.html.erb
+++ b/app/views/onboardings/show.html.erb
@@ -3,7 +3,7 @@
<div class="grow flex justify-center items-center flex-col max-w-sm w-full text-center">
<%= image_tag "logo-color.png", class: "w-16 mb-6" %>
<%= tag.h1 t(".title"), class: "text-3xl font-medium mb-2" %>
- <%= tag.p t(".message"), class: "text-sm text-gray-500 mb-6" %>
+ <%= tag.p t(".message"), class: "text-sm text-secondary mb-6" %>
<%= link_to t(".setup"), profile_onboarding_path, class: "block flex justify-center items-center btn btn--primary w-full" %>
</div>
diff --git a/app/views/pages/_account_group_disclosure.erb b/app/views/pages/_account_group_disclosure.erb
index bd51df0e..f3c18cba 100644
--- a/app/views/pages/_account_group_disclosure.erb
+++ b/app/views/pages/_account_group_disclosure.erb
@@ -1,14 +1,14 @@
<%# locals: (accountable_group:) %>
<% text_class = accountable_text_class(accountable_group.name) %>
<details class="open:bg-gray-25 group">
- <summary class="flex p-4 items-center w-full rounded-lg font-medium hover:bg-gray-50 text-gray-500 text-sm font-medium cursor-pointer">
+ <summary class="flex p-4 items-center w-full rounded-lg font-medium hover:bg-gray-50 text-secondary text-sm font-medium cursor-pointer">
<%= lucide_icon("chevron-down", class: "hidden group-open:block w-5 h-5") %>
<%= lucide_icon("chevron-right", class: "group-open:hidden w-5 h-5") %>
<div class="ml-4 h-2.5 w-2.5 rounded-full <%= accountable_bg_class(accountable_group.name) %>"></div>
- <p class="text-gray-900 ml-2"><%= to_accountable_title(Accountable.from_type(accountable_group.name)) %></p>
+ <p class="text-primary ml-2"><%= to_accountable_title(Accountable.from_type(accountable_group.name)) %></p>
<span class="mx-1">&middot;</span>
<div><%= accountable_group.children.count %></div>
- <div class="ml-auto text-right flex items-center gap-10 text-sm font-medium text-gray-900">
+ <div class="ml-auto text-right flex items-center gap-10 text-sm font-medium text-primary">
<div class="flex items-center justify-end gap-2 w-24">
<%= render partial: "shared/progress_circle", locals: { progress: accountable_group.percent_of_total, text_class: text_class } %>
<p><%= accountable_group.percent_of_total.round(1) %>%</p>
@@ -23,7 +23,7 @@
</summary>
<div class="px-4 py-3 space-y-4">
<% accountable_group.children.map do |account_value_node| %>
- <div class="flex items-center justify-between text-sm font-medium text-gray-900">
+ <div class="flex items-center justify-between text-sm font-medium text-primary">
<div class="flex items-center gap-4 overflow-hidden">
<%= render "accounts/logo", account: account_value_node.original, size: "sm" %>
<div class="truncate">
diff --git a/app/views/pages/_account_percentages_bar.html.erb b/app/views/pages/_account_percentages_bar.html.erb
index f7394a60..f8e98865 100644
--- a/app/views/pages/_account_percentages_bar.html.erb
+++ b/app/views/pages/_account_percentages_bar.html.erb
@@ -9,7 +9,7 @@
<% account_groups.sort_by(&:percent_of_total).reverse.each do |group| %>
<div class="flex items-center gap-2 text-sm">
<div class="h-2.5 w-2.5 rounded-full <%= accountable_bg_class(group.name) %>"></div>
- <p class="text-gray-500"><%= to_accountable_title(Accountable.from_type(group.name)) %></p>
+ <p class="text-secondary"><%= to_accountable_title(Accountable.from_type(group.name)) %></p>
<p class="text-black"><%= group.percent_of_total.round(1) %>%</p>
</div>
<% end %>
diff --git a/app/views/pages/_account_percentages_table.html.erb b/app/views/pages/_account_percentages_table.html.erb
index ab37414b..60dd9aa4 100644
--- a/app/views/pages/_account_percentages_table.html.erb
+++ b/app/views/pages/_account_percentages_table.html.erb
@@ -1,6 +1,6 @@
<%# locals: (account_groups:) %>
<div class="bg-gray-25 p-1 rounded-xl">
- <div class="px-4 py-2 flex items-center uppercase text-xs font-medium text-gray-500">
+ <div class="px-4 py-2 flex items-center uppercase text-xs font-medium text-secondary">
<div>Name</div>
<div class="ml-auto text-right flex items-center gap-10">
<div class="w-24">
diff --git a/app/views/pages/changelog.html.erb b/app/views/pages/changelog.html.erb
index c12d1b17..6632ac9d 100644
--- a/app/views/pages/changelog.html.erb
+++ b/app/views/pages/changelog.html.erb
@@ -3,7 +3,7 @@
<% end %>
<div class="space-y-4 flex flex-col h-full">
- <h1 class="text-gray-900 text-xl font-medium mb-4"><%= t(".title") %></h1>
+ <h1 class="text-primary text-xl font-medium mb-4"><%= t(".title") %></h1>
<div class="bg-white shadow-xs border border-alpha-black-25 rounded-xl p-4 grow overflow-y-auto">
<div class="flex justify-between gap-4 mb-12 last:mb-0">
<div class="w-1/3">
@@ -12,13 +12,13 @@
<%= image_tag @release_notes[:avatar], class: "rounded-full w-full h-full object-cover" %>
</div>
<div>
- <a class="text-gray-900 font-medium text-sm" href="https://github.com/<%= @release_notes[:username] %>"><%= "@#{@release_notes[:username]}" %></a>
- <div class="text-gray-500 text-sm"><%= @release_notes[:published_at].strftime("%B %d, %Y") %></div>
+ <a class="text-primary font-medium text-sm" href="https://github.com/<%= @release_notes[:username] %>"><%= "@#{@release_notes[:username]}" %></a>
+ <div class="text-secondary text-sm"><%= @release_notes[:published_at].strftime("%B %d, %Y") %></div>
</div>
</div>
</div>
- <div class="w-2/3 text-gray-500 text-sm prose prose--github-release-notes">
- <h2 class="mb-5 text-xl text-gray-900"><%= @release_notes[:name] %></h2>
+ <div class="w-2/3 text-secondary text-sm prose prose--github-release-notes">
+ <h2 class="mb-5 text-xl text-primary"><%= @release_notes[:name] %></h2>
<%= @release_notes[:body].html_safe %>
</div>
</div>
diff --git a/app/views/pages/dashboard.html.erb b/app/views/pages/dashboard.html.erb
index 69861fd1..4e84a384 100644
--- a/app/views/pages/dashboard.html.erb
+++ b/app/views/pages/dashboard.html.erb
@@ -13,17 +13,17 @@
<header class="flex items-center justify-between">
<div>
<h1 class="sr-only"><%= t(".title") %></h1>
- <p class="text-xl font-medium text-gray-900 mb-1">
+ <p class="text-xl font-medium text-primary mb-1">
<%= Current.user.first_name.present? ? t(".greeting", name: Current.user.first_name ) : t(".fallback_greeting") %>
</p>
<% unless @accounts.blank? %>
- <p class="text-gray-500 text-sm"><%= t(".subtitle") %></p>
+ <p class="text-secondary text-sm"><%= t(".subtitle") %></p>
<% end %>
</div>
<div class="flex items-center gap-2">
<%= contextual_menu do %>
- <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
+ <div class="w-48 p-1 text-sm leading-6 text-primary bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
<%= contextual_menu_modal_action_item t(".import"), new_import_path, icon: "hard-drive-upload" %>
</div>
<% end %>
@@ -81,14 +81,14 @@
</div>
<div class="flex gap-1.5 mt-auto">
<% @top_earners.first(3).each do |account| %>
- <%= link_to account, class: "border border-alpha-black-25 rounded-full p-1 pr-2 flex items-center gap-1 text-xs text-gray-900 font-medium hover:bg-gray-25", data: { controller: "tooltip" } do %>
+ <%= link_to account, class: "border border-alpha-black-25 rounded-full p-1 pr-2 flex items-center gap-1 text-xs text-primary font-medium hover:bg-gray-25", data: { controller: "tooltip" } do %>
<%= render "accounts/logo", account: account, size: "sm" %>
<span>+<%= Money.new(account.income, account.currency) %></span>
<%= render partial: "shared/text_tooltip", locals: { tooltip_text: account.name } %>
<% end %>
<% end %>
<% if @top_earners.count > 3 %>
- <div class="bg-gray-25 rounded-full flex h-full aspect-1 items-center justify-center text-xs font-medium text-gray-500">+<%= @top_earners.count - 3 %></div>
+ <div class="bg-gray-25 rounded-full flex h-full aspect-1 items-center justify-center text-xs font-medium text-secondary">+<%= @top_earners.count - 3 %></div>
<% end %>
</div>
</div>
@@ -114,14 +114,14 @@
</div>
<div class="mt-auto flex gap-1.5">
<% @top_spenders.first(3).each do |account| %>
- <%= link_to account, class: "border border-alpha-black-25 rounded-full p-1 pr-2 flex items-center gap-1 text-xs text-gray-900 font-medium hover:bg-gray-25", data: { controller: "tooltip" } do %>
+ <%= link_to account, class: "border border-alpha-black-25 rounded-full p-1 pr-2 flex items-center gap-1 text-xs text-primary font-medium hover:bg-gray-25", data: { controller: "tooltip" } do %>
<%= render "accounts/logo", account: account, size: "sm" %>
-<%= Money.new(account.spending, account.currency) %>
<%= render partial: "shared/text_tooltip", locals: { tooltip_text: account.name } %>
<% end %>
<% end %>
<% if @top_spenders.count > 3 %>
- <div class="bg-gray-25 rounded-full flex h-full aspect-1 items-center justify-center text-xs font-medium text-gray-500">+<%= @top_spenders.count - 3 %></div>
+ <div class="bg-gray-25 rounded-full flex h-full aspect-1 items-center justify-center text-xs font-medium text-secondary">+<%= @top_spenders.count - 3 %></div>
<% end %>
</div>
</div>
@@ -149,7 +149,7 @@
<div class="flex gap-1.5">
<% @top_savers.first(3).each do |account| %>
<% unless account.savings_rate.infinite? %>
- <%= link_to account, class: "border border-alpha-black-25 rounded-full p-1 pr-2 flex items-center gap-1 text-xs text-gray-900 font-medium hover:bg-gray-25", data: { controller: "tooltip" } do %>
+ <%= link_to account, class: "border border-alpha-black-25 rounded-full p-1 pr-2 flex items-center gap-1 text-xs text-primary font-medium hover:bg-gray-25", data: { controller: "tooltip" } do %>
<%= render "accounts/logo", account: account, size: "sm" %>
<span><%= account.savings_rate > 0 ? "+" : "-" %><%= number_to_percentage(account.savings_rate.abs * 100, precision: 2) %></span>
<%= render partial: "shared/text_tooltip", locals: { tooltip_text: account.name } %>
@@ -157,7 +157,7 @@
<% end %>
<% end %>
<% if @top_savers.count > 3 %>
- <div class="bg-gray-25 rounded-full flex h-full aspect-1 items-center justify-center text-xs font-medium text-gray-500">+<%= @top_savers.count - 3 %></div>
+ <div class="bg-gray-25 rounded-full flex h-full aspect-1 items-center justify-center text-xs font-medium text-secondary">+<%= @top_savers.count - 3 %></div>
<% end %>
</div>
</div>
@@ -183,13 +183,13 @@
</section>
<section class="w-full">
<div class="bg-white p-4 border border-alpha-black-25 shadow-xs rounded-xl space-y-4">
- <h2 class="text-lg font-medium text-gray-900"><%= t(".transactions") %></h2>
+ <h2 class="text-lg font-medium text-primary"><%= t(".transactions") %></h2>
<% if @transaction_entries.empty? %>
- <div class="text-gray-500 flex items-center justify-center py-12">
+ <div class="text-secondary flex items-center justify-center py-12">
<p><%= t(".no_transactions") %></p>
</div>
<% else %>
- <div class="text-gray-500 p-1 space-y-1 bg-gray-25 rounded-xl">
+ <div class="text-secondary p-1 space-y-1 bg-gray-25 rounded-xl">
<%= entries_by_date(@transaction_entries, selectable: false) do |entries, _transfers| %>
<%= render entries, selectable: false %>
<% end %>
diff --git a/app/views/pages/dashboard/_allocation_chart.html.erb b/app/views/pages/dashboard/_allocation_chart.html.erb
index f61573b6..7e59d8b0 100644
--- a/app/views/pages/dashboard/_allocation_chart.html.erb
+++ b/app/views/pages/dashboard/_allocation_chart.html.erb
@@ -1,12 +1,12 @@
<%# locals: (account_groups:) -%>
-<div data-controller="tabs" data-tabs-active-class="bg-white border-alpha-black-25 shadow-xs text-gray-900" data-tabs-default-tab-value="asset-tab">
- <div class="bg-gray-25 rounded-lg p-1 flex gap-1 text-sm text-gray-500 font-medium">
+<div data-controller="tabs" data-tabs-active-class="bg-white border-alpha-black-25 shadow-xs text-primary" data-tabs-default-tab-value="asset-tab">
+ <div class="bg-gray-25 rounded-lg p-1 flex gap-1 text-sm text-secondary font-medium">
<button data-id="asset-tab" class="w-1/2 px-2 py-1 rounded-md border border-transparent" data-tabs-target="btn" data-action="tabs#select"><%= t(".assets") %></button>
<button data-id="liability-tab" class="w-1/2 px-2 py-1 rounded-md border border-transparent" data-tabs-target="btn" data-action="tabs#select"><%= t(".debts") %></button>
</div>
<div>
<div data-tabs-target="tab" id="asset-tab" class="space-y-6">
- <div class="text-gray-500 flex items-center justify-center py-6">
+ <div class="text-secondary flex items-center justify-center py-6">
<div
data-controller="pie-chart"
class="w-full aspect-1"
@@ -16,7 +16,7 @@
</div>
</div>
<div data-tabs-target="tab" id="liability-tab" class="space-y-6 hidden">
- <div class="text-gray-500 flex items-center justify-center py-6">
+ <div class="text-secondary flex items-center justify-center py-6">
<div
data-controller="pie-chart"
class="w-full aspect-1"
diff --git a/app/views/pages/dashboard/_net_worth_chart.html.erb b/app/views/pages/dashboard/_net_worth_chart.html.erb
index 56d1adf7..0aec643a 100644
--- a/app/views/pages/dashboard/_net_worth_chart.html.erb
+++ b/app/views/pages/dashboard/_net_worth_chart.html.erb
@@ -7,10 +7,10 @@
data-time-series-chart-data-value="<%= series.to_json %>"></div>
<% elsif series.empty? %>
<div class="w-full h-full flex items-center justify-center">
- <p class="text-gray-500 text-sm">No data available for the selected period.</p>
+ <p class="text-secondary text-sm">No data available for the selected period.</p>
</div>
<% else %>
<div class="w-full h-full flex items-center justify-center">
- <p class="text-gray-500 text-sm animate-pulse">Calculating latest balance data...</p>
+ <p class="text-secondary text-sm animate-pulse">Calculating latest balance data...</p>
</div>
<% end %>
diff --git a/app/views/pages/early_access.html.erb b/app/views/pages/early_access.html.erb
index 7c762c07..7de81bfa 100644
--- a/app/views/pages/early_access.html.erb
+++ b/app/views/pages/early_access.html.erb
@@ -28,27 +28,27 @@
<%= image_tag "logo-squircle.svg", alt: "Maybe Logo", class: "w-16 h-16 sm:w-18 sm:h-18 mx-auto mb-6 sm:mb-8" %>
<h1 class="text-2xl font-normal my-4">Maybe Early Access</h1>
<% if @invite_codes_count > 0 %>
- <p class="text-base text-gray-400">There <%= @invite_codes_count == 1 ? "is" : "are" %> <span class="text-white"><%= @invite_codes_count %> invite <%= "code".pluralize(@invite_codes_count) %></span> remaining.</p>
+ <p class="text-base text-subdued">There <%= @invite_codes_count == 1 ? "is" : "are" %> <span class="text-white"><%= @invite_codes_count %> invite <%= "code".pluralize(@invite_codes_count) %></span> remaining.</p>
<div class="bg-gray-900 border border-gray-800 p-2 rounded-xl my-4">
- <p class="text-sm text-gray-400 mt-1 mb-3 sm:mb-4">Your invite code is <span class="font-mono text-white"><%= @invite_code.token %></span></p>
+ <p class="text-sm text-subdued mt-1 mb-3 sm:mb-4">Your invite code is <span class="font-mono text-white"><%= @invite_code.token %></span></p>
<p><%= link_to "Sign up with this code", new_registration_path(invite: @invite_code.token), class: "block w-full bg-white text-black py-2 px-3 rounded-lg no-underline text-sm sm:text-base hover:bg-gray-200 transition duration-150" %></p>
</div>
- <p class="text-sm text-gray-400">You may need to refresh the page to get a new invite code if someone else claimed it before you.</p>
+ <p class="text-sm text-subdued">You may need to refresh the page to get a new invite code if someone else claimed it before you.</p>
<p class="mt-4 sm:mt-6">
<%= link_to early_access_path, class: "w-full block text-center justify-center inline-flex items-center text-white hover:bg-gray-800 p-2 rounded-md text-base transition duration-150", data: { turbo_method: :get } do %>
- <%= lucide_icon "refresh-cw", class: "w-4 h-4 sm:w-5 sm:h-5 mr-2 text-gray-400" %>
+ <%= lucide_icon "refresh-cw", class: "w-4 h-4 sm:w-5 sm:h-5 mr-2 text-subdued" %>
<span>Refresh page</span>
<% end %>
</p>
<% else %>
- <p class="text-base text-gray-400 mb-6 sm:mb-8">Sorry, there are <span class="text-white">no invite codes</span> remaining. Join our <%= link_to "Discord server", "https://link.maybe.co/discord", target: "_blank", class: "text-white hover:text-gray-300" %> to get notified when new invite codes are available.</p>
+ <p class="text-base text-subdued mb-6 sm:mb-8">Sorry, there are <span class="text-white">no invite codes</span> remaining. Join our <%= link_to "Discord server", "https://link.maybe.co/discord", target: "_blank", class: "text-white hover:text-gray-300" %> to get notified when new invite codes are available.</p>
<p><%= link_to "Join Discord server", "https://link.maybe.co/discord", target: "_blank", class: "bg-white text-black px-3 py-2 rounded-md no-underline text-base hover:bg-gray-200 transition duration-150" %></p>
<% end %>
</div>
</div>
- <footer class="pb-6 sm:pb-10 text-center text-gray-400 text-sm">
+ <footer class="pb-6 sm:pb-10 text-center text-subdued text-sm">
©2024 Maybe Finance, Inc.
</footer>
</body>
diff --git a/app/views/pages/feedback.html.erb b/app/views/pages/feedback.html.erb
index 42e66b24..dc7f33dc 100644
--- a/app/views/pages/feedback.html.erb
+++ b/app/views/pages/feedback.html.erb
@@ -3,30 +3,30 @@
<% end %>
<div class="space-y-4">
- <h1 class="text-gray-900 text-xl font-medium mb-4">Feedback</h1>
+ <h1 class="text-primary text-xl font-medium mb-4">Feedback</h1>
<div class="bg-white shadow-xs border border-alpha-black-25 rounded-xl p-4">
- <h2 class="text-lg font-medium text-gray-900 mb-1">Leave feedback</h2>
- <p class="text-sm text-gray-500 mb-4">Let us know if you have any specific feedback. Feel free to include links to videos or screenshots.</p>
+ <h2 class="text-lg font-medium text-primary mb-1">Leave feedback</h2>
+ <p class="text-sm text-secondary mb-4">Let us know if you have any specific feedback. Feel free to include links to videos or screenshots.</p>
<div class="flex gap-2">
<%= link_to "https://github.com/maybe-finance/maybe/discussions/categories/feature-requests", target: "_blank", rel: "noopener noreferrer", class: "w-1/3 flex flex-col items-center p-4 border border-alpha-black-25 rounded-xl hover:bg-gray-50" do %>
<%= image_tag "github-icon.svg", class: "w-8 h-8 mb-2" %>
- <span class="text-sm font-medium text-gray-900">Write a feature request</span>
+ <span class="text-sm font-medium text-primary">Write a feature request</span>
<% end %>
<% if self_hosted? %>
<%= link_to "https://github.com/maybe-finance/maybe/issues/new?assignees=&labels=bug&template=bug_report.md&title=", target: "_blank", rel: "noopener noreferrer", class: "w-1/3 flex flex-col items-center p-4 border border-alpha-black-25 rounded-xl hover:bg-gray-50" do %>
<%= image_tag "github-icon.svg", class: "w-8 h-8 mb-2" %>
- <span class="text-sm font-medium text-gray-900">File a bug report</span>
+ <span class="text-sm font-medium text-primary">File a bug report</span>
<% end %>
<% else %>
<%= link_to "mailto:[email protected]", class: "w-1/3 flex flex-col items-center p-4 border border-alpha-black-25 rounded-xl hover:bg-gray-50", onclick: "Intercom('showNewMessage'); return false;" do %>
<%= lucide_icon "bug", class: "w-8 h-8 mb-2" %>
- <span class="text-sm font-medium text-gray-900">File a bug report</span>
+ <span class="text-sm font-medium text-primary">File a bug report</span>
<% end %>
<% end %>
<%= link_to "https://link.maybe.co/discord", target: "_blank", rel: "noopener noreferrer", class: "w-1/3 flex flex-col items-center p-4 border border-alpha-black-25 rounded-xl hover:bg-gray-50" do %>
<%= image_tag "discord-icon.svg", class: "w-8 h-8 mb-2" %>
- <span class="text-sm font-medium text-gray-900">Discuss Maybe with others</span>
+ <span class="text-sm font-medium text-primary">Discuss Maybe with others</span>
<% end %>
</div>
</div>
diff --git a/app/views/password_resets/new.html.erb b/app/views/password_resets/new.html.erb
index a0726b0e..0cea29a1 100644
--- a/app/views/password_resets/new.html.erb
+++ b/app/views/password_resets/new.html.erb
@@ -1,7 +1,7 @@
<% header_title t(".title") %>
<% if params[:step] == "pending" %>
- <p class="text-sm text-gray-500 text-center"><%= t(".requested") %></p>
+ <p class="text-sm text-secondary text-center"><%= t(".requested") %></p>
<% else %>
<%= styled_form_with url: password_reset_path, class: "space-y-4" do |form| %>
<%= form.email_field :email, label: true, autofocus: false, autocomplete: "email", required: "required", placeholder: "[email protected]" %>
diff --git a/app/views/plaid_items/_plaid_item.html.erb b/app/views/plaid_items/_plaid_item.html.erb
index 481e0c0a..46f24742 100644
--- a/app/views/plaid_items/_plaid_item.html.erb
+++ b/app/views/plaid_items/_plaid_item.html.erb
@@ -4,7 +4,7 @@
<details open class="group bg-white p-4 border border-alpha-black-25 shadow-xs rounded-xl">
<summary class="flex items-center justify-between gap-2 focus-visible:outline-hidden">
<div class="flex items-center gap-2">
- <%= lucide_icon "chevron-right", class: "group-open:transform group-open:rotate-90 text-gray-500 w-5" %>
+ <%= lucide_icon "chevron-right", class: "group-open:transform group-open:rotate-90 text-secondary w-5" %>
<div class="flex items-center justify-center h-8 w-8 bg-blue-600/10 rounded-full bg-black/5">
<% if plaid_item.logo.attached? %>
@@ -18,13 +18,13 @@
<div class="pl-1 text-sm">
<div class="flex items-center gap-2">
- <%= tag.p plaid_item.name, class: "font-medium text-gray-900" %>
+ <%= tag.p plaid_item.name, class: "font-medium text-primary" %>
<% if plaid_item.scheduled_for_deletion? %>
<p class="text-red-500 text-sm animate-pulse">(deletion in progress...)</p>
<% end %>
</div>
<% if plaid_item.syncing? %>
- <div class="text-gray-500 flex items-center gap-1">
+ <div class="text-secondary flex items-center gap-1">
<%= lucide_icon "loader", class: "w-4 h-4 animate-pulse" %>
<%= tag.span t(".syncing") %>
</div>
@@ -34,12 +34,12 @@
<%= tag.span t(".requires_update") %>
</div>
<% elsif plaid_item.sync_error.present? %>
- <div class="text-gray-500 flex items-center gap-1">
+ <div class="text-secondary flex items-center gap-1">
<%= lucide_icon "alert-circle", class: "w-4 h-4 text-red-500" %>
<%= tag.span t(".error"), class: "text-red-500" %>
</div>
<% else %>
- <p class="text-gray-500">
+ <p class="text-secondary">
<%= plaid_item.last_synced_at ? t(".status", timestamp: time_ago_in_words(plaid_item.last_synced_at)) : t(".status_never") %>
</p>
<% end %>
@@ -62,13 +62,13 @@
<%= lucide_icon "refresh-cw", class: "w-4 h-4" %>
<%= tag.span t(".update") %>
</button>
- <% rescue PlaidItem::PlaidConnectionLostError %>
+ <% rescue PlaidItem::PlaidConnectionLostError %>
<div class="flex flex-col gap-2">
<div class="text-amber-500 flex items-center gap-1">
<%= lucide_icon "alert-triangle", class: "w-4 h-4" %>
<%= tag.span t(".connection_lost") %>
</div>
- <p class="text-sm text-gray-500"><%= t(".connection_lost_description") %></p>
+ <p class="text-sm text-secondary"><%= t(".connection_lost_description") %></p>
<div class="flex items-center gap-2">
<%= button_to plaid_item_path(plaid_item),
method: :delete,
@@ -91,13 +91,13 @@
</div>
<% end %>
<% else %>
- <%= button_to sync_plaid_item_path(plaid_item), disabled: plaid_item.syncing? || plaid_item.scheduled_for_deletion?, class: "disabled:text-gray-400 text-gray-900 flex hover:text-gray-800 items-center text-sm font-medium hover:underline" do %>
+ <%= button_to sync_plaid_item_path(plaid_item), disabled: plaid_item.syncing? || plaid_item.scheduled_for_deletion?, class: "disabled:text-subdued text-primary flex hover:text-gray-800 items-center text-sm font-medium hover:underline" do %>
<%= lucide_icon "refresh-cw", class: "w-4 h-4" %>
<% end %>
<% end %>
<%= contextual_menu do %>
- <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
+ <div class="w-48 p-1 text-sm leading-6 text-primary bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
<%= button_to plaid_item_path(plaid_item),
method: :delete,
class: "block w-full py-2 px-3 space-x-2 text-red-600 hover:bg-red-50 flex items-center rounded-lg",
@@ -124,8 +124,8 @@
<%= render "accounts/index/account_groups", accounts: plaid_item.accounts %>
<% else %>
<div class="p-4 flex flex-col gap-3 items-center justify-center">
- <p class="text-gray-900 font-medium text-sm"><%= t(".no_accounts_title") %></p>
- <p class="text-gray-500 text-sm"><%= t(".no_accounts_description") %></p>
+ <p class="text-primary font-medium text-sm"><%= t(".no_accounts_title") %></p>
+ <p class="text-secondary text-sm"><%= t(".no_accounts_description") %></p>
</div>
<% end %>
</div>
diff --git a/app/views/registrations/new.html.erb b/app/views/registrations/new.html.erb
index 855888a7..0449c4e2 100644
--- a/app/views/registrations/new.html.erb
+++ b/app/views/registrations/new.html.erb
@@ -3,13 +3,13 @@
%>
<% if self_hosted_first_login? %>
- <div class="fixed inset-0 w-full h-fit bg-gray-25 p-5 border-b border-alpha-black-200 flex flex-col gap-3 items-center text-center mb-12">
+ <div class="fixed inset-0 w-full h-fit bg-gray-25 p-5 border-b border-secondary flex flex-col gap-3 items-center text-center mb-12">
<h2 class="font-bold text-xl"><%= t(".welcome_title") %></h2>
- <p class="text-gray-500 text-sm"><%= t(".welcome_body") %></p>
+ <p class="text-secondary text-sm"><%= t(".welcome_body") %></p>
</div>
<% elsif @invitation %>
<div class="space-y-1 mb-6 text-center">
- <p class="text-gray-500">
+ <p class="text-secondary">
<%= t(".invitation_message",
inviter: @invitation.inviter.display_name,
role: t(".role_#{@invitation.role}")) %>
diff --git a/app/views/securities/_combobox_security.turbo_stream.erb b/app/views/securities/_combobox_security.turbo_stream.erb
index b14708c7..3b6bc798 100644
--- a/app/views/securities/_combobox_security.turbo_stream.erb
+++ b/app/views/securities/_combobox_security.turbo_stream.erb
@@ -4,7 +4,7 @@
<span class="text-sm font-medium">
<%= combobox_security.name.presence || combobox_security.symbol %>
</span>
- <span class="text-xs text-gray-500">
+ <span class="text-xs text-secondary">
<%= "#{combobox_security.symbol} (#{combobox_security.exchange_acronym.presence || combobox_security.exchange_operating_mic})" %>
</span>
</div>
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 32b1138e..174a76d3 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -11,5 +11,5 @@
<% end %>
<div class="mt-6 text-center">
- <%= link_to t(".forgot_password"), new_password_reset_path, class: "font-medium text-sm text-gray-900 hover:underline transition" %>
+ <%= link_to t(".forgot_password"), new_password_reset_path, class: "font-medium text-sm text-primary hover:underline transition" %>
</div>
diff --git a/app/views/settings/_nav.html.erb b/app/views/settings/_nav.html.erb
index 55e20d8d..b1dc91a7 100644
--- a/app/views/settings/_nav.html.erb
+++ b/app/views/settings/_nav.html.erb
@@ -1,17 +1,17 @@
<div class="space-y-4">
<div class="flex items-center gap-2 p-2">
- <%= link_to previous_path, class: "flex items-center gap-1 text-gray-900 font-medium text-sm" do %>
- <%= lucide_icon "chevron-left", class: "w-5 h-5 text-gray-500" %>
+ <%= link_to previous_path, class: "flex items-center gap-1 text-primary font-medium text-sm" do %>
+ <%= lucide_icon "chevron-left", class: "w-5 h-5 text-secondary" %>
<span>Back</span>
<% end %>
- <%= link_to previous_path, class: "uppercase bg-gray-100 rounded-sm px-1 py-0.5 text-xs text-gray-500 shadow-sm ml-1 pointer-events-none", data: { controller: "hotkey", hotkey: "Escape" } do %>
+ <%= link_to previous_path, class: "uppercase bg-gray-100 rounded-sm px-1 py-0.5 text-xs text-secondary shadow-sm ml-1 pointer-events-none", data: { controller: "hotkey", hotkey: "Escape" } do %>
esc
<% end %>
</div>
<nav class="space-y-4">
<section class="space-y-2">
<div class="flex items-center gap-2 px-3">
- <h3 class="uppercase text-gray-500 font-medium text-xs"><%= t(".general_section_title") %></h3>
+ <h3 class="uppercase text-secondary font-medium text-xs"><%= t(".general_section_title") %></h3>
<div class="h-px bg-alpha-black-100 w-full"></div>
</div>
<ul class="space-y-1">
@@ -44,7 +44,7 @@
<section class="space-y-2">
<div class="flex items-center gap-2 px-3">
- <h3 class="uppercase text-gray-500 font-medium text-xs"><%= t(".transactions_section_title") %></h3>
+ <h3 class="uppercase text-secondary font-medium text-xs"><%= t(".transactions_section_title") %></h3>
<div class="h-px bg-alpha-black-100 w-full"></div>
</div>
<ul class="space-y-1">
@@ -62,7 +62,7 @@
<section class="space-y-2">
<div class="flex items-center gap-2 px-3">
- <h3 class="uppercase text-gray-500 font-medium text-xs"><%= t(".other_section_title") %></h3>
+ <h3 class="uppercase text-secondary font-medium text-xs"><%= t(".other_section_title") %></h3>
<div class="h-px bg-alpha-black-100 w-full"></div>
</div>
<ul class="space-y-1">
diff --git a/app/views/settings/_nav_link_large.html.erb b/app/views/settings/_nav_link_large.html.erb
index 7cc62731..beced3cd 100644
--- a/app/views/settings/_nav_link_large.html.erb
+++ b/app/views/settings/_nav_link_large.html.erb
@@ -1,16 +1,16 @@
<%# locals: path, direction, title %>
<%= link_to path, class: "w-full bg-white hover:bg-gray-50 rounded-xl border border-alpha-black-25 shadow-xs p-4 flex items-center justify-between" do %>
<% if direction == 'previous' %>
- <div class="w-5 h-5 text-gray-500">
+ <div class="w-5 h-5 text-secondary">
<%= lucide_icon("arrow-left") %>
</div>
<% end %>
<div class="<%= "grow" if direction == "next" %> <%= "text-right" if direction == "previous" %>">
- <span class="block text-sm text-gray-500"><%= t(".#{direction}") %></span>
- <span class="block text-sm font-medium text-gray-900"><%= title %></span>
+ <span class="block text-sm text-secondary"><%= t(".#{direction}") %></span>
+ <span class="block text-sm font-medium text-primary"><%= title %></span>
</div>
<% if direction == 'next' %>
- <div class="w-5 h-5 text-gray-500">
+ <div class="w-5 h-5 text-secondary">
<%= lucide_icon("arrow-right") %>
</div>
<% end %>
diff --git a/app/views/settings/_section.html.erb b/app/views/settings/_section.html.erb
index cd0e3a3f..c9849461 100644
--- a/app/views/settings/_section.html.erb
+++ b/app/views/settings/_section.html.erb
@@ -1,9 +1,9 @@
<%# locals: (title:, subtitle: nil, content:) %>
<section class="bg-white border border-alpha-black-25 shadow-xs rounded-xl p-4 space-y-4">
<div>
- <h2 class="text-lg font-medium text-gray-900"><%= title %></h2>
+ <h2 class="text-lg font-medium text-primary"><%= title %></h2>
<% if subtitle.present? %>
- <p class="text-gray-500 text-sm mt-1"><%= subtitle %></p>
+ <p class="text-secondary text-sm mt-1"><%= subtitle %></p>
<% end %>
</div>
<div>
diff --git a/app/views/settings/_user_avatar_field.html.erb b/app/views/settings/_user_avatar_field.html.erb
index 3fb9f125..a2710c63 100644
--- a/app/views/settings/_user_avatar_field.html.erb
+++ b/app/views/settings/_user_avatar_field.html.erb
@@ -12,7 +12,7 @@
<div data-profile-image-preview-target="placeholderImage"
class="h-full w-full flex justify-center items-center <%= user.profile_image.attached? ? "hidden" : "" %>">
<div class="h-full w-full flex justify-center items-center">
- <%= lucide_icon "image-plus", class: "w-6 h-6 text-gray-500" %>
+ <%= lucide_icon "image-plus", class: "w-6 h-6 text-secondary" %>
</div>
</div>
@@ -30,7 +30,7 @@
data-profile-image-preview-target="clearBtn"
data-action="click->profile-image-preview#clearFileInput"
class="<%= user.profile_image.attached? ? "" : "hidden" %> cursor-pointer absolute bottom-0 right-0 w-8 h-8 bg-gray-50 rounded-full flex justify-center items-center border border-white border-2">
- <%= lucide_icon "x", class: "w-4 h-4 text-gray-500" %>
+ <%= lucide_icon "x", class: "w-4 h-4 text-secondary" %>
</button>
</div>
@@ -43,7 +43,7 @@
class: "btn btn--outline inline-block" %>
<%= form.file_field :profile_image,
accept: "image/png, image/jpeg",
- class: "hidden px-3 py-2 bg-gray-50 text-gray-900 rounded-md text-sm font-medium",
+ class: "hidden px-3 py-2 bg-gray-50 text-primary rounded-md text-sm font-medium",
data: {
profile_image_preview_target: "input",
action: "change->profile-image-preview#showFileInputPreview"
diff --git a/app/views/settings/billings/show.html.erb b/app/views/settings/billings/show.html.erb
index 45b9c702..7b1a90b3 100644
--- a/app/views/settings/billings/show.html.erb
+++ b/app/views/settings/billings/show.html.erb
@@ -3,22 +3,22 @@
<% end %>
<div class="space-y-4">
- <h1 class="text-gray-900 text-xl font-medium mb-4"><%= t(".page_title") %></h1>
+ <h1 class="text-primary text-xl font-medium mb-4"><%= t(".page_title") %></h1>
<%= settings_section title: t(".subscription_title"), subtitle: t(".subscription_subtitle") do %>
<div class="space-y-4">
- <div class="p-3 shadow-xs bg-white border border-alpha-black-200 rounded-lg flex justify-between items-center">
+ <div class="p-3 shadow-xs bg-white border border-secondary rounded-lg flex justify-between items-center">
<div class="flex items-center gap-3">
<div class="w-9 h-9 rounded-full bg-gray-25 flex justify-center items-center">
- <%= lucide_icon "gem", class: "w-5 h-5 text-gray-500" %>
+ <%= lucide_icon "gem", class: "w-5 h-5 text-secondary" %>
</div>
<div class="text-sm space-y-1">
<% if @user.family.subscribed? || subscription_pending? %>
- <p class="text-gray-900">You are currently subscribed to <span class="font-medium">Maybe+</span></p>
- <p class="text-gray-500">Manage your billing settings here.</p>
+ <p class="text-primary">You are currently subscribed to <span class="font-medium">Maybe+</span></p>
+ <p class="text-secondary">Manage your billing settings here.</p>
<% else %>
- <p class="text-gray-900">You are currently <span class="font-medium">not subscribed</span></p>
- <p class="text-gray-500">Once you subscribe to Maybe+, you’ll see your billing settings here.</p>
+ <p class="text-primary">You are currently <span class="font-medium">not subscribed</span></p>
+ <p class="text-secondary">Once you subscribe to Maybe+, you’ll see your billing settings here.</p>
<% end %>
</div>
</div>
@@ -26,19 +26,19 @@
<% if @user.family.subscribed? || subscription_pending? %>
<%= link_to subscription_path, class: "btn btn--secondary flex items-center gap-1" do %>
<span>Manage</span>
- <%= lucide_icon "external-link", class: "w-5 h-5 shrink-0 text-gray-500" %>
+ <%= lucide_icon "external-link", class: "w-5 h-5 shrink-0 text-secondary" %>
<% end %>
<% else %>
<%= link_to new_subscription_path, class: "btn btn--secondary flex items-center gap-1" do %>
<span>Subscribe</span>
- <%= lucide_icon "external-link", class: "w-5 h-5 shrink-0 text-gray-500" %>
+ <%= lucide_icon "external-link", class: "w-5 h-5 shrink-0 text-secondary" %>
<% end %>
<% end %>
</div>
<div class="flex items-center gap-2">
<%= image_tag "stripe-logo.svg", class: "w-5 h-5 shrink-0" %>
- <p class="text-gray-500 text-sm">Managed via Stripe</p>
+ <p class="text-secondary text-sm">Managed via Stripe</p>
</div>
</div>
<% end %>
diff --git a/app/views/settings/hostings/_invite_code_settings.html.erb b/app/views/settings/hostings/_invite_code_settings.html.erb
index de3b1e22..138f5c95 100644
--- a/app/views/settings/hostings/_invite_code_settings.html.erb
+++ b/app/views/settings/hostings/_invite_code_settings.html.erb
@@ -2,13 +2,13 @@
<div class="flex items-center justify-between">
<div class="space-y-1">
<p class="text-sm"><%= t(".title") %></p>
- <p class="text-gray-500 text-sm"><%= t(".description") %></p>
+ <p class="text-secondary text-sm"><%= t(".description") %></p>
</div>
<%= styled_form_with model: Setting.new, url: settings_hosting_path, method: :patch, data: { controller: "auto-submit-form", "auto-submit-form-trigger-event-value" => "blur" } do |form| %>
<div class="relative inline-block select-none">
<%= form.check_box :require_invite_for_signup, class: "sr-only peer", "data-auto-submit-form-target": "auto", "data-autosubmit-trigger-event": "input", disabled: !Current.user.admin? %>
- <%= form.label :require_invite_for_signup, "&nbsp;".html_safe, class: "maybe-switch" %>
+ <%= form.label :require_invite_for_signup, "&nbsp;".html_safe, class: "switch" %>
</div>
<% end %>
</div>
@@ -16,13 +16,13 @@
<div class="flex items-center justify-between">
<div class="space-y-1">
<p class="text-sm"><%= t(".email_confirmation_title") %></p>
- <p class="text-gray-500 text-sm"><%= t(".email_confirmation_description") %></p>
+ <p class="text-secondary text-sm"><%= t(".email_confirmation_description") %></p>
</div>
<%= styled_form_with model: Setting.new, url: settings_hosting_path, method: :patch, data: { controller: "auto-submit-form", "auto-submit-form-trigger-event-value" => "blur" } do |form| %>
<div class="relative inline-block select-none">
<%= form.check_box :require_email_confirmation, class: "sr-only peer", "data-auto-submit-form-target": "auto", "data-autosubmit-trigger-event": "input", disabled: !Current.user.admin? %>
- <%= form.label :require_email_confirmation, "&nbsp;".html_safe, class: "maybe-switch" %>
+ <%= form.label :require_email_confirmation, "&nbsp;".html_safe, class: "switch" %>
</div>
<% end %>
</div>
@@ -30,12 +30,12 @@
<% if Setting.require_invite_for_signup %>
<div class="flex items-center justify-between mb-4">
<div>
- <span class="text-gray-900 text-base font-medium"><%= t(".generated_tokens") %></span>
+ <span class="text-primary text-base font-medium"><%= t(".generated_tokens") %></span>
</div>
<div>
<%= button_to invite_codes_path,
method: :post,
- class: "flex gap-1 bg-gray-50 text-gray-900 text-sm rounded-lg px-3 py-2" do %>
+ class: "flex gap-1 bg-gray-50 text-primary text-sm rounded-lg px-3 py-2" do %>
<span><%= t(".generate_tokens") %></span>
<% end %>
</div>
diff --git a/app/views/settings/hostings/_provider_settings.html.erb b/app/views/settings/hostings/_provider_settings.html.erb
index c4aef548..f6191e89 100644
--- a/app/views/settings/hostings/_provider_settings.html.erb
+++ b/app/views/settings/hostings/_provider_settings.html.erb
@@ -2,7 +2,7 @@
<%= styled_form_with model: Setting.new, url: settings_hosting_path, method: :patch, data: { controller: "auto-submit-form", "auto-submit-form-trigger-event-value" => "blur" } do |form| %>
<div class="space-y-4">
<h2 class="font-medium mb-1"><%= t(".title") %></h2>
- <p class="text-gray-500 text-sm mb-4"><%= t(".description") %></p>
+ <p class="text-secondary text-sm mb-4"><%= t(".description") %></p>
<%= form.url_field :render_deploy_hook, label: t(".render_deploy_hook_label"), placeholder: t(".render_deploy_hook_placeholder"), value: Setting.render_deploy_hook, data: { "auto-submit-form-target" => "auto" } %>
</div>
<% end %>
diff --git a/app/views/settings/hostings/_synth_settings.html.erb b/app/views/settings/hostings/_synth_settings.html.erb
index 30445b00..9a4e9dd4 100644
--- a/app/views/settings/hostings/_synth_settings.html.erb
+++ b/app/views/settings/hostings/_synth_settings.html.erb
@@ -1,7 +1,7 @@
<div class="space-y-4">
<div>
<h2 class="font-medium mb-1"><%= t(".title") %></h2>
- <p class="text-gray-500 text-sm mb-4"><%= t(".description") %></p>
+ <p class="text-secondary text-sm mb-4"><%= t(".description") %></p>
</div>
<%= styled_form_with model: Setting.new,
@@ -23,7 +23,7 @@
<% if @synth_usage.present? && @synth_usage.success? %>
<div class="space-y-4">
<div class="space-y-2">
- <p class="text-sm text-gray-500">
+ <p class="text-sm text-secondary">
<%= t(".api_calls_used",
used: number_with_delimiter(@synth_usage.used),
limit: number_with_delimiter(@synth_usage.limit),
@@ -35,7 +35,7 @@
</div>
</div>
<div class="bg-gray-100 rounded-md px-1.5 py-0.5 w-fit">
- <p class="text-xs font-medium text-gray-500 uppercase">
+ <p class="text-xs font-medium text-secondary uppercase">
<%= t(".plan", plan: @synth_usage.plan) %>
</p>
</div>
diff --git a/app/views/settings/hostings/_upgrade_settings.html.erb b/app/views/settings/hostings/_upgrade_settings.html.erb
index 50594584..fc558b9d 100644
--- a/app/views/settings/hostings/_upgrade_settings.html.erb
+++ b/app/views/settings/hostings/_upgrade_settings.html.erb
@@ -1,36 +1,36 @@
<% if ENV["HOSTING_PLATFORM"] == "render" %>
<div>
<h2 class="font-medium mb-1"><%= t(".title") %></h2>
- <p class="text-gray-500 text-sm mb-4"><%= t(".description") %></p>
+ <p class="text-secondary text-sm mb-4"><%= t(".description") %></p>
<%= styled_form_with model: Setting.new, url: settings_hosting_path, method: :patch, data: { controller: "auto-submit-form", "auto-submit-form-trigger-event-value" => "blur" } do |form| %>
<div class="space-y-4">
<div class="flex items-center gap-4">
<%= form.radio_button :upgrades_setting, "manual", checked: Setting.upgrades_mode == "manual", data: { "auto-submit-form-target" => "auto", "autosubmit-trigger-event": "input" } %>
- <%= form.label :upgrades_mode_manual, t(".manual_title"), class: "text-gray-900 text-sm" do %>
+ <%= form.label :upgrades_mode_manual, t(".manual_title"), class: "text-primary text-sm" do %>
<span class="font-medium"><%= t(".manual_title") %></span>
<br>
- <span class="text-gray-500">
+ <span class="text-secondary">
<%= t(".manual_description") %>
</span>
<% end %>
</div>
<div class="flex items-center gap-4">
<%= form.radio_button :upgrades_setting, "release", checked: Setting.upgrades_mode == "auto" && Setting.upgrades_target == "release", data: { "auto-submit-form-target" => "auto", "autosubmit-trigger-event": "input" } %>
- <%= form.label :upgrades_mode_release, t(".latest_release_title"), class: "text-gray-900 text-sm" do %>
+ <%= form.label :upgrades_mode_release, t(".latest_release_title"), class: "text-primary text-sm" do %>
<span class="font-medium"><%= t(".latest_release_title") %></span>
<br>
- <span class="text-gray-500">
+ <span class="text-secondary">
<%= t(".latest_release_description") %>
</span>
<% end %>
</div>
<div class="flex items-center gap-4">
<%= form.radio_button :upgrades_setting, "commit", checked: Setting.upgrades_mode == "auto" && Setting.upgrades_target == "commit", data: { "auto-submit-form-target" => "auto", "autosubmit-trigger-event": "input" } %>
- <%= form.label :upgrades_mode_commit, t(".latest_commit_title"), class: "text-gray-900 text-sm" do %>
+ <%= form.label :upgrades_mode_commit, t(".latest_commit_title"), class: "text-primary text-sm" do %>
<span class="font-medium"><%= t(".latest_commit_title") %></span>
<br>
- <span class="text-gray-500">
+ <span class="text-secondary">
<%= t(".latest_commit_description") %>
</span>
<% end %>
diff --git a/app/views/settings/hostings/show.html.erb b/app/views/settings/hostings/show.html.erb
index ba4b7d5d..4684a041 100644
--- a/app/views/settings/hostings/show.html.erb
+++ b/app/views/settings/hostings/show.html.erb
@@ -3,7 +3,7 @@
<% end %>
<div class="space-y-4 pb-32">
- <h1 class="text-gray-900 text-xl font-medium mb-4"><%= t(".title") %></h1>
+ <h1 class="text-primary text-xl font-medium mb-4"><%= t(".title") %></h1>
<%= settings_section title: t(".general") do %>
<div class="space-y-6">
diff --git a/app/views/settings/preferences/_data_enrichment_settings.html.erb b/app/views/settings/preferences/_data_enrichment_settings.html.erb
index 73f729fd..bce47776 100644
--- a/app/views/settings/preferences/_data_enrichment_settings.html.erb
+++ b/app/views/settings/preferences/_data_enrichment_settings.html.erb
@@ -4,9 +4,9 @@
<div class="flex items-center justify-between">
<div class="space-y-1">
<p class="text-sm"><%= t(".title") %></p>
- <p class="text-gray-500 text-sm"><%= t(".description") %></p>
+ <p class="text-secondary text-sm"><%= t(".description") %></p>
<% if self_hosted? %>
- <p class="text-xs italic text-gray-500"><%= t(".self_host_disclaimer") %></p>
+ <p class="text-xs italic text-secondary"><%= t(".self_host_disclaimer") %></p>
<% end %>
</div>
@@ -16,7 +16,7 @@
<%= form.hidden_field :redirect_to, value: "preferences" %>
<%= form.fields_for :family do |family_form| %>
<%= family_form.check_box :data_enrichment_enabled, class: "sr-only peer", "data-auto-submit-form-target": "auto", "data-autosubmit-trigger-event": "input" %>
- <%= family_form.label :data_enrichment_enabled, "&nbsp;".html_safe, class: "maybe-switch" %>
+ <%= family_form.label :data_enrichment_enabled, "&nbsp;".html_safe, class: "switch" %>
<% end %>
</div>
<% end %>
diff --git a/app/views/settings/preferences/show.html.erb b/app/views/settings/preferences/show.html.erb
index 666469a9..4b0a6ea0 100644
--- a/app/views/settings/preferences/show.html.erb
+++ b/app/views/settings/preferences/show.html.erb
@@ -3,7 +3,7 @@
<% end %>
<div class="space-y-4">
- <h1 class="text-gray-900 text-xl font-medium mb-4"><%= t(".page_title") %></h1>
+ <h1 class="text-primary text-xl font-medium mb-4"><%= t(".page_title") %></h1>
<%= settings_section title: t(".general_title"), subtitle: t(".general_subtitle") do %>
<div>
<%= styled_form_with model: @user, class: "space-y-4", data: { controller: "auto-submit-form" } do |form| %>
@@ -34,7 +34,7 @@
{ label: t(".country") },
{ data: { auto_submit_form_target: "auto" } } %>
- <p class="text-xs italic pl-2 text-gray-500">Please note, we are still working on translations for various languages. Please see the <%= link_to "I18n issue", "https://github.com/maybe-finance/maybe/issues/1225", target: "_blank", class: "underline" %> for more information.</p>
+ <p class="text-xs italic pl-2 text-secondary">Please note, we are still working on translations for various languages. Please see the <%= link_to "I18n issue", "https://github.com/maybe-finance/maybe/issues/1225", target: "_blank", class: "underline" %> for more information.</p>
<% end %>
<% end %>
</div>
diff --git a/app/views/settings/profiles/show.html.erb b/app/views/settings/profiles/show.html.erb
index 7fa30dd1..95c248bf 100644
--- a/app/views/settings/profiles/show.html.erb
+++ b/app/views/settings/profiles/show.html.erb
@@ -2,7 +2,7 @@
<%= render "settings/nav" %>
<% end %>
<div class="space-y-4">
- <h1 class="text-gray-900 text-xl font-medium mb-4"><%= t(".page_title") %></h1>
+ <h1 class="text-primary text-xl font-medium mb-4"><%= t(".page_title") %></h1>
<div class="space-y-4">
<%= settings_section title: t(".profile_title"), subtitle: t(".profile_subtitle") do %>
<%= styled_form_with model: @user, url: user_path(@user), class: "space-y-4" do |form| %>
@@ -38,16 +38,16 @@
<% end %>
<div class="bg-gray-25 rounded-xl p-1">
<div class="px-4 py-2">
- <p class="uppercase text-xs text-gray-500 font-medium"><%= Current.family.name %> &middot; <%= Current.family.users.size %></p>
+ <p class="uppercase text-xs text-secondary font-medium"><%= Current.family.name %> &middot; <%= Current.family.users.size %></p>
</div>
<% @users.each do |user| %>
<div class="flex gap-2 items-center bg-white p-4 border border-alpha-black-25 rounded-lg">
<div class="w-9 h-9 shrink-0">
<%= render "settings/user_avatar", user: user %>
</div>
- <p class="text-gray-900 font-medium text-sm"><%= user.display_name %></p>
+ <p class="text-primary font-medium text-sm"><%= user.display_name %></p>
<div class="rounded-md bg-gray-100 px-1.5 py-0.5">
- <p class="uppercase text-gray-500 font-medium text-xs"><%= user.role %></p>
+ <p class="uppercase text-secondary font-medium text-xs"><%= user.role %></p>
</div>
<% if Current.user.admin? && user != Current.user %>
<div class="ml-auto">
@@ -74,23 +74,23 @@
<div class="text-white w-full h-full bg-gray-400 rounded-full flex items-center justify-center text-lg uppercase"><%= invitation.email[0] %></div>
</div>
<div class="flex">
- <p class="text-gray-900 font-medium text-sm"><%= invitation.email %></p>
+ <p class="text-primary font-medium text-sm"><%= invitation.email %></p>
<div class="rounded-md bg-gray-100 px-1.5 py-0.5">
- <p class="uppercase text-gray-500 font-medium text-xs"><%= t(".pending") %></p>
+ <p class="uppercase text-secondary font-medium text-xs"><%= t(".pending") %></p>
</div>
</div>
</div>
<div class="flex items-center gap-4">
<% if self_hosted? %>
<div class="flex items-center gap-2" data-controller="clipboard">
- <p class="text-gray-500 text-sm"><%= t(".invitation_link") %></p>
+ <p class="text-secondary text-sm"><%= t(".invitation_link") %></p>
<span data-clipboard-target="source" class="hidden"><%= accept_invitation_url(invitation.token) %></span>
<input type="text"
readonly
autocomplete="off"
value="<%= accept_invitation_url(invitation.token) %>"
class="text-sm bg-gray-50 px-2 py-1 rounded border border-gray-200 w-72">
- <button data-action="clipboard#copy" class="text-gray-500 hover:text-gray-700">
+ <button data-action="clipboard#copy" class="text-secondary hover:text-gray-700">
<span data-clipboard-target="iconDefault">
<%= lucide_icon "copy", class: "w-5 h-5" %>
</span>
@@ -119,9 +119,9 @@
<% end %>
<% if Current.user.admin? %>
<%= link_to new_invitation_path,
- class: "bg-gray-100 flex items-center justify-center gap-2 text-gray-500 mt-1 hover:bg-gray-200 rounded-lg px-4 py-2 w-full text-center",
+ class: "bg-gray-100 flex items-center justify-center gap-2 text-secondary mt-1 hover:bg-gray-200 rounded-lg px-4 py-2 w-full text-center",
data: { turbo_frame: :modal } do %>
- <%= lucide_icon("plus", class: "w-5 h-5 text-gray-500") %>
+ <%= lucide_icon("plus", class: "w-5 h-5 text-secondary") %>
<%= t(".invite_member") %>
<% end %>
<% end %>
@@ -131,8 +131,8 @@
<%= settings_section title: t(".danger_zone_title") do %>
<div class="flex items-center justify-between">
<div>
- <h3 class="font-medium text-gray-900"><%= t(".delete_account") %></h3>
- <p class="text-gray-500 text-sm"><%= t(".delete_account_warning") %></p>
+ <h3 class="font-medium text-primary"><%= t(".delete_account") %></h3>
+ <p class="text-secondary text-sm"><%= t(".delete_account_warning") %></p>
</div>
<%=
button_to t(".delete_account"), user_path(@user), method: :delete,
diff --git a/app/views/settings/securities/show.html.erb b/app/views/settings/securities/show.html.erb
index 9dbee9a2..423f083d 100644
--- a/app/views/settings/securities/show.html.erb
+++ b/app/views/settings/securities/show.html.erb
@@ -3,22 +3,22 @@
<% end %>
<div class="space-y-4">
- <h1 class="text-gray-900 text-xl font-medium mb-4"><%= t(".page_title") %></h1>
+ <h1 class="text-primary text-xl font-medium mb-4"><%= t(".page_title") %></h1>
<%= settings_section title: t(".mfa_title"), subtitle: t(".mfa_description") do %>
<div class="space-y-4">
- <div class="p-3 shadow-xs bg-white border border-alpha-black-200 rounded-lg flex justify-between items-center">
+ <div class="p-3 shadow-xs bg-white border border-secondary rounded-lg flex justify-between items-center">
<div class="flex items-center gap-3">
<div class="w-9 h-9 rounded-full bg-gray-25 flex justify-center items-center">
- <%= lucide_icon "shield-check", class: "w-5 h-5 text-gray-500" %>
+ <%= lucide_icon "shield-check", class: "w-5 h-5 text-secondary" %>
</div>
<div class="text-sm space-y-1">
<% if Current.user.otp_required? %>
- <p class="text-gray-900">Two-factor authentication is <span class="font-medium text-green-600">enabled</span></p>
- <p class="text-gray-500">Your account is protected with an additional layer of security.</p>
+ <p class="text-primary">Two-factor authentication is <span class="font-medium text-green-600">enabled</span></p>
+ <p class="text-secondary">Your account is protected with an additional layer of security.</p>
<% else %>
- <p class="text-gray-900">Two-factor authentication is <span class="font-medium text-red-600">disabled</span></p>
- <p class="text-gray-500">Enable 2FA to add an extra layer of security to your account.</p>
+ <p class="text-primary">Two-factor authentication is <span class="font-medium text-red-600">disabled</span></p>
+ <p class="text-secondary">Enable 2FA to add an extra layer of security to your account.</p>
<% end %>
</div>
</div>
@@ -42,4 +42,4 @@
<% end %>
<%= settings_nav_footer %>
-</div>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/app/views/shared/_app_version.html.erb b/app/views/shared/_app_version.html.erb
index 0632359e..eb743277 100644
--- a/app/views/shared/_app_version.html.erb
+++ b/app/views/shared/_app_version.html.erb
@@ -1,6 +1,6 @@
<div class="flex items-center py-0.5 px-0.5 gap-1 fixed bottom-2 right-2 shadow-xs border border-alpha-black-50 rounded-md bg-white">
- <p class="text-xs text-gray-500 pl-2">Version: <%= Maybe.version.to_release_tag %></p>
+ <p class="text-xs text-secondary pl-2">Version: <%= Maybe.version.to_release_tag %></p>
<%= link_to settings_hosting_path, class: "flex gap-1 items-center hover:bg-gray-50 rounded-md p-2" do %>
- <%= lucide_icon("settings", class: "w-4 h-4 text-gray-500 shrink-0") %>
+ <%= lucide_icon("settings", class: "w-4 h-4 text-secondary shrink-0") %>
<% end %>
</div>
diff --git a/app/views/shared/_confirm_modal.html.erb b/app/views/shared/_confirm_modal.html.erb
index be42325a..eb1ca925 100644
--- a/app/views/shared/_confirm_modal.html.erb
+++ b/app/views/shared/_confirm_modal.html.erb
@@ -4,10 +4,10 @@
<div class="flex justify-between mb-2 gap-4">
<h3 id="turbo-confirm-title" class="font-medium text-md"><%= t(".title") %></h3>
<button value="cancel">
- <%= lucide_icon("x", class: "w-5 h-5 shrink-0 text-gray-500") %>
+ <%= lucide_icon("x", class: "w-5 h-5 shrink-0 text-secondary") %>
</button>
</div>
- <div id="turbo-confirm-body" class="text-gray-500 text-sm">
+ <div id="turbo-confirm-body" class="text-secondary text-sm">
<%= t(".body_html") %>
</div>
</div>
diff --git a/app/views/shared/_disclosure.html.erb b/app/views/shared/_disclosure.html.erb
index f615f168..b0d57a81 100644
--- a/app/views/shared/_disclosure.html.erb
+++ b/app/views/shared/_disclosure.html.erb
@@ -2,10 +2,10 @@
<details class="group space-y-2" <%= "open" if open %>>
<summary class="flex list-none items-center justify-between rounded-xl px-3 py-2 text-xs font-medium
- uppercase text-gray-500 bg-gray-25 focus-visible:outline-hidden">
+ uppercase text-secondary bg-gray-25 focus-visible:outline-hidden">
<h3><%= title %></h3>
<%= lucide_icon "chevron-down",
- class: "group-open:transform group-open:rotate-180 text-gray-500 w-5 h-5" %>
+ class: "group-open:transform group-open:rotate-180 text-secondary w-5 h-5" %>
</summary>
<%= content %>
diff --git a/app/views/shared/_icon.html.erb b/app/views/shared/_icon.html.erb
index 0e475933..82f999de 100644
--- a/app/views/shared/_icon.html.erb
+++ b/app/views/shared/_icon.html.erb
@@ -1,6 +1,6 @@
<%# locals: (key:, size: "md", color: "current") %>
<% size_class = case size when "sm" then "w-4 h-4" when "md" then "w-5 h-5" when "lg" then "w-6 h-6" end %>
-<% color_class = case color when "current" then "text-current" when "gray" then "text-gray-500" end %>
+<% color_class = case color when "current" then "text-current" when "gray" then "text-secondary" end %>
<%= lucide_icon key, class: class_names(size_class, color_class, "shrink-0") %>
diff --git a/app/views/shared/_line_chart.html.erb b/app/views/shared/_line_chart.html.erb
index d72f5564..0b58aa99 100644
--- a/app/views/shared/_line_chart.html.erb
+++ b/app/views/shared/_line_chart.html.erb
@@ -7,6 +7,6 @@
data-time-series-chart-data-value="<%= series.to_json %>"></div>
<% else %>
<div class="w-full h-full flex items-center justify-center">
- <p class="text-gray-500">No data available for the selected period.</p>
+ <p class="text-secondary">No data available for the selected period.</p>
</div>
<% end %>
diff --git a/app/views/shared/_list_group.html.erb b/app/views/shared/_list_group.html.erb
index 526bb503..c019740f 100644
--- a/app/views/shared/_list_group.html.erb
+++ b/app/views/shared/_list_group.html.erb
@@ -1,6 +1,6 @@
<%# locals: (header:, content:) %>
<div class="bg-gray-25 rounded-xl p-1 w-full">
- <div class="py-2 px-4 flex items-center justify-between font-medium text-xs text-gray-500">
+ <div class="py-2 px-4 flex items-center justify-between font-medium text-xs text-secondary">
<%= header %>
</div>
<div class="bg-white shadow-xs rounded-md border border-alpha-black-25 divide-y divide-alpha-black-50">
diff --git a/app/views/shared/_modal_form.html.erb b/app/views/shared/_modal_form.html.erb
index 11b8d26a..a3d5456b 100644
--- a/app/views/shared/_modal_form.html.erb
+++ b/app/views/shared/_modal_form.html.erb
@@ -5,11 +5,11 @@
<div class="space-y-2">
<header class="flex justify-between items-center">
<h2 class="font-medium"><%= title %></h2>
- <%= lucide_icon("x", class: "cursor-pointer w-5 h-5 text-gray-500", data: { action: "click->modal#close" }) %>
+ <%= lucide_icon("x", class: "cursor-pointer w-5 h-5 text-secondary", data: { action: "click->modal#close" }) %>
</header>
<% if subtitle.present? %>
- <%= tag.p subtitle, class: "text-gray-500 font-light" %>
+ <%= tag.p subtitle, class: "text-secondary font-light" %>
<% end %>
</div>
diff --git a/app/views/shared/_money_field.html.erb b/app/views/shared/_money_field.html.erb
index a2db645c..ea3273ad 100644
--- a/app/views/shared/_money_field.html.erb
+++ b/app/views/shared/_money_field.html.erb
@@ -17,7 +17,7 @@
<div class="flex items-center gap-1">
<div class="flex items-center grow gap-1">
- <span class="text-gray-500 text-sm" data-money-field-target="symbol">
+ <span class="text-secondary text-sm" data-money-field-target="symbol">
<%= currency.symbol %>
</span>
@@ -47,7 +47,7 @@
currencies_for_select.map(&:iso_code),
{ inline: true, selected: currency_value },
{
- class: "w-fit pr-5 disabled:text-gray-400 form-field__input",
+ class: "w-fit pr-5 disabled:text-subdued form-field__input",
disabled: options[:disable_currency],
data: {
"money-field-target": "currency",
diff --git a/app/views/shared/_no_account_empty_state.html.erb b/app/views/shared/_no_account_empty_state.html.erb
index cfb79003..0fc0b00c 100644
--- a/app/views/shared/_no_account_empty_state.html.erb
+++ b/app/views/shared/_no_account_empty_state.html.erb
@@ -1,10 +1,10 @@
<div class="flex justify-center items-center h-[800px]">
<div class="text-center flex flex-col gap-4 items-center max-w-[300px]">
- <%= lucide_icon "layers", class: "w-6 h-6 text-gray-500" %>
+ <%= lucide_icon "layers", class: "w-6 h-6 text-secondary" %>
<div class="space-y-1 text-sm">
- <p class="text-gray-900 font-medium"><%= t(".no_account_title") %></p>
- <p class="text-gray-500"><%= t(".no_account_subtitle") %></p>
+ <p class="text-primary font-medium"><%= t(".no_account_title") %></p>
+ <p class="text-secondary"><%= t(".no_account_subtitle") %></p>
</div>
<%= link_to new_account_path, class: "btn btn--primary flex items-center gap-1", data: { turbo_frame: "modal" } do %>
diff --git a/app/views/shared/_notification.html.erb b/app/views/shared/_notification.html.erb
index 2ee020bc..3e01536d 100644
--- a/app/views/shared/_notification.html.erb
+++ b/app/views/shared/_notification.html.erb
@@ -22,7 +22,7 @@
<% end %>
</div>
- <%= tag.p message, class: "text-gray-900 text-sm font-medium" %>
+ <%= tag.p message, class: "text-primary text-sm font-medium" %>
<div class="ml-auto">
<% if type.to_sym == :notice %>
@@ -32,11 +32,11 @@
<circle class="origin-center -rotate-90 animate-[stroke-fill_2.2s_300ms_forwards]" stroke="#141414" stroke-opacity="0.4" r="7.2" cx="10" cy="10" stroke-dasharray="43.9822971503" stroke-dashoffset="43.9822971503" />
</svg>
<div class="absolute -top-2 -right-2">
- <%= lucide_icon "x", class: "w-5 h-5 p-0.5 hidden group-hover:inline-block border border-alpha-black-50 border-solid rounded-lg bg-white text-gray-400 cursor-pointer", data: { action: "click->element-removal#remove" } %>
+ <%= lucide_icon "x", class: "w-5 h-5 p-0.5 hidden group-hover:inline-block border border-alpha-black-50 border-solid rounded-lg bg-white text-subdued cursor-pointer", data: { action: "click->element-removal#remove" } %>
</div>
</div>
<% elsif type.to_sym == :alert %>
- <%= lucide_icon "x", data: { action: "click->element-removal#remove" }, class: "w-5 h-5 text-gray-500 hover:text-gray-600 cursor-pointer" %>
+ <%= lucide_icon "x", data: { action: "click->element-removal#remove" }, class: "w-5 h-5 text-secondary hover:text-gray-600 cursor-pointer" %>
<% end %>
</div>
<% end %>
diff --git a/app/views/shared/_subscribe_modal.html.erb b/app/views/shared/_subscribe_modal.html.erb
index 6f0e6ed6..a7b16082 100644
--- a/app/views/shared/_subscribe_modal.html.erb
+++ b/app/views/shared/_subscribe_modal.html.erb
@@ -8,9 +8,9 @@
<%= image_tag "maybe-plus-logo.png", class: "w-20" %>
</div>
- <h2 class="font-medium text-gray-900 mb-2">Join Maybe+</h2>
+ <h2 class="font-medium text-primary mb-2">Join Maybe+</h2>
- <div class="text-gray-500 text-sm space-y-4 mb-5">
+ <div class="text-secondary text-sm space-y-4 mb-5">
<p>Nobody likes paywalls, but we need feedback from users willing to pay for Maybe. </p>
<p>To continue using the app, please subscribe. In this early beta testing phase, we require that you upgrade within one hour to claim your spot.</p>
diff --git a/app/views/shared/_syncing_notice.html.erb b/app/views/shared/_syncing_notice.html.erb
index 5500dbc8..791a265b 100644
--- a/app/views/shared/_syncing_notice.html.erb
+++ b/app/views/shared/_syncing_notice.html.erb
@@ -1,7 +1,7 @@
<%= tag.div id: "syncing-notice", class: "flex gap-3 rounded-lg border bg-white p-4 group max-w-80 shadow-xs border-alpha-black-25" do %>
<div class="h-5 w-5 shrink-0 p-px text-white">
- <%= lucide_icon "loader", class: "w-5 h-5 text-gray-500 animate-pulse" %>
+ <%= lucide_icon "loader", class: "w-5 h-5 text-secondary animate-pulse" %>
</div>
- <%= tag.p t(".syncing"), class: "text-gray-900 text-sm font-medium" %>
+ <%= tag.p t(".syncing"), class: "text-primary text-sm font-medium" %>
<% end %>
diff --git a/app/views/shared/_upgrade_notification.html.erb b/app/views/shared/_upgrade_notification.html.erb
index d285d678..e8bddf0b 100644
--- a/app/views/shared/_upgrade_notification.html.erb
+++ b/app/views/shared/_upgrade_notification.html.erb
@@ -1,15 +1,15 @@
<%# locals: (upgrade:) %>
-<div class="bg-white space-y-4 text-right fixed bottom-10 right-10 p-5 border border-alpha-black-200 shadow-xs rounded-md z-50 max-w-[350px]">
+<div class="bg-white space-y-4 text-right fixed bottom-10 right-10 p-5 border border-secondary shadow-xs rounded-md z-50 max-w-[350px]">
<div>
<p><%= link_to upgrade.to_s, upgrade.url, class: "text-sm text-blue-500 underline hover:text-blue-700", target: "_blank" %></p>
<% if upgrade.complete? %>
- <p class="text-gray-900"><%= t(".app_upgraded", version: upgrade.to_s) %></p>
+ <p class="text-primary"><%= t(".app_upgraded", version: upgrade.to_s) %></p>
<% else %>
- <p class="text-gray-900"><%= t(".new_version_available") %></p>
+ <p class="text-primary"><%= t(".new_version_available") %></p>
<% end %>
</div>
<div class="flex justify-end items-center gap-2">
- <%= button_to t(".dismiss"), acknowledge_upgrade_path(upgrade.commit_sha), method: :post, class: "#{upgrade.complete? ? 'bg-gray-900 text-white' : 'bg-gray-100 text-gray-900'} text-sm font-bold p-2 rounded-lg" %>
+ <%= button_to t(".dismiss"), acknowledge_upgrade_path(upgrade.commit_sha), method: :post, class: "#{upgrade.complete? ? 'bg-gray-900 text-white' : 'bg-gray-100 text-primary'} text-sm font-bold p-2 rounded-lg" %>
<% if upgrade.available? %>
<%= button_to t(".upgrade_now"), deploy_upgrade_path(upgrade.commit_sha), method: :post, class: "bg-gray-900 hover:bg-gray-700 text-white font-medium text-sm p-2 rounded-lg" %>
<% end %>
diff --git a/app/views/shared/_value_heading.html.erb b/app/views/shared/_value_heading.html.erb
index fcdf384d..524b4754 100644
--- a/app/views/shared/_value_heading.html.erb
+++ b/app/views/shared/_value_heading.html.erb
@@ -1,7 +1,7 @@
<%# locals: (label:, period:, value:, trend:, size: "lg", is_percentage: false)%>
<div class="space-y-2">
- <p class="text-sm text-gray-500 font-medium"><%= label %></p>
- <p class="text-gray-900 -space-x-0.5">
+ <p class="text-sm text-secondary font-medium"><%= label %></p>
+ <p class="text-primary -space-x-0.5">
<% if value.is_a?(Money) %>
<span class="<%= size == "lg" ? "text-xl" : "text-lg" %> font-medium"><%= format_money value %></span>
<% else %>
@@ -9,13 +9,13 @@
<% end %>
</p>
<% if trend.nil? %>
- <p class="text-sm text-gray-500">Data not available for the selected period</p>
+ <p class="text-sm text-secondary">Data not available for the selected period</p>
<% elsif trend.direction.flat? %>
- <p class="text-sm text-gray-500">No change vs. prior period</p>
+ <p class="text-sm text-secondary">No change vs. prior period</p>
<% else %>
<div class="flex items-center gap-2">
<%= render partial: "shared/trend_change", locals: { trend: trend } %>
- <span class="text-sm text-gray-500"><%= period_label(period) %></span>
+ <span class="text-sm text-secondary"><%= period_label(period) %></span>
</div>
<% end %>
</div>
diff --git a/app/views/tags/_tag.html.erb b/app/views/tags/_tag.html.erb
index ed325d74..22a68f0a 100644
--- a/app/views/tags/_tag.html.erb
+++ b/app/views/tags/_tag.html.erb
@@ -3,13 +3,13 @@
<div id="<%= dom_id(tag) %>" class="flex justify-between items-center p-4 bg-white">
<div class="flex w-full items-center gap-2.5">
<%= render partial: "shared/color_avatar", locals: { name: tag.name, color: tag.color } %>
- <p class="text-gray-900 text-sm truncate">
+ <p class="text-primary text-sm truncate">
<%= tag.name %>
</p>
</div>
<div class="justify-self-end">
<%= contextual_menu do %>
- <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
+ <div class="w-48 p-1 text-sm leading-6 text-primary bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
<%= contextual_menu_modal_action_item t(".edit"), edit_tag_path(tag) %>
<% if tag.transactions.any? %>
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb
index 5ba44963..ea6c66d0 100644
--- a/app/views/tags/index.html.erb
+++ b/app/views/tags/index.html.erb
@@ -4,7 +4,7 @@
<section class="space-y-4">
<header class="flex items-center justify-between">
- <h1 class="text-gray-900 text-xl font-medium"><%= t(".tags") %></h1>
+ <h1 class="text-primary text-xl font-medium"><%= t(".tags") %></h1>
<%= link_to new_tag_path, class: "btn btn--primary flex items-center gap-1 justify-center", data: { turbo_frame: :modal } do %>
<%= lucide_icon "plus", class: "w-5 h-5" %>
@@ -15,9 +15,9 @@
<div class="bg-white shadow-xs border border-alpha-black-25 rounded-xl p-4">
<% if @tags.any? %>
<div class="rounded-xl bg-gray-25 space-y-1 p-1">
- <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-gray-500 uppercase">
+ <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-secondary uppercase">
<p><%= t(".tags") %></p>
- <span class="text-gray-400">&middot;</span>
+ <span class="text-subdued">&middot;</span>
<p><%= @tags.count %></p>
</div>
@@ -30,7 +30,7 @@
<% else %>
<div class="flex justify-center items-center py-20">
<div class="text-center flex flex-col items-center max-w-[300px]">
- <p class="text-gray-900 mb-1 font-medium text-sm"><%= t(".empty") %></p>
+ <p class="text-primary mb-1 font-medium text-sm"><%= t(".empty") %></p>
<%= link_to new_tag_path, class: "w-fit flex text-white text-sm font-medium items-center gap-1 bg-gray-900 rounded-lg p-2 pr-3", data: { turbo_frame: "modal" } do %>
<%= lucide_icon("plus", class: "w-5 h-5") %>
<span><%= t(".new") %></span>
diff --git a/app/views/transactions/_header.html.erb b/app/views/transactions/_header.html.erb
index 9577395c..1a53bf80 100644
--- a/app/views/transactions/_header.html.erb
+++ b/app/views/transactions/_header.html.erb
@@ -1,9 +1,9 @@
-<header class="flex justify-between items-center text-gray-900 font-medium">
+<header class="flex justify-between items-center text-primary font-medium">
<h1 class="text-xl">Transactions</h1>
<div class="flex items-center gap-5">
<div class="flex items-center gap-2">
<%= contextual_menu do %>
- <div class="w-48 p-1 text-sm leading-6 text-gray-900 bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
+ <div class="w-48 p-1 text-sm leading-6 text-primary bg-white shadow-lg shrink rounded-xl ring-1 ring-gray-900/5">
<%= contextual_menu_modal_action_item t(".edit_categories"), categories_path, icon: "shapes", turbo_frame: :_top %>
<%= contextual_menu_modal_action_item t(".edit_tags"), tags_path, icon: "tags", turbo_frame: :_top %>
<%= contextual_menu_modal_action_item t(".edit_merchants"), merchants_path, icon: "store", turbo_frame: :_top %>
@@ -12,8 +12,8 @@
<% end %>
<%= link_to new_import_path, class: "btn btn--outline flex items-center gap-2", data: { turbo_frame: "modal" } do %>
- <%= lucide_icon("download", class: "text-gray-500 w-4 h-4") %>
- <p class="text-sm font-medium text-gray-900"><%= t(".import") %></p>
+ <%= lucide_icon("download", class: "text-secondary w-4 h-4") %>
+ <p class="text-sm font-medium text-primary"><%= t(".import") %></p>
<% end %>
<%= link_to new_account_transaction_path, class: "rounded-lg bg-gray-900 text-white flex items-center gap-1 justify-center hover:bg-gray-700 px-3 py-2", data: { turbo_frame: :modal } do %>
diff --git a/app/views/transactions/_summary.html.erb b/app/views/transactions/_summary.html.erb
index 45f51acc..c0b1e4fe 100644
--- a/app/views/transactions/_summary.html.erb
+++ b/app/views/transactions/_summary.html.erb
@@ -1,18 +1,18 @@
<%# locals: (totals:) %>
<div class="grid grid-cols-3 bg-white rounded-xl border border-alpha-black-25 shadow-xs divide-x divide-alpha-black-100">
<div class="p-4 space-y-2">
- <p class="text-sm text-gray-500">Total transactions</p>
- <p class="text-gray-900 font-medium text-xl" id="total-transactions"><%= totals.count %></p>
+ <p class="text-sm text-secondary">Total transactions</p>
+ <p class="text-primary font-medium text-xl" id="total-transactions"><%= totals.count %></p>
</div>
<div class="p-4 space-y-2">
- <p class="text-sm text-gray-500">Income</p>
- <p class="text-gray-900 font-medium text-xl" id="total-income">
+ <p class="text-sm text-secondary">Income</p>
+ <p class="text-primary font-medium text-xl" id="total-income">
<%= format_money Money.new(totals.income_total, totals.currency) %>
</p>
</div>
<div class="p-4 space-y-2">
- <p class="text-sm text-gray-500">Expenses</p>
- <p class="text-gray-900 font-medium text-xl" id="total-expense">
+ <p class="text-sm text-secondary">Expenses</p>
+ <p class="text-primary font-medium text-xl" id="total-expense">
<%= format_money Money.new(totals.expense_total, totals.currency) %>
</p>
</div>
diff --git a/app/views/transactions/index.html.erb b/app/views/transactions/index.html.erb
index 54a6f44e..9e383f38 100644
--- a/app/views/transactions/index.html.erb
+++ b/app/views/transactions/index.html.erb
@@ -16,10 +16,10 @@
<% if @pagy.count > 0 %>
<div class="grow overflow-y-auto">
- <div class="grid grid-cols-12 bg-gray-25 rounded-xl px-5 py-3 text-xs uppercase font-medium text-gray-500 items-center mb-4">
+ <div class="grid grid-cols-12 bg-gray-25 rounded-xl px-5 py-3 text-xs uppercase font-medium text-secondary items-center mb-4">
<div class="pl-0.5 col-span-8 flex items-center gap-4">
<%= check_box_tag "selection_entry",
- class: "maybe-checkbox maybe-checkbox--light",
+ class: "checkbox checkbox--light",
data: { action: "bulk-select#togglePageSelection" } %>
<p>transaction</p>
</div>
diff --git a/app/views/transactions/searches/_form.html.erb b/app/views/transactions/searches/_form.html.erb
index 2e6ad04c..1200adc0 100644
--- a/app/views/transactions/searches/_form.html.erb
+++ b/app/views/transactions/searches/_form.html.erb
@@ -8,18 +8,18 @@
<div class="flex gap-2 mb-4">
<div class="grow">
<div class="flex items-center px-3 py-2 gap-2 border border-gray-200 rounded-lg focus-within:ring-gray-100 focus-within:border-gray-900">
- <%= lucide_icon("search", class: "w-5 h-5 text-gray-500") %>
+ <%= lucide_icon("search", class: "w-5 h-5 text-secondary") %>
<%= form.text_field :search,
placeholder: "Search transactions by name",
value: @q[:search],
- class: "form-field__input placeholder:text-sm placeholder:text-gray-500",
+ class: "form-field__input placeholder:text-sm placeholder:text-secondary",
"data-auto-submit-form-target": "auto" %>
</div>
</div>
<div data-controller="menu" class="relative">
<button id="transaction-filters-button" data-menu-target="button" type="button" class="btn btn--outline flex items-center gap-2">
- <%= lucide_icon("list-filter", class: "w-5 h-5 text-gray-500") %>
- <p class="text-sm font-medium text-gray-900">Filter</p>
+ <%= lucide_icon("list-filter", class: "w-5 h-5 text-secondary") %>
+ <p class="text-sm font-medium text-primary">Filter</p>
</button>
<%= render "transactions/searches/menu", form: form %>
diff --git a/app/views/transactions/searches/_menu.html.erb b/app/views/transactions/searches/_menu.html.erb
index e63029da..d2ea4911 100644
--- a/app/views/transactions/searches/_menu.html.erb
+++ b/app/views/transactions/searches/_menu.html.erb
@@ -4,13 +4,13 @@
id="transaction-filters-menu"
data-menu-target="content"
data-controller="tabs"
- data-tabs-active-class="bg-gray-25 text-gray-900"
+ data-tabs-active-class="bg-gray-25 text-primary"
data-tabs-default-tab-value="<%= get_default_transaction_search_filter[:key] %>"
- class="hidden absolute flex z-10 h-80 w-[540px] top-12 right-0 border border-alpha-black-100 bg-white rounded-lg shadow-xs">
- <div class="flex w-44 flex-col items-start p-3 text-sm font-medium text-gray-500 border-r border-r-alpha-black-100">
+ class="hidden absolute flex z-10 h-80 w-[540px] top-12 right-0 border border-tertiary bg-white rounded-lg shadow-xs">
+ <div class="flex w-44 flex-col items-start p-3 text-sm font-medium text-secondary border-r border-r-alpha-black-100">
<% transaction_search_filters.each do |filter| %>
<button
- class="flex text-gray-500 hover:bg-gray-25 items-center gap-2 px-3 rounded-md py-2 w-full"
+ class="flex text-secondary hover:bg-gray-25 items-center gap-2 px-3 rounded-md py-2 w-full"
type="button"
data-id="<%= filter[:key] %>"
data-tabs-target="btn"
@@ -38,7 +38,7 @@
</div>
<div>
- <%= button_tag type: "reset", data: { action: "menu#close" }, class: "py-2 px-3 bg-gray-50 rounded-lg text-sm text-gray-900 font-medium" do %>
+ <%= button_tag type: "reset", data: { action: "menu#close" }, class: "py-2 px-3 bg-gray-50 rounded-lg text-sm text-primary font-medium" do %>
<%= t(".cancel") %>
<% end %>
<%= form.submit t(".apply"), name: nil, class: "py-2 px-3 bg-gray-900 hover:bg-gray-700 rounded-lg text-sm text-white font-medium cursor-pointer" %>
diff --git a/app/views/transactions/searches/filters/_account_filter.html.erb b/app/views/transactions/searches/filters/_account_filter.html.erb
index 0c6a4669..04ec8fb2 100644
--- a/app/views/transactions/searches/filters/_account_filter.html.erb
+++ b/app/views/transactions/searches/filters/_account_filter.html.erb
@@ -2,7 +2,7 @@
<div data-controller="list-filter">
<div class="relative">
<input type="search" autocomplete="off" placeholder="Filter accounts" data-list-filter-target="input" data-action="input->list-filter#filter" class="block w-full border border-gray-200 rounded-md py-2 pl-10 pr-3 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm">
- <%= lucide_icon("search", class: "w-5 h-5 text-gray-500 absolute inset-y-0 left-2 top-1/2 transform -translate-y-1/2") %>
+ <%= lucide_icon("search", class: "w-5 h-5 text-secondary absolute inset-y-0 left-2 top-1/2 transform -translate-y-1/2") %>
</div>
<div class="my-2" id="list" data-list-filter-target="list">
<% Current.family.accounts.alphabetically.each do |account| %>
@@ -11,11 +11,11 @@
{
multiple: true,
checked: @q[:accounts]&.include?(account.name),
- class: "maybe-checkbox maybe-checkbox--light"
+ class: "checkbox checkbox--light"
},
account.name,
nil %>
- <%= form.label :accounts, account.name, value: account.name, class: "text-sm text-gray-900" %>
+ <%= form.label :accounts, account.name, value: account.name, class: "text-sm text-primary" %>
</div>
<% end %>
</div>
diff --git a/app/views/transactions/searches/filters/_badge.html.erb b/app/views/transactions/searches/filters/_badge.html.erb
index 53f0bb86..dbd94e0a 100644
--- a/app/views/transactions/searches/filters/_badge.html.erb
+++ b/app/views/transactions/searches/filters/_badge.html.erb
@@ -1,8 +1,8 @@
<%# locals: (param_key:, param_value:) %>
-<li class="flex items-center gap-1 text-sm border border-alpha-black-200 rounded-3xl p-1.5">
+<li class="flex items-center gap-1 text-sm border border-secondary rounded-3xl p-1.5">
<% if param_key == "start_date" || param_key == "end_date" %>
<div class="flex items-center gap-2">
- <%= lucide_icon "calendar", class: "w-5 h-5 text-gray-500" %>
+ <%= lucide_icon "calendar", class: "w-5 h-5 text-secondary" %>
<p>
<% if param_key == "start_date" %>
<%= t(".on_or_after", date: param_value) %>
@@ -13,7 +13,7 @@
</div>
<% elsif param_key == "search" %>
<div class="flex items-center gap-2">
- <%= lucide_icon "text", class: "w-5 h-5 text-gray-500" %>
+ <%= lucide_icon "text", class: "w-5 h-5 text-secondary" %>
<p><%= "\"#{param_value}\"".truncate(20) %></p>
</div>
<% elsif param_key == "accounts" %>
@@ -23,7 +23,7 @@
</div>
<% elsif param_key == "amount" %>
<div class="flex items-center gap-2">
- <%= lucide_icon "hash", class: "w-5 h-5 text-gray-500" %>
+ <%= lucide_icon "hash", class: "w-5 h-5 text-secondary" %>
<p><%= param_value %></p>
</div>
<% elsif param_key == "types" %>
@@ -45,6 +45,6 @@
method: :delete,
data: { turbo: false },
class: "flex items-center" do %>
- <%= lucide_icon "x", class: "w-4 h-4 text-gray-500" %>
+ <%= lucide_icon "x", class: "w-4 h-4 text-secondary" %>
<% end %>
</li>
diff --git a/app/views/transactions/searches/filters/_category_filter.html.erb b/app/views/transactions/searches/filters/_category_filter.html.erb
index 5212bbe4..d9a280e1 100644
--- a/app/views/transactions/searches/filters/_category_filter.html.erb
+++ b/app/views/transactions/searches/filters/_category_filter.html.erb
@@ -2,7 +2,7 @@
<div data-controller="list-filter">
<div class="relative">
<input type="search" autocomplete="off" placeholder="Filter category" data-list-filter-target="input" data-action="input->list-filter#filter" class="block w-full border border-gray-200 rounded-md py-2 pl-10 pr-3 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm">
- <%= lucide_icon("search", class: "w-5 h-5 text-gray-500 absolute inset-y-0 left-2 top-1/2 transform -translate-y-1/2") %>
+ <%= lucide_icon("search", class: "w-5 h-5 text-secondary absolute inset-y-0 left-2 top-1/2 transform -translate-y-1/2") %>
</div>
<div class="my-2" id="list" data-list-filter-target="list">
<% family_categories.each do |category| %>
@@ -11,11 +11,11 @@
{
multiple: true,
checked: @q[:categories]&.include?(category.name),
- class: "maybe-checkbox maybe-checkbox--light"
+ class: "checkbox checkbox--light"
},
category.name,
nil %>
- <%= form.label :categories, category.name, value: category.name, class: "text-sm text-gray-900 cursor-pointer" do %>
+ <%= form.label :categories, category.name, value: category.name, class: "text-sm text-primary cursor-pointer" do %>
<%= render partial: "categories/badge", locals: { category: category } %>
<% end %>
</div>
diff --git a/app/views/transactions/searches/filters/_merchant_filter.html.erb b/app/views/transactions/searches/filters/_merchant_filter.html.erb
index 33cfe068..9910134c 100644
--- a/app/views/transactions/searches/filters/_merchant_filter.html.erb
+++ b/app/views/transactions/searches/filters/_merchant_filter.html.erb
@@ -2,7 +2,7 @@
<div data-controller="list-filter">
<div class="relative">
<input type="search" autocomplete="off" placeholder="Filter merchants" data-list-filter-target="input" data-action="input->list-filter#filter" class="block w-full border border-gray-200 rounded-md py-2 pl-10 pr-3 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm">
- <%= lucide_icon("search", class: "w-5 h-5 text-gray-500 absolute inset-y-0 left-2 top-1/2 transform -translate-y-1/2") %>
+ <%= lucide_icon("search", class: "w-5 h-5 text-secondary absolute inset-y-0 left-2 top-1/2 transform -translate-y-1/2") %>
</div>
<div class="my-2" id="list" data-list-filter-target="list">
<% Current.family.merchants.alphabetically.each do |merchant| %>
@@ -11,11 +11,11 @@
{
multiple: true,
checked: @q[:merchants]&.include?(merchant.name),
- class: "maybe-checkbox maybe-checkbox--light"
+ class: "checkbox checkbox--light"
},
merchant.name,
nil %>
- <%= form.label :merchants, value: merchant.name, class: "text-sm text-gray-900 flex items-center gap-2" do %>
+ <%= form.label :merchants, value: merchant.name, class: "text-sm text-primary flex items-center gap-2" do %>
<%= circle_logo(merchant.name, hex: merchant.color, size: "sm") %>
<%= merchant.name %>
<% end %>
diff --git a/app/views/transactions/searches/filters/_tag_filter.html.erb b/app/views/transactions/searches/filters/_tag_filter.html.erb
index af86283a..0b9e9f14 100644
--- a/app/views/transactions/searches/filters/_tag_filter.html.erb
+++ b/app/views/transactions/searches/filters/_tag_filter.html.erb
@@ -2,7 +2,7 @@
<div data-controller="list-filter">
<div class="relative">
<input type="search" autocomplete="off" placeholder="Filter tags" data-list-filter-target="input" data-action="input->list-filter#filter" class="block w-full border border-gray-200 rounded-md py-2 pl-10 pr-3 focus:border-indigo-500 focus:ring-indigo-500 sm:text-sm">
- <%= lucide_icon("search", class: "w-5 h-5 text-gray-500 absolute inset-y-0 left-2 top-1/2 transform -translate-y-1/2") %>
+ <%= lucide_icon("search", class: "w-5 h-5 text-secondary absolute inset-y-0 left-2 top-1/2 transform -translate-y-1/2") %>
</div>
<div class="my-2" id="list" data-list-filter-target="list">
<% Current.family.tags.alphabetically.each do |tag| %>
@@ -11,11 +11,11 @@
{
multiple: true,
checked: @q[:tags]&.include?(tag.name),
- class: "maybe-checkbox maybe-checkbox--light"
+ class: "checkbox checkbox--light"
},
tag.name,
nil %>
- <%= form.label :tags, value: tag.name, class: "text-sm text-gray-900 flex items-center gap-2" do %>
+ <%= form.label :tags, value: tag.name, class: "text-sm text-primary flex items-center gap-2" do %>
<%= circle_logo(tag.name, hex: tag.color || Tag::UNCATEGORIZED_COLOR, size: "sm") %>
<%= tag.name %>
<% end %>
diff --git a/app/views/transactions/searches/filters/_type_filter.html.erb b/app/views/transactions/searches/filters/_type_filter.html.erb
index 5effc7e9..78288b2d 100644
--- a/app/views/transactions/searches/filters/_type_filter.html.erb
+++ b/app/views/transactions/searches/filters/_type_filter.html.erb
@@ -6,32 +6,32 @@
{
multiple: true,
checked: @q[:types]&.include?("income"),
- class: "maybe-checkbox maybe-checkbox--light"
+ class: "checkbox checkbox--light"
},
"income",
nil %>
- <%= form.label :types, t(".income"), value: "income", class: "text-sm text-gray-900" %>
+ <%= form.label :types, t(".income"), value: "income", class: "text-sm text-primary" %>
</div>
<div class="flex items-center gap-3" data-filter-name="expense">
<%= form.check_box :types,
{
multiple: true,
checked: @q[:types]&.include?("expense"),
- class: "maybe-checkbox maybe-checkbox--light"
+ class: "checkbox checkbox--light"
},
"expense",
nil %>
- <%= form.label :types, t(".expense"), value: "expense", class: "text-sm text-gray-900" %>
+ <%= form.label :types, t(".expense"), value: "expense", class: "text-sm text-primary" %>
</div>
<div class="flex items-center gap-3" data-filter-name="transfer">
<%= form.check_box :types,
{
multiple: true,
checked: @q[:types]&.include?("transfer"),
- class: "maybe-checkbox maybe-checkbox--light"
+ class: "checkbox checkbox--light"
},
"transfer",
nil %>
- <%= form.label :types, t(".transfer"), value: "transfer", class: "text-sm text-gray-900" %>
+ <%= form.label :types, t(".transfer"), value: "transfer", class: "text-sm text-primary" %>
</div>
</div>
diff --git a/app/views/transfers/_form.html.erb b/app/views/transfers/_form.html.erb
index a08cbcae..ba33db30 100644
--- a/app/views/transfers/_form.html.erb
+++ b/app/views/transfers/_form.html.erb
@@ -8,17 +8,17 @@
<section>
<fieldset class="bg-gray-50 rounded-lg p-1 grid grid-flow-col justify-stretch gap-x-2">
- <%= link_to new_account_transaction_path(nature: "expense"), data: { turbo_frame: :modal }, class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-gray-400" do %>
+ <%= link_to new_account_transaction_path(nature: "expense"), data: { turbo_frame: :modal }, class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-subdued" do %>
<%= lucide_icon "minus-circle", class: "w-5 h-5" %>
<%= tag.span t(".expense") %>
<% end %>
- <%= link_to new_account_transaction_path(nature: "income"), data: { turbo_frame: :modal }, class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-gray-400" do %>
+ <%= link_to new_account_transaction_path(nature: "income"), data: { turbo_frame: :modal }, class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-subdued" do %>
<%= lucide_icon "plus-circle", class: "w-5 h-5" %>
<%= tag.span t(".income") %>
<% end %>
- <%= tag.div class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-gray-400 bg-white text-gray-800 shadow-sm" do %>
+ <%= tag.div class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-subdued bg-white text-gray-800 shadow-sm" do %>
<%= lucide_icon "arrow-right-left", class: "w-5 h-5" %>
<%= tag.span t(".transfer") %>
<% end %>
diff --git a/app/views/transfers/_transfer.html.erb b/app/views/transfers/_transfer.html.erb
index 05b6c564..d891d509 100644
--- a/app/views/transfers/_transfer.html.erb
+++ b/app/views/transfers/_transfer.html.erb
@@ -1,11 +1,11 @@
<%# locals: (transfer:) %>
<%= turbo_frame_tag dom_id(transfer) do %>
- <div class="grid grid-cols-12 items-center text-gray-900 text-sm font-medium p-4">
+ <div class="grid grid-cols-12 items-center text-primary text-sm font-medium p-4">
<div class="pr-10 flex items-center gap-4 col-span-8">
<%= check_box_tag dom_id(transfer),
disabled: true,
- class: "maybe-checkbox maybe-checkbox--light" %>
+ class: "checkbox checkbox--light" %>
<div class="max-w-full">
<%= content_tag :div, class: ["flex items-center gap-2"] do %>
@@ -31,7 +31,7 @@
<%= button_to transfer_path(transfer, transfer: { status: "confirmed" }),
method: :patch,
- class: "text-gray-500 hover:text-gray-800 flex items-center justify-center",
+ class: "text-secondary hover:text-gray-800 flex items-center justify-center",
title: "Confirm match" do %>
<%= lucide_icon "check", class: "w-4 h-4 text-indigo-400 hover:text-indigo-600" %>
<% end %>
@@ -39,14 +39,14 @@
<%= button_to transfer_path(transfer, transfer: { status: "rejected" }),
method: :patch,
data: { turbo: false },
- class: "text-gray-500 hover:text-gray-800 flex items-center justify-center",
+ class: "text-secondary hover:text-gray-800 flex items-center justify-center",
title: "Reject match" do %>
- <%= lucide_icon "x", class: "w-4 h-4 text-gray-400 hover:text-gray-600" %>
+ <%= lucide_icon "x", class: "w-4 h-4 text-subdued hover:text-gray-600" %>
<% end %>
<% end %>
</div>
- <div class="text-gray-500 text-xs font-normal">
+ <div class="text-secondary text-xs font-normal">
<div class="flex items-center gap-1">
<%= link_to transfer.from_account.name, transfer.from_account, class: "hover:underline", data: { turbo_frame: "_top" } %>
<% if transfer.payment? %>
diff --git a/app/views/transfers/show.html.erb b/app/views/transfers/show.html.erb
index 393c8ccf..1b7e42e1 100644
--- a/app/views/transfers/show.html.erb
+++ b/app/views/transfers/show.html.erb
@@ -6,15 +6,15 @@
<%= format_money @transfer.amount_abs %>
</span>
- <span class="text-lg text-gray-500">
+ <span class="text-lg text-secondary">
<%= @transfer.amount_abs.currency.iso_code %>
</span>
</h3>
- <%= lucide_icon "arrow-left-right", class: "text-gray-500 mt-1 w-5 h-5" %>
+ <%= lucide_icon "arrow-left-right", class: "text-secondary mt-1 w-5 h-5" %>
</div>
- <span class="text-sm text-gray-500">
+ <span class="text-sm text-secondary">
<%= @transfer.name %>
</span>
</header>
@@ -22,10 +22,10 @@
<div class="space-y-2">
<!-- Overview Section -->
<%= disclosure t(".overview") do %>
- <div class="pb-4 px-3 pt-2 text-sm space-y-3 text-gray-900">
+ <div class="pb-4 px-3 pt-2 text-sm space-y-3 text-primary">
<div class="space-y-3">
<dl class="flex items-center gap-2 justify-between">
- <dt class="text-gray-500">From</dt>
+ <dt class="text-secondary">From</dt>
<dd class="flex items-center gap-2 font-medium">
<%= render "accounts/logo", account: @transfer.from_account, size: "sm" %>
<%= link_to @transfer.from_account.name, account_path(@transfer.from_account), data: { turbo_frame: "_top" } %>
@@ -33,12 +33,12 @@
</dl>
<dl class="flex items-center gap-2 justify-between">
- <dt class="text-gray-500">Date</dt>
+ <dt class="text-secondary">Date</dt>
<dd class="font-medium"><%= l(@transfer.outflow_transaction.entry.date, format: :long) %></dd>
</dl>
<dl class="flex items-center gap-2 justify-between">
- <dt class="text-gray-500">Amount</dt>
+ <dt class="text-secondary">Amount</dt>
<dd class="font-medium text-red-500"><%= format_money [email protected]_abs %></dd>
</dl>
</div>
@@ -47,7 +47,7 @@
<div class="space-y-3">
<dl class="flex items-center gap-2 justify-between">
- <dt class="text-gray-500">To</dt>
+ <dt class="text-secondary">To</dt>
<dd class="flex items-center gap-2 font-medium">
<%= render "accounts/logo", account: @transfer.to_account, size: "sm" %>
<%= link_to @transfer.to_account.name, account_path(@transfer.to_account), data: { turbo_frame: "_top" } %>
@@ -55,12 +55,12 @@
</dl>
<dl class="flex items-center gap-2 justify-between">
- <dt class="text-gray-500">Date</dt>
+ <dt class="text-secondary">Date</dt>
<dd class="font-medium"><%= l(@transfer.inflow_transaction.entry.date, format: :long) %></dd>
</dl>
<dl class="flex items-center gap-2 justify-between">
- <dt class="text-gray-500">Amount</dt>
+ <dt class="text-secondary">Amount</dt>
<dd class="font-medium text-green-500">+<%= format_money @transfer.amount_abs %></dd>
</dl>
</div>
@@ -88,15 +88,15 @@
<div class="pb-4">
<div class="flex items-center justify-between gap-2 p-3">
<div class="text-sm space-y-1">
- <h4 class="text-gray-900"><%= t(".delete_title") %></h4>
- <p class="text-gray-500"><%= t(".delete_subtitle") %></p>
+ <h4 class="text-primary"><%= t(".delete_title") %></h4>
+ <p class="text-secondary"><%= t(".delete_subtitle") %></p>
</div>
<%= button_to t(".delete"),
transfer_path(@transfer),
method: :delete,
class: "rounded-lg px-3 py-2 whitespace-nowrap text-red-500 text-sm
- font-medium border border-alpha-black-200",
+ font-medium border border-secondary",
data: { turbo_confirm: true, turbo_frame: "_top" } %>
</div>
</div>