Skip to content

Commit

Permalink
Bump tailwindcss from 3.4.17 to 4.0.0 (#2976)
Browse files Browse the repository at this point in the history
* Bump tailwindcss in the production-dependencies group across 1 directory

Bumps the production-dependencies group with 1 update in the / directory: [tailwindcss](https://github.com/tailwindlabs/tailwindcss/tree/HEAD/packages/tailwindcss).


Updates `tailwindcss` from 3.4.17 to 4.0.0
- [Release notes](https://github.com/tailwindlabs/tailwindcss/releases)
- [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/tailwindlabs/tailwindcss/commits/v4.0.0/packages/tailwindcss)

---
updated-dependencies:
- dependency-name: tailwindcss
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: production-dependencies
...

Signed-off-by: dependabot[bot] <[email protected]>

* Revert "Bump tailwindcss in the production-dependencies group across 1 directory"

This reverts commit 84b2907.

* fix properly migration

* cleaning up

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: ildyria <[email protected]>
  • Loading branch information
dependabot[bot] and ildyria authored Feb 1, 2025
1 parent 2834e86 commit c5c3957
Show file tree
Hide file tree
Showing 40 changed files with 674 additions and 2,217 deletions.
1,955 changes: 268 additions & 1,687 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
"@fortawesome/fontawesome-free": "^6.7.1",
"@primevue/themes": "^4.2.4",
"@sidsbrmnn/scrollspy": "^1.1.0",
"@tailwindcss/vite": "^4.0.3",
"@types/dropbox-chooser": "^1.0.8",
"@types/justified-layout": "^4.1.4",
"@vueuse/core": "^12.4.0",
"autoprefixer": "^10.4.19",
"axios": "^1.7.9",
"axios-cache-interceptor": "^1.5.3",
"justified-layout": "^4.1.0",
Expand All @@ -42,13 +42,12 @@
"leaflet-rotatedmarker": "^0.2.0",
"leaflet.markercluster": "^1.5.3",
"pinia": "^2.3.1",
"postcss": "^8.5.1",
"prettier": "^3.4.2",
"primeicons": "^7.0.0",
"primevue": "^4.2.5",
"qrcode": "^1.5.3",
"sprintf-js": "^1.1.3",
"tailwindcss": "^3.4.16",
"tailwindcss": "^4.0.0",
"tailwindcss-primeui": "^0.4.0",
"tinygesture": "^3.0.0",
"ts-loader": "^9.5.2",
Expand Down
7 changes: 0 additions & 7 deletions postcss.config.js

This file was deleted.

4 changes: 2 additions & 2 deletions resources/js/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { definePreset } from "@primevue/themes";
import LycheePrimeVueConfig from "./style/preset";
import FocusTrap from "primevue/focustrap";
import Tooltip from "primevue/tooltip";
import "../sass/app.scss";
import "../sass/app.css";

declare global {
var assets_url: string;
Expand Down Expand Up @@ -55,7 +55,7 @@ app.use(PrimeVue, {
// cssLayer: false,
cssLayer: {
name: "primevue",
order: "tailwind-base, primevue, tailwind-utilities",
order: "base, primevue",
},
darkModeSelector: ".dark",
},
Expand Down
7 changes: 5 additions & 2 deletions resources/js/components/drawers/PhotoDetails.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<template>
<aside
id="lychee_sidebar_container"
class="h-full relative transition-all overflow-x-clip overflow-y-scroll bg-bg-800"
:class="areDetailsOpen ? 'w-[380px]' : 'w-0 translate-x-full'"
:class="{
'h-full relative transition-all overflow-x-clip overflow-y-scroll bg-bg-800': true,
'w-[380px]': areDetailsOpen,
'w-0 translate-x-full': !areDetailsOpen,
}"
>
<Card id="lychee_sidebar" v-if="props.photo" class="w-[380px] h-full pr-4 break-words">
<template #content>
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/forms/album/AlbumCreateDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div class="inline-flex flex-col gap-2 px-9">
<FloatLabel variant="on">
<InputText id="title" v-model="title" />
<label class="" for="title">{{ $t("dialogs.new_album.title") }}</label>
<label for="title">{{ $t("dialogs.new_album.title") }}</label>
</FloatLabel>
</div>
<div class="flex items-center mt-9">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<Button
@click="create"
:disabled="!newShareUser"
class="font-bold w-full border-none rounded-none bg-surface text-create-600 hover:bg-create-600 hover:text-white rounded-br-xl"
class="font-bold w-full border-none rounded-none bg-transparent text-create-600 hover:bg-create-600 hover:text-white rounded-br-xl"
>
<i class="pi pi-user-plus" /><span class="hidden md:inline">{{ $t("sharing.share") }}</span>
</Button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div class="inline-flex flex-col gap-3 px-9">
<FloatLabel variant="on">
<InputText id="title" v-model="title" />
<label class="" for="title">{{ $t("dialogs.new_tag_album.title") }}</label>
<label for="title">{{ $t("dialogs.new_tag_album.title") }}</label>
</FloatLabel>
<FloatLabel variant="on">
<AutoComplete
Expand Down
4 changes: 2 additions & 2 deletions resources/js/components/forms/album/AlbumProperties.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<Card class="sm:p-4 xl:px-9 max-sm:w-full sm:min-w-[48rem] flex-shrink-0">
<Card class="sm:p-4 xl:px-9 max-sm:w-full sm:min-w-[48rem] shrink-0">
<template #content>
<form>
<div class="h-12">
Expand Down Expand Up @@ -266,7 +266,7 @@
<label for="tags">{{ $t("gallery.album.properties.show_tags") }}</label>
</FloatLabel>
</div>
<Button class="p-3 mt-4 w-full font-bold border-none flex-shrink" @click="save">
<Button class="p-3 mt-4 w-full font-bold border-none shrink" @click="save">
{{ $t("dialogs.button.save") }}
</Button>
</form>
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/forms/album/Unlock.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="inline-flex flex-col gap-2 px-9">
<FloatLabel variant="on">
<InputPassword id="albumPassword" v-model="password" @keydown.enter="unlock" />
<label class="" for="albumPassword">{{ $t("dialogs.unlock.password") }}</label>
<label for="albumPassword">{{ $t("dialogs.unlock.password") }}</label>
</FloatLabel>
</div>
<div class="flex items-center mt-9">
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/forms/profile/ApiToken.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<template v-else>
<span><i class="text-danger-600 pi pi-exclamation-triangle mr-2" />{{ $t("profile.token.warning") }}</span>
<InputText
class="flex-grow[4] bg-transparent w-full pt-1 pb-0 px-0.5 h-7 border-b border-b-solid focus:border-b-primary-500 disabled:italic disabled:text-center inline-block"
class="grow-4 bg-transparent w-full pt-1 pb-0 px-0.5 h-7 border-b border-b-solid focus:border-b-primary-500 disabled:italic disabled:text-center inline-block"
v-model="token"
:readonly="true"
/>
Expand Down
14 changes: 7 additions & 7 deletions resources/js/components/forms/profile/SetLogin.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</div>
<FloatLabel variant="on">
<InputPassword id="oldPassword" v-model="oldPassword" :invalid="!oldPassword && hasChanged" />
<label class="" for="oldPassword">{{ $t("profile.login.current_password") }}</label>
<label for="oldPassword">{{ $t("profile.login.current_password") }}</label>
</FloatLabel>
</div>
<div class="w-full mt-2">
Expand All @@ -21,15 +21,15 @@
</div>
<FloatLabel variant="on">
<InputText id="username" v-model="username" />
<label class="" for="username">{{ $t("profile.login.username") }}</label>
<label for="username">{{ $t("profile.login.username") }}</label>
</FloatLabel>
<FloatLabel class="mt-4" variant="on">
<InputPassword id="password" v-model="password" />
<label class="" for="password">{{ $t("profile.login.new_password") }}</label>
<label for="password">{{ $t("profile.login.new_password") }}</label>
</FloatLabel>
<FloatLabel class="mt-4" variant="on">
<InputPassword id="password_confirmation" v-model="password_confirmation" :invalid="password !== password_confirmation" />
<label class="" for="password_confirmation">{{ $t("profile.login.confirm_new_password") }}</label>
<label for="password_confirmation">{{ $t("profile.login.confirm_new_password") }}</label>
</FloatLabel>
</div>
<div class="w-full mt-2">
Expand All @@ -38,16 +38,16 @@
</div>
<FloatLabel variant="on">
<InputText id="email" v-model="email" />
<label class="" for="email">{{ $t("profile.login.email") }}</label>
<label for="email">{{ $t("profile.login.email") }}</label>
</FloatLabel>
</div>
<div class="flex w-full mt-4">
<Button severity="contrast" class="w-full font-bold border-none flex-shrink rounded-none rounded-bl-xl rounded-tl-xl" @click="save">
<Button severity="contrast" class="w-full font-bold border-none shrink rounded-none rounded-bl-xl rounded-tl-xl" @click="save">
{{ $t("profile.login.change") }}
</Button>
<Button
severity="secondary"
class="w-full font-bold border-none flex-shrink rounded-none rounded-br-xl rounded-tr-xl"
class="w-full font-bold border-none shrink rounded-none rounded-br-xl rounded-tr-xl"
@click="isApiTokenOpen = !isApiTokenOpen"
>
{{ $t("profile.login.api_token") }}
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/forms/profile/SetSecondFactor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<h1 class="p-3 text-center w-full">{{ $t("profile.u2f.not_secure") }}</h1>
</div>
<div class="w-full mt-4" v-if="!isWebAuthnUnavailable">
<Button class="border-0 bg-surface text-create-600 font-bold hover:bg-create-600 hover:text-white w-full" @click="register">
<Button class="border-0 bg-transparent text-create-600 font-bold hover:bg-create-600 hover:text-white w-full" @click="register">
{{ $t("profile.u2f.new") }}
</Button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions resources/js/components/forms/profile/SetSecondFactorLine.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<Button
v-if="isModified && !isInvalid"
@click="saveU2F"
class="border-0 text-primary-500 bg-surface hover:bg-primary-400 hover:text-white w-1/4"
class="border-0 text-primary-500 bg-transparent hover:bg-primary-400 hover:text-white w-1/4"
>
<i class="pi pi-save" /><span class="hidden md:inline">{{ $t("dialogs.button.save") }}</span></Button
>
<Button v-if="!isModified" @click="deleteU2F" class="border-0 bg-surface text-danger-600 hover:bg-danger-700 hover:text-white w-1/4">
<Button v-if="!isModified" @click="deleteU2F" class="border-0 bg-transparent text-danger-600 hover:bg-danger-700 hover:text-white w-1/4">
<i class="pi pi-trash" /><span class="hidden md:inline">{{ $t("dialogs.button.delete") }}</span></Button
>
</div>
Expand Down
14 changes: 11 additions & 3 deletions resources/js/components/forms/search/SearchBox.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<template>
<div
class="flex items-center justify-center w-full flex-wrap mt-5 mb-5 bg-none transition-all"
:class="search.length < props.searchMinimumLengh ? 'h-4/5' : ''"
:class="{
'flex items-center justify-center w-full flex-wrap mt-5 mb-5 bg-none transition-all': true,
'h-4/5': search.length < props.searchMinimumLengh,
}"
>
<div class="w-full flex items-center flex-wrap justify-center">
<div class="items-center relative text-right">
Expand All @@ -14,7 +16,13 @@
@updated="debouncedFn"
/>
</div>
<div class="items-center text-danger-700 w-full text-center" :class="!isValid ? 'opacity-100' : 'opacity-0'">
<div
:class="{
'items-center text-danger-700 w-full text-center': true,
'opacity-100': !isValid,
'opacity-0': isValid,
}"
>
{{ sprintf($t("gallery.search.minimum_chars"), props.searchMinimumLengh) }}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/forms/settings/StringField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}"
v-html="props.label ?? props.config.documentation"
/>
<FloatLabel class="w-full flex-grow">
<FloatLabel class="w-full grow">
<IconField>
<InputText :id="props.config.key" type="text" class="!py-1" v-model="val" @update:modelValue="update" />
<InputIcon
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/forms/sharing/CreateSharing.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<Checkbox v-model="grantsEdit" :binary="true" />
<Checkbox v-model="grantsDelete" :binary="true" />
</div>
<Button @click="create" :disabled="!newShareUser" class="border-0 bg-surface text-create-600 hover:bg-create-600 hover:text-white w-1/6">
<Button @click="create" :disabled="!newShareUser" class="border-0 bg-transparent text-create-600 hover:bg-create-600 hover:text-white w-1/6">
<i class="pi pi-user-plus" /><span class="hidden md:inline">{{ $t("sharing.share") }}</span>
</Button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/forms/sharing/ShareLine.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<Checkbox v-model="grantsEdit" :binary="true" @update:model-value="edit" />
<Checkbox v-model="grantsDelete" :binary="true" @update:model-value="edit" />
</div>
<Button @click="deletePermission" class="border-0 bg-surface text-danger-600 hover:bg-danger-700 hover:text-white w-1/6">
<Button @click="deletePermission" class="border-0 bg-transparent text-danger-600 hover:bg-danger-700 hover:text-white w-1/6">
<i class="pi pi-user-minus" /><span class="hidden md:inline">{{ $t("dialogs.button.delete") }}</span>
</Button>
</div>
Expand Down
6 changes: 3 additions & 3 deletions resources/js/components/forms/users/CreateEditUser.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<div class="p-9 w-full flex flex-col gap-2 justify-center">
<FloatLabel class="w-full" variant="on">
<InputText id="username" v-model="username" aria-label="Username" :autofocus="true" />
<label class="" for="username">{{ $t("users.username") }}</label>
<label for="username">{{ $t("users.username") }}</label>
</FloatLabel>
<FloatLabel class="w-full" variant="on">
<InputPassword id="password" v-model="password" aria-label="Password" />
<label class="" for="password">{{ $t("users.password") }}</label>
<label for="password">{{ $t("users.password") }}</label>
</FloatLabel>
<div class="w-full items-center text-muted-color">
<Checkbox inputId="mayUpload" v-model="may_upload" :binary="true" />
Expand Down Expand Up @@ -40,7 +40,7 @@
<Button
v-if="!props.isEdit"
@click="createUser"
class="w-full border-0 bg-surface text-create-600 hover:bg-create-600 hover:text-white rounded-none rounded-br-lg font-bold"
class="w-full border-0 bg-transparent text-create-600 hover:bg-create-600 hover:text-white rounded-none rounded-br-lg font-bold"
:disabled="username === undefined || password === undefined || username === '' || password === ''"
>
<i class="pi pi-user-plus" /><span class="hidden md:inline">{{ $t("users.create_edit.create") }}</span>
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/forms/users/ListUser.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</Button>
<Button
@click="deleteUser"
class="border-none bg-surface text-danger-600 hover:bg-danger-700 hover:text-white w-1/12 lg:w-2/12"
class="border-none bg-transparent text-danger-600 hover:bg-danger-700 hover:text-white w-1/12 lg:w-2/12"
:disabled="props.user.may_administrate"
>
<i class="pi pi-user-minus" /><span class="hidden md:inline">{{ $t("users.line.delete") }}</span></Button
Expand Down
12 changes: 6 additions & 6 deletions resources/js/components/gallery/AlbumHero.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,46 +31,46 @@
</div>
<a
v-if="props.album.rights.can_download"
class="flex-shrink-0 px-3 cursor-pointer text-muted-color inline-block transform duration-300 hover:scale-150 hover:text-color"
class="shrink-0 px-3 cursor-pointer text-muted-color inline-block transform duration-300 hover:scale-150 hover:text-color"
:title="$t('gallery.album.hero.download')"
@click="download"
>
<i class="pi pi-cloud-download" />
</a>
<a
v-if="props.album.rights.can_share"
class="flex-shrink-0 px-3 cursor-pointer text-muted-color inline-block transform duration-300 hover:scale-150 hover:text-color"
class="shrink-0 px-3 cursor-pointer text-muted-color inline-block transform duration-300 hover:scale-150 hover:text-color"
:title="$t('gallery.album.hero.share')"
v-on:click="openSharingModal"
>
<i class="pi pi-share-alt" />
</a>
<a
v-if="is_se_enabled && user?.id !== null"
class="flex-shrink-0 px-3 cursor-pointer inline-block transform duration-300 hover:scale-150 hover:text-color"
class="shrink-0 px-3 cursor-pointer inline-block transform duration-300 hover:scale-150 hover:text-color"
v-on:click="openStatistics"
>
<i class="pi pi-chart-scatter text-primary-emphasis" />
</a>
<a
v-if="is_se_preview_enabled && user?.id !== null"
class="flex-shrink-0 px-3 cursor-not-allowed text-primary-emphasis"
class="shrink-0 px-3 cursor-not-allowed text-primary-emphasis"
v-tooltip.left="$t('gallery.album.hero.stats_only_se')"
>
<i class="pi pi-chart-scatter" />
</a>
<template v-if="isTouchDevice() && user?.id !== null">
<a
v-if="props.hasHidden && lycheeStore.are_nsfw_visible"
class="flex-shrink-0 px-3 cursor-pointer text-muted-color inline-block transform duration-300 hover:scale-150 hover:text-color"
class="shrink-0 px-3 cursor-pointer text-muted-color inline-block transform duration-300 hover:scale-150 hover:text-color"
:title="'hide hidden'"
@click="lycheeStore.are_nsfw_visible = false"
>
<i class="pi pi pi-eye-slash" />
</a>
<a
v-if="props.hasHidden && !lycheeStore.are_nsfw_visible"
class="flex-shrink-0 px-3 cursor-pointer text-muted-color inline-block transform duration-300 hover:scale-150 hover:text-color"
class="shrink-0 px-3 cursor-pointer text-muted-color inline-block transform duration-300 hover:scale-150 hover:text-color"
:title="'show hidden'"
@click="lycheeStore.are_nsfw_visible = true"
>
Expand Down
6 changes: 3 additions & 3 deletions resources/js/components/gallery/AlbumThumbPanel.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<Panel v-if="props.isTimeline === false" :header="$t(props.header)" :toggleable="!isAlone" :pt:header:class="headerClass" class="border-0 w-full">
<div class="flex flex-wrap flex-row flex-shrink w-full justify-start gap-1 sm:gap-2 md:gap-4 pt-4">
<div class="flex flex-wrap flex-row shrink w-full justify-start gap-1 sm:gap-2 md:gap-4 pt-4">
<AlbumThumbPanelList
:albums="props.albums"
:album="props.album"
Expand All @@ -16,7 +16,7 @@
<Panel v-else :header="'Timeline'" :toggleable="!isAlone" :pt:header:class="headerClass" class="border-0 w-full">
<Timeline v-if="is_timeline_left_border_visible" :value="albumsTimeLine" :pt:eventopposite:class="'hidden'" class="mt-4">
<template #content="slotProps">
<div class="flex flex-wrap flex-row flex-shrink w-full justify-start gap-1 sm:gap-2 md:gap-4 pb-8">
<div class="flex flex-wrap flex-row shrink w-full justify-start gap-1 sm:gap-2 md:gap-4 pb-8">
<div class="w-full text-left font-semibold text-muted-color-emphasis text-lg">{{ slotProps.item.header }}</div>
<AlbumThumbPanelList
:albums="slotProps.item.data"
Expand All @@ -35,7 +35,7 @@
<template v-for="albumTimeline in albumsTimeLine">
<div
v-if="albumTimeline.data.filter((a) => !a.is_nsfw || are_nsfw_visible).length > 0"
class="flex flex-wrap flex-row flex-shrink w-full justify-start gap-1 sm:gap-2 md:gap-4 pb-8"
class="flex flex-wrap flex-row shrink w-full justify-start gap-1 sm:gap-2 md:gap-4 pb-8"
>
<div class="w-full text-left font-semibold text-muted-color-emphasis text-lg">{{ albumTimeline.header }}</div>
<AlbumThumbPanelList
Expand Down
4 changes: 2 additions & 2 deletions resources/js/components/gallery/PhotoThumbPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<template v-else>
<Timeline v-if="is_timeline_left_border_visible" :value="photosTimeLine" :pt:eventopposite:class="'hidden'" class="mt-4">
<template #content="slotProps">
<div class="flex flex-wrap flex-row flex-shrink w-full justify-start gap-1 sm:gap-2 md:gap-4 pb-8">
<div class="flex flex-wrap flex-row shrink w-full justify-start gap-1 sm:gap-2 md:gap-4 pb-8">
<div class="w-full text-left font-semibold text-muted-color-emphasis text-lg">{{ slotProps.item.header }}</div>
<PhotoThumbPanelList
:photos="slotProps.item.data"
Expand All @@ -36,7 +36,7 @@
</Timeline>
<div v-else>
<template v-for="photoTimeline in photosTimeLine">
<div class="flex flex-wrap flex-row flex-shrink w-full justify-start gap-1 sm:gap-2 md:gap-4 pb-8">
<div class="flex flex-wrap flex-row shrink w-full justify-start gap-1 sm:gap-2 md:gap-4 pb-8">
<div class="w-full text-left font-semibold text-muted-color-emphasis text-lg">{{ photoTimeline.header }}</div>
<PhotoThumbPanelList
:photos="photoTimeline.data"
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/gallery/PhotoThumbPanelList.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="relative flex flex-wrap flex-row flex-shrink w-full justify-start align-top" :id="'photoListing' + props.iter">
<div class="relative flex flex-wrap flex-row shrink w-full justify-start align-top" :id="'photoListing' + props.iter">
<template v-for="(photo, idx) in props.photos">
<PhotoThumb
@click="maySelect(idx + iter, $event)"
Expand Down
Loading

0 comments on commit c5c3957

Please sign in to comment.