Skip to content

Tailwind v4 upgrade #243

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
devmount merged 5 commits into from
Mar 17, 2025
Merged

Tailwind v4 upgrade #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b2d7f5
📦️ Dependency updates
devmount Mar 17, 2025
3cacf46
🔨 Specify gitignore frontend
devmount Mar 17, 2025
599c4fd
➕ Temp gitignore for upgrade
devmount Mar 17, 2025
881225e
📦️ Upgrade to Tailwindcss v4
devmount Mar 17, 2025
538cec7
🔨 Revert temporary gitignore
devmount Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8,245 changes: 3,620 additions & 4,625 deletions frontend/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

137 changes: 65 additions & 72 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,74 +1,67 @@
{
"name": "songdrive",
"description": "A song management tool to store, synchronize and present songs and setlists. Built with Vue.js and Firebase.",
"version": "3.1.4",
"license": "MIT",
"author": {
"name": "Andreas Müller",
"url": "https://devmount.de"
},
"repository": {
"type": "git",
"url": "https://github.com/devmount/SongDrive.git"
},
"homepage": "https://github.com/devmount/SongDrive",
"keywords": [
"firebase",
"firestore",
"music",
"song-management",
"vue",
"songs",
"setlists",
"presentation"
],
"bugs": "https://github.com/devmount/SongDrive/issues",
"browser": "./dist/index.html",
"scripts": {
"dev": "vite",
"build": "vite build",
"serve": "vite preview"
},
"dependencies": {
"@kyvg/vue3-notification": "^3.1.3",
"@tabler/icons-vue": "^3.3.0",
"@vuepic/vue-datepicker": "^11.0.0",
"@vueuse/core": "^12.3.0",
"@vueuse/math": "^12.3.0",
"@zip.js/zip.js": "^2.7.45",
"chart.js": "^4.0.1",
"date-fns": "^4.0.0",
"firebase": "^10.0.0",
"highlight.js": "^11.3.1",
"marked": "^15.0.6",
"marked-highlight": "^2.1.0",
"pdfmake": "^0.2.2",
"vue": "^3.2.37",
"vue-i18n": "^11.0.1",
"vue-prism-editor": "^2.0.0-alpha.2",
"vue-router": "^4.0.16",
"vue3-carousel": "^0.14.0",
"vuedraggable": "^4.1.0"
},
"devDependencies": {
"@tailwindcss/forms": "^0.5.10",
"@vitejs/plugin-vue": "^5.0.3",
"autoprefixer": "^10.4.13",
"postcss": "^8.4.20",
"tailwindcss": "^3.2.4",
"vite": "^6.0.7"
},
"postcss": {
"plugins": {
"tailwindcss": {},
"autoprefixer": {}
}
},
"browserslist": [
"> 1%",
"last 2 versions",
"not dead",
"not ie 11"
],
"type": "module"
"name": "songdrive",
"description": "A song management tool to store, synchronize and present songs and setlists. Built with Vue.js and Firebase.",
"version": "3.1.4",
"license": "MIT",
"author": {
"name": "Andreas Müller",
"url": "https://devmount.de"
},
"repository": {
"type": "git",
"url": "https://github.com/devmount/SongDrive.git"
},
"homepage": "https://github.com/devmount/SongDrive",
"keywords": [
"firebase",
"firestore",
"music",
"song-management",
"vue",
"songs",
"setlists",
"presentation"
],
"bugs": "https://github.com/devmount/SongDrive/issues",
"browser": "./dist/index.html",
"scripts": {
"dev": "vite",
"build": "vite build",
"serve": "vite preview"
},
"dependencies": {
"@kyvg/vue3-notification": "^3.1.3",
"@tabler/icons-vue": "^3.3.0",
"@vuepic/vue-datepicker": "^11.0.0",
"@vueuse/core": "^13.0.0",
"@vueuse/math": "^13.0.0",
"@zip.js/zip.js": "^2.7.45",
"chart.js": "^4.0.1",
"date-fns": "^4.0.0",
"firebase": "^10.0.0",
"highlight.js": "^11.3.1",
"marked": "^15.0.6",
"marked-highlight": "^2.1.0",
"pdfmake": "^0.2.2",
"vue": "^3.2.37",
"vue-i18n": "^11.0.1",
"vue-prism-editor": "^2.0.0-alpha.2",
"vue-router": "^4.0.16",
"vue3-carousel": "^0.14.0",
"vuedraggable": "^4.1.0"
},
"devDependencies": {
"@tailwindcss/vite": "^4.0.14",
"@tailwindcss/forms": "^0.5.10",
"@vitejs/plugin-vue": "^5.0.3",
"tailwindcss": "^4.0.14",
"vite": "^6.0.7"
},
"browserslist": [
"> 1%",
"last 2 versions",
"not dead",
"not ie 11"
],
"type": "module"
}
8 changes: 4 additions & 4 deletions frontend/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<!-- menu sidebar -->
<div
class="fixed shrink-0 -right-64 lg:left-0 lg:right-auto top-0 transition-all z-30 min-h-screen w-64 flex flex-col px-2 py-8 bg-blade-200 dark:bg-blade-900"
:class="{ '!right-0': open }"
:class="{ 'right-0!': open }"
>
<router-link :to="{ name: 'dashboard' }" class="flex flex-col w-max mx-auto mb-4 no-active">
<logo :featured="false" :show-version="true" />
Expand All @@ -45,7 +45,7 @@
<div v-if="ready.songs" class="font-bold">{{ Object.keys(c.songs).length }}</div>
<secondary-button
v-if="userRoles[c.permissions[auth.user].role] > 2"
class="!p-1"
class="p-1!"
:title="t('tooltip.songAdd')"
@click.stop.prevent="createNewSong"
>
Expand All @@ -64,7 +64,7 @@
<label v-if="ready.setlists" class="font-bold">{{ setlistCount }}</label>
<secondary-button
v-if="userRoles[c.permissions[auth.user].role] > 1"
class="!p-1"
class="p-1!"
:title="t('tooltip.setlistAdd')"
@click.stop.prevent="createNewSetlist"
>
Expand Down Expand Up @@ -206,7 +206,7 @@
<notifications position="bottom right" :duration="5000" width="">
<template #body="props">
<div
class="mb-1 mx-1 xs:mb-2 xs:mx-2 py-2 px-3 rounded-sm text-white"
class="mb-1 mx-1 xs:mb-2 xs:mx-2 py-2 px-3 rounded-xs text-white"
:class="{
'bg-spring-700': props.item.type === 'primary',
'bg-rose-700': props.item.type === 'error',
Expand Down
135 changes: 102 additions & 33 deletions frontend/src/assets/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,92 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@import 'tailwindcss';

