From f4c674275085ff30a878e1aa6a5d982e777cdab4 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 4 Mar 2026 21:38:05 -0600 Subject: [PATCH 01/26] feat: add new logo --- specifyweb/frontend/static/img/favicon.svg | 13 ++- specifyweb/frontend/static/img/logo.svg | 23 +++++- specifyweb/frontend/static/img/short_logo.svg | 14 +++- .../frontend/static/img/splash_screen.svg | 79 ++++++++++++++++++- 4 files changed, 123 insertions(+), 6 deletions(-) diff --git a/specifyweb/frontend/static/img/favicon.svg b/specifyweb/frontend/static/img/favicon.svg index cb0e9e5c05c..51adb5d8da2 100644 --- a/specifyweb/frontend/static/img/favicon.svg +++ b/specifyweb/frontend/static/img/favicon.svg @@ -1 +1,12 @@ - \ No newline at end of file + + + + + + + + \ No newline at end of file diff --git a/specifyweb/frontend/static/img/logo.svg b/specifyweb/frontend/static/img/logo.svg index 539afd0c0c5..fce7df29723 100644 --- a/specifyweb/frontend/static/img/logo.svg +++ b/specifyweb/frontend/static/img/logo.svg @@ -1 +1,22 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/specifyweb/frontend/static/img/short_logo.svg b/specifyweb/frontend/static/img/short_logo.svg index a291adf8335..51adb5d8da2 100644 --- a/specifyweb/frontend/static/img/short_logo.svg +++ b/specifyweb/frontend/static/img/short_logo.svg @@ -1,2 +1,12 @@ - - \ No newline at end of file + + + + + + + + \ No newline at end of file diff --git a/specifyweb/frontend/static/img/splash_screen.svg b/specifyweb/frontend/static/img/splash_screen.svg index 6eb0597e0de..8c1708beba7 100644 --- a/specifyweb/frontend/static/img/splash_screen.svg +++ b/specifyweb/frontend/static/img/splash_screen.svg @@ -1,2 +1,77 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From e432df7f5dd14e483f03239d7b97924781c98e64 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 4 Mar 2026 21:51:17 -0600 Subject: [PATCH 02/26] feat: update colors --- .../Preferences/UserDefinitions.tsx | 22 +++++++++---------- specifyweb/frontend/templates/body.html | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/specifyweb/frontend/js_src/lib/components/Preferences/UserDefinitions.tsx b/specifyweb/frontend/js_src/lib/components/Preferences/UserDefinitions.tsx index 9b3b997ed3b..d9544e66344 100644 --- a/specifyweb/frontend/js_src/lib/components/Preferences/UserDefinitions.tsx +++ b/specifyweb/frontend/js_src/lib/components/Preferences/UserDefinitions.tsx @@ -344,7 +344,7 @@ export const userPreferenceDefinitions = { title: preferencesText.accentColor1(), requiresReload: false, visible: true, - defaultValue: '#ffcda3', + defaultValue: '#77AA49', renderer: ColorPickerPreferenceItem, container: 'label', }), @@ -352,7 +352,7 @@ export const userPreferenceDefinitions = { title: preferencesText.accentColor2(), requiresReload: false, visible: true, - defaultValue: '#ff9742', + defaultValue: '#618e39', renderer: ColorPickerPreferenceItem, container: 'label', }), @@ -360,7 +360,7 @@ export const userPreferenceDefinitions = { title: preferencesText.accentColor3(), requiresReload: false, visible: true, - defaultValue: '#ff811a', + defaultValue: '#618e39', renderer: ColorPickerPreferenceItem, container: 'label', }), @@ -368,7 +368,7 @@ export const userPreferenceDefinitions = { title: preferencesText.accentColor4(), requiresReload: false, visible: true, - defaultValue: '#d15e00', + defaultValue: '#344f1e', renderer: ColorPickerPreferenceItem, container: 'label', }), @@ -376,7 +376,7 @@ export const userPreferenceDefinitions = { title: preferencesText.accentColor5(), requiresReload: false, visible: true, - defaultValue: '#703200', + defaultValue: '#053100', renderer: ColorPickerPreferenceItem, container: 'label', }), @@ -396,7 +396,7 @@ export const userPreferenceDefinitions = { title: preferencesText.saveButtonColor(), requiresReload: false, visible: isLightMode, - defaultValue: '#ff811a', + defaultValue: '#77AA49', renderer: ColorPickerPreferenceItem, container: 'label', }), @@ -412,7 +412,7 @@ export const userPreferenceDefinitions = { title: preferencesText.warningButtonColor(), requiresReload: false, visible: isLightMode, - defaultValue: '#f97316', + defaultValue: '#5c8f2f', renderer: ColorPickerPreferenceItem, container: 'label', }), @@ -420,7 +420,7 @@ export const userPreferenceDefinitions = { title: preferencesText.infoButtonColor(), requiresReload: false, visible: isLightMode, - defaultValue: '#1d4ed8', + defaultValue: '#0074B5', renderer: ColorPickerPreferenceItem, container: 'label', }), @@ -457,7 +457,7 @@ export const userPreferenceDefinitions = { title: preferencesText.saveButtonColor(), requiresReload: false, visible: isDarkMode, - defaultValue: '#ff811a', + defaultValue: '#77AA49', renderer: ColorPickerPreferenceItem, container: 'label', }), @@ -473,7 +473,7 @@ export const userPreferenceDefinitions = { title: preferencesText.warningButtonColor(), requiresReload: false, visible: isDarkMode, - defaultValue: '#f97316', + defaultValue: '#77AA49', renderer: ColorPickerPreferenceItem, container: 'label', }), @@ -481,7 +481,7 @@ export const userPreferenceDefinitions = { title: preferencesText.infoButtonColor(), requiresReload: false, visible: isDarkMode, - defaultValue: '#1d4ed8', + defaultValue: '#0074B5', renderer: ColorPickerPreferenceItem, container: 'label', }), diff --git a/specifyweb/frontend/templates/body.html b/specifyweb/frontend/templates/body.html index 76ac4a6e037..c881c0ef89f 100644 --- a/specifyweb/frontend/templates/body.html +++ b/specifyweb/frontend/templates/body.html @@ -8,9 +8,9 @@ {% endif %} - + - + From 8ff6750dead0b92830d5a7397ada7f857b64e24b Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 4 Mar 2026 23:09:53 -0600 Subject: [PATCH 03/26] feat: colors --- .../js_src/lib/components/Header/index.tsx | 4 +- .../js_src/lib/components/HomePage/index.tsx | 8 +- .../Preferences/UserDefinitions.tsx | 8 +- specifyweb/frontend/js_src/tailwind.config.ts | 17 +++ specifyweb/frontend/static/img/logo.svg | 2 +- .../frontend/static/img/splash_screen.svg | 123 ++++++++++++------ 6 files changed, 111 insertions(+), 51 deletions(-) diff --git a/specifyweb/frontend/js_src/lib/components/Header/index.tsx b/specifyweb/frontend/js_src/lib/components/Header/index.tsx index 98923ab758c..41fe6946c23 100644 --- a/specifyweb/frontend/js_src/lib/components/Header/index.tsx +++ b/specifyweb/frontend/js_src/lib/components/Header/index.tsx @@ -99,7 +99,7 @@ export function Header({ return (
diff --git a/specifyweb/frontend/js_src/lib/components/HomePage/index.tsx b/specifyweb/frontend/js_src/lib/components/HomePage/index.tsx index ce31c82e59c..9bea5182fde 100644 --- a/specifyweb/frontend/js_src/lib/components/HomePage/index.tsx +++ b/specifyweb/frontend/js_src/lib/components/HomePage/index.tsx @@ -81,9 +81,15 @@ function DefaultSplashScreen(): JSX.Element { src={defaultWelcomePageImage} style={{ filter: `hue-rotate(${hueDifference}deg)` }} /> - {/* The two following gradients in the divs are here to apply a fade out effect on the image */} + {/* The following gradients in the divs are here to apply a fade out effect on the image */} + {/* Left fade */}
+ {/* Right fade */}
+ {/* Top fade */} +
+ {/* Bottom fade */} +
); } diff --git a/specifyweb/frontend/js_src/lib/components/Preferences/UserDefinitions.tsx b/specifyweb/frontend/js_src/lib/components/Preferences/UserDefinitions.tsx index d9544e66344..f162fd292c8 100644 --- a/specifyweb/frontend/js_src/lib/components/Preferences/UserDefinitions.tsx +++ b/specifyweb/frontend/js_src/lib/components/Preferences/UserDefinitions.tsx @@ -344,7 +344,7 @@ export const userPreferenceDefinitions = { title: preferencesText.accentColor1(), requiresReload: false, visible: true, - defaultValue: '#77AA49', + defaultValue: '#6b813d', renderer: ColorPickerPreferenceItem, container: 'label', }), @@ -352,7 +352,7 @@ export const userPreferenceDefinitions = { title: preferencesText.accentColor2(), requiresReload: false, visible: true, - defaultValue: '#618e39', + defaultValue: '#5a6d32', renderer: ColorPickerPreferenceItem, container: 'label', }), @@ -360,7 +360,7 @@ export const userPreferenceDefinitions = { title: preferencesText.accentColor3(), requiresReload: false, visible: true, - defaultValue: '#618e39', + defaultValue: '#4a5a29', renderer: ColorPickerPreferenceItem, container: 'label', }), @@ -368,7 +368,7 @@ export const userPreferenceDefinitions = { title: preferencesText.accentColor4(), requiresReload: false, visible: true, - defaultValue: '#344f1e', + defaultValue: 'rgb(43, 66, 25)', renderer: ColorPickerPreferenceItem, container: 'label', }), diff --git a/specifyweb/frontend/js_src/tailwind.config.ts b/specifyweb/frontend/js_src/tailwind.config.ts index 211b04eebc3..09930dddcdf 100644 --- a/specifyweb/frontend/js_src/tailwind.config.ts +++ b/specifyweb/frontend/js_src/tailwind.config.ts @@ -46,11 +46,19 @@ const config: Config = { colors: { // Specify brand colors brand: { + /* + TODO: Revert to variables 100: 'var(--accent-color-100)', 200: 'var(--accent-color-200)', 300: 'var(--accent-color-300)', 400: 'var(--accent-color-400)', 500: 'var(--accent-color-500)', + */ + 100: '#d4d8bf', + 200: '#a4af83', + 300: '#86965e', + 400: '#6b813d', + 500: '#596c32', }, // Some in-between shades: gray: { @@ -68,6 +76,15 @@ const config: Config = { neutral: { 350: 'hsl(0deg 0% 73%)', }, + blue: { + 100: '#0074B5', + }, + cream: { + 100: '#e0e2b9', + }, + brown: { + 100: '#4e3e32', + } }, spacing: { 'table-icon': '1.25rem', diff --git a/specifyweb/frontend/static/img/logo.svg b/specifyweb/frontend/static/img/logo.svg index fce7df29723..d5d772db23b 100644 --- a/specifyweb/frontend/static/img/logo.svg +++ b/specifyweb/frontend/static/img/logo.svg @@ -4,7 +4,7 @@ diff --git a/specifyweb/frontend/static/img/splash_screen.svg b/specifyweb/frontend/static/img/splash_screen.svg index 8c1708beba7..3bb8e768154 100644 --- a/specifyweb/frontend/static/img/splash_screen.svg +++ b/specifyweb/frontend/static/img/splash_screen.svg @@ -1,77 +1,114 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - + - - - + + + - - - + + + - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file From b05c5b37e46fa7737ba4f231aef0fe51da12faa1 Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Wed, 4 Mar 2026 23:17:21 -0600 Subject: [PATCH 04/26] feat: remove shadows --- .../frontend/js_src/lib/components/Atoms/className.ts | 2 +- .../frontend/js_src/lib/components/Attachments/Preview.tsx | 6 +++--- .../frontend/js_src/lib/components/Core/SplashScreen.tsx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/specifyweb/frontend/js_src/lib/components/Atoms/className.ts b/specifyweb/frontend/js_src/lib/components/Atoms/className.ts index 6a3b2fa6f25..5c7666bc98a 100644 --- a/specifyweb/frontend/js_src/lib/components/Atoms/className.ts +++ b/specifyweb/frontend/js_src/lib/components/Atoms/className.ts @@ -20,7 +20,7 @@ dark:text-gray-100`; const containerBaseUnstyled = `flex flex-col gap-4 overflow-scroll overflow-x-auto [overflow-y:overlay] [scrollbar-gutter:auto]`; const containerBase = `${containerBaseUnstyled} bg-[color:var(--form-foreground)] - rounded p-4 shadow-gray-400 shadow-2xl`; + rounded p-4 shadow-gray-400 outline outline-1 outline-gray-300 dark:outline-neutral-800`; const containerFull = 'flex flex-col gap-4 sm:h-full p-1 sm:p-4'; const formStyles = 'text-[length:var(--form-font-size)] font-[family-name:var(--form-font-family)]'; diff --git a/specifyweb/frontend/js_src/lib/components/Attachments/Preview.tsx b/specifyweb/frontend/js_src/lib/components/Attachments/Preview.tsx index 3a144df934a..e951178b407 100644 --- a/specifyweb/frontend/js_src/lib/components/Attachments/Preview.tsx +++ b/specifyweb/frontend/js_src/lib/components/Attachments/Preview.tsx @@ -21,9 +21,9 @@ export function AttachmentPreview({ return (
diff --git a/specifyweb/frontend/static/img/logo.svg b/specifyweb/frontend/static/img/logo.svg index d5d772db23b..4180aac0e2b 100644 --- a/specifyweb/frontend/static/img/logo.svg +++ b/specifyweb/frontend/static/img/logo.svg @@ -6,17 +6,21 @@ .st0 { fill: #74914a; } + + .st1 { + fill: #e1e1be; + } - + - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/specifyweb/frontend/static/img/logo_dark.svg b/specifyweb/frontend/static/img/logo_dark.svg new file mode 100644 index 00000000000..62e48c0856c --- /dev/null +++ b/specifyweb/frontend/static/img/logo_dark.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file From ddb664618051ed62528100fcaf74101a48fc892e Mon Sep 17 00:00:00 2001 From: Grant Fitzsimmons <37256050+grantfitzsimmons@users.noreply.github.com> Date: Thu, 5 Mar 2026 11:31:00 -0600 Subject: [PATCH 17/26] Update DataEntry.test.ts.snap --- .../Atoms/__tests__/__snapshots__/DataEntry.test.ts.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specifyweb/frontend/js_src/lib/components/Atoms/__tests__/__snapshots__/DataEntry.test.ts.snap b/specifyweb/frontend/js_src/lib/components/Atoms/__tests__/__snapshots__/DataEntry.test.ts.snap index c3ad9fe904b..f7193fa8f71 100644 --- a/specifyweb/frontend/js_src/lib/components/Atoms/__tests__/__snapshots__/DataEntry.test.ts.snap +++ b/specifyweb/frontend/js_src/lib/components/Atoms/__tests__/__snapshots__/DataEntry.test.ts.snap @@ -106,7 +106,7 @@ exports[` renders without errors 5`] = `