Skip to content

Revert "Fix lightbox layout and focus" #2452

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

Closed
flavorjones wants to merge 1 commit into from
Closed

Revert "Fix lightbox layout and focus" #2452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 3 additions & 17 deletions app/assets/stylesheets/lightbox.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,16 @@
--dialog-duration: 350ms;
--lightbox-padding: 3vmin;

align-items: center;
background-color: transparent;
block-size: 100dvh;
border: 0;
display: flex;
inline-size: 100dvw;
inset: 0;
justify-content: center;
margin: auto;
max-height: unset;
max-width: unset;
overflow: hidden;
padding:
calc(var(--lightbox-padding) + var(--custom-safe-inset-top))
calc(var(--lightbox-padding) + var(--custom-safe-inset-right))
calc(var(--lightbox-padding) + var(--custom-safe-inset-bottom))
calc(var(--lightbox-padding) + var(--custom-safe-inset-left));
padding: var(--lightbox-padding);
text-align: center;

&::backdrop {
Expand Down Expand Up @@ -54,15 +47,12 @@
.lightbox__actions {
display: flex;
gap: 1ch;
inset:
calc(var(--lightbox-padding) + var(--custom-safe-inset-top))
calc(var(--lightbox-padding) + var(--custom-safe-inset-right))
auto
auto;
inset: var(--lightbox-padding) var(--lightbox-padding) auto auto;
position: absolute;
}

.lightbox__figure {
align-self: stretch;
animation-fill-mode: forwards;
animation: slide-down var(--dialog-duration);
display: flex;
Expand All @@ -82,10 +72,6 @@
&:empty {
display: none;
}

&[tabindex="-1"]:focus-visible {
outline: unset;
}
}

.lightbox__image {
Expand Down
2 changes: 1 addition & 1 deletion app/javascript/controllers/lightbox_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default class extends Controller {

reset() {
this.zoomedImageTarget.src = ""
this.captionTarget.innerHtml = " "
this.captionTarget.innerText = ""
this.dispatch('closed')
}

Expand Down
4 changes: 2 additions & 2 deletions app/views/layouts/_lightbox.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

<figure class="lightbox__figure">
<img src="" class="lightbox__image" data-lightbox-target="zoomedImage" />
<figcaption class="lightbox__caption" data-lightbox-target="caption" tabindex="-1" data-dialog-target="focusTouch">&nbsp</figcaption>
<figcaption class="lightbox__caption" data-lightbox-target="caption"></figcaption>
</figure>

<div class="lightbox__actions">
<%= yield %>
<button class="btn fill-white" data-action="dialog#close" data-controller="hotkey tooltip" data-dialog-target="focusMouse">
<button class="btn fill-white" data-action="dialog#close" data-controller="hotkey tooltip">
<%= icon_tag "remove" %>
<span class="for-screen-reader">Close (esc)</span>
</button>
Expand Down