@plugin '@tailwindcss/forms';

@custom-variant dark (&:is(.dark *));

@theme {
--font-*: initial;
--font-mono:
'Fira Mono', ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas,
'Liberation Mono', 'Courier New', monospace;
--font-fira:
'Fira Sans', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji',
'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';

--shadow-m: 0 4px 10px -4px rgb(0 0 0 / 0.5);
--shadow-l: 0 5px 20px -10px rgb(0 0 0 / 0.95);

--color-spring-400: #bbdd77;
--color-spring-600: #88b544;
--color-spring-700: #759b3b;

--color-zinc-750: #313137;
--color-zinc-850: #1f1f21;

--color-blade-50: #f9fafa;
--color-blade-100: #f4f5f6;
--color-blade-200: #e6e7ea;
--color-blade-300: #d3d6d9;
--color-blade-350: #bbbec3;
--color-blade-400: #a0a4ab;
--color-blade-500: #6f737b;
--color-blade-600: #50565e;
--color-blade-700: #3d434c;
--color-blade-750: #30343b;
--color-blade-800: #242a32;
--color-blade-850: #1e2229;
--color-blade-900: #161a22;
--color-blade-950: #0a0c0f;

--grid-template-columns-2\/1: minmax(0, 2fr) minmax(0, 1fr);

--container-3xs: 12rem;
--container-2xs: 16rem;

--breakpoint-2xs: 360px;
--breakpoint-xs: 480px;
--breakpoint-3xl: 1792px;

--height-2\/3v: 66.666667vh;
--height-3\/4v: 75vh;
--height-4\/5v: 80vh;

--stroke-width-10: 10;
--stroke-width-1_5: 1.5;
}

/*
The default border color has changed to `currentColor` in Tailwind CSS v4,
so we've added these compatibility styles to make sure everything still
looks the same as it did with Tailwind CSS v3.

If we ever want to remove these styles, we need to add an explicit border
color utility to any element that depends on these defaults.
*/
@layer base {
*,
::after,
::before,
::backdrop,
::file-selector-button {
border-color: var(--color-gray-200, currentColor);
}
}

@utility position-center {
/* centering absolute or fixed positioned elements */
@apply top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2;
}

