Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Adjusted with suggested CSS #2413

Merged
merged 7 commits into from
Apr 28, 2024
Merged

Adjusted with suggested CSS #2413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dd9cec9
adjusted with suggested CSS
ildyria Apr 26, 2024
44a7c0e
swipe is triggered if more than 25% horizontal or 50% vertical
ildyria Apr 26, 2024
90c4010
formatting
ildyria Apr 26, 2024
1cc276c
Merge branch 'master' into fix-ui
ildyria Apr 26, 2024
e3b818b
make migration friendly
ildyria Apr 26, 2024
8dee425
change the overflow
ildyria Apr 26, 2024
822128d
fix background not going to the bottom
ildyria Apr 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions database/migrations/2024_04_26_201931_add_storate_disk_to_size_variants.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@

public function up(): void
{
Schema::table(self::TABLE_SV, function (Blueprint $table) {
$table->string(self::COLUMN)->default(self::DEFAULT);
});
if (!Schema::hasColumn(self::TABLE_SV, self::COLUMN)) {
Schema::table(self::TABLE_SV, function (Blueprint $table) {
$table->string(self::COLUMN)->default(self::DEFAULT);
});
}
}

public function down(): void
Expand Down
4 changes: 3 additions & 1 deletion resources/js/lycheeOrg/actions/swipeActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ export default class SwipeActions {
Math.max(
25,
Math.floor(
0.15 * (type === "x" ? window.innerWidth || document.body.clientWidth : window.innerHeight || document.body.clientHeight),
type === "x"
? 0.25 * (window.innerWidth || document.body.clientWidth)
: 0.5 * (window.innerHeight || document.body.clientHeight),
),
),
// Minimum velocity the gesture must be moving when the gesture ends to be
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/gallery/photo/sidebar.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div id="lychee_sidebar"
x-data="photoSidebarPanel()"
x-on:photo-updated.window="refreshSidebar($store.photo)"
class="border-t border-solid border-primary-500 text-text-main-0 w-[360px] h-full bg-bg-800">
class="border-t border-solid border-primary-500 text-text-main-0 w-[360px] h-full pr-4 break-words">
<div class="grid grid-cols-[auto minmax(0, 1fr)] mt-8">
<h1 class="col-span-2 text-center text-lg font-bold my-4">
{{ __('lychee.ALBUM_ABOUT') }}
Expand Down
2 changes: 1 addition & 1 deletion resources/views/components/gallery/view/photo.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ class="absolute top-0 h-1/4 w-full sm:w-1/2 left-1/2 -translate-x-1/2 opacity-50
<x-gallery.photo.properties />
</div>
</template>
<aside id="lychee_sidebar_container" class="h-full relative overflow-clip transition-all"
<aside id="lychee_sidebar_container" class="h-full relative transition-all overflow-x-clip overflow-y-scroll bg-bg-800"
:class="photoFlags.isDetailsOpen ? 'w-[360px]' : 'w-0 translate-x-full'">
<x-gallery.photo.sidebar />
</aside>
Expand Down
Loading