@layer base {
input, select, textarea {
@apply transition-all !py-1.5 border-blade-400 dark:border-black focus:!ring-4 focus:!ring-spring-400/20 hover:!border-spring-400 focus:!border-spring-600 dark:!bg-blade-900 dark:!text-blade-100 hover:disabled:!border-black;
@apply transition-all py-1.5! border-blade-400 dark:border-black focus:ring-4! focus:ring-spring-400/20! hover:border-spring-400! focus:border-spring-600! dark:bg-blade-900! dark:text-blade-100! hover:disabled:border-black!;
}
button, a {
@apply transition-all;
@apply cursor-pointer transition-all;
}
kbd {
@apply font-mono rounded text-blade-600 dark:text-blade-200 bg-blade-300 dark:bg-blade-900 border border-b-4 border-blade-400 dark:border-blade-700 px-2 py-1
@apply font-mono rounded-sm text-blade-600 dark:text-blade-200 bg-blade-300 dark:bg-blade-900 border border-b-4 border-blade-400 dark:border-blade-700 px-2 py-1
}
th {
@apply text-left
Expand All @@ -23,13 +99,6 @@
}
}

@layer components {
/* centering absolute or fixed positioned elements */
.position-center {
@apply top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2;
}
}

/* generated router links */
.router-link-active:not(.no-active) {
@apply bg-blade-300 dark:bg-blade-800
Expand Down Expand Up @@ -72,7 +141,7 @@ kbd > * {
@apply text-spring-600 hover:text-white
}
.markdown code {
@apply rounded-sm bg-blade-750 px-1.5 py-0.5 text-sm
@apply rounded-xs bg-blade-750 px-1.5 py-0.5 text-sm
}
.markdown pre code {
@apply bg-blade-900 mb-4
Expand All @@ -86,7 +155,7 @@ kbd > * {

/* songdrive syntax and prism editor */
.language-songdrive {
@apply block !p-4
@apply block p-4!
}
.language-songdrive .sd-marker,
.prism-editor__editor .sd-marker {
Expand All @@ -105,31 +174,31 @@ kbd > * {
@apply transition-all p-1.5 border border-blade-400 dark:border-black focus:ring-4 focus:ring-spring-400/20 hover:border-spring-400 focus:border-spring-600 dark:bg-blade-900 dark:text-blade-100 hover:disabled:border-black;
}
.prism-editor__textarea {
@apply !p-0
@apply p-0!
}
.prism-editor__textarea:focus {
@apply outline-none
@apply outline-hidden
}

/* date picker */
.dp__theme_dark {
--dp-background-color: theme(colors.blade.900);
--dp-text-color: theme(colors.inherit);
--dp-hover-color: theme(colors.blade.700);
--dp-hover-text-color: theme(colors.white);
--dp-hover-icon-color: theme(colors.white);
--dp-primary-color: theme(colors.spring.600);
--dp-primary-text-color: theme(colors.white);
--dp-secondary-color: theme(colors.blade.500);
--dp-border-color: theme(colors.black);
--dp-menu-border-color: theme(colors.black);
--dp-icon-color: theme(colors.inherit);
--dp-background-color: var(--color-blade-900);
--dp-text-color: inherit;
--dp-hover-color: var(--color-blade-700);
--dp-hover-text-color: var(--color-white);
--dp-hover-icon-color: var(--color-white);
--dp-primary-color: var(--color-spring-600);
--dp-primary-text-color: var(--color-white);
--dp-secondary-color: var(--color-blade-500);
--dp-border-color: var(--color-black);
--dp-menu-border-color: var(--color-black);
--dp-icon-color: inherit;
}
.dp__theme_light {
--dp-text-color: theme(colors.inherit);
--dp-primary-color: theme(colors.spring.700);
--dp-primary-text-color: theme(colors.white);
--dp-icon-color: theme(colors.inherit);
--dp-text-color: inherit;
--dp-primary-color: var(--color-spring-700);
--dp-primary-text-color: var(--color-white);
--dp-icon-color: inherit;
}
.dp__menu,
.dp__calendar,
Expand All @@ -148,5 +217,5 @@ kbd > * {
}
.dp__cell_inner,
.dp__calendar_header_item {
@apply h-10 w-auto !rounded-sm
@apply h-10 w-auto rounded-xs!
}
2 changes: 1 addition & 1 deletion frontend/src/elements/Dropdown.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<transition-scale>
<div v-if="open" class="relative">
<div
class="absolute right-0 p-1 bg-blade-200 dark:bg-blade-900 z-10 w-max rounded-sm shadow-lg flex flex-col gap-1"
class="absolute right-0 p-1 bg-blade-200 dark:bg-blade-900 z-10 w-max rounded-xs shadow-lg flex flex-col gap-1"
:class="{
'top-0': !position || position === positions.down,
'bottom-10': position === positions.up,
Expand Down
Loading