diff --git a/app/assets/stylesheets/dialog.css b/app/assets/stylesheets/dialog.css index 1336cad9b7..22574979d8 100644 --- a/app/assets/stylesheets/dialog.css +++ b/app/assets/stylesheets/dialog.css @@ -7,32 +7,37 @@ :is(.dialog) { border: 0; opacity: 0; - transform: scale(0.2); - transform-origin: top center; - transition: var(--dialog-duration) allow-discrete; + transform: scale(0.85); + transform-origin: center; + transition-behavior: allow-discrete; + transition-duration: calc(var(--dialog-duration) / 2); /* Faster closing */ transition-property: display, opacity, overlay, transform; + transition-timing-function: ease-out; &::backdrop { background-color: var(--color-black); opacity: 0; - transform: scale(1); - transition: var(--dialog-duration) allow-discrete; + transition-behavior: allow-discrete; + transition-duration: calc(var(--dialog-duration) / 2); transition-property: display, opacity, overlay; + transition-timing-function: ease-out; } &[open] { opacity: 1; transform: scale(1); + transition-duration: var(--dialog-duration); /* Normal opening speed */ &::backdrop { opacity: 0.5; + transition-duration: var(--dialog-duration); } } @starting-style { &[open] { opacity: 0; - transform: scale(0.2); + transform: scale(0.85); } &[open]::backdrop { diff --git a/app/views/account/join_codes/show.html.erb b/app/views/account/join_codes/show.html.erb index f3cfb1e377..aa7ed7d87a 100644 --- a/app/views/account/join_codes/show.html.erb +++ b/app/views/account/join_codes/show.html.erb @@ -39,8 +39,10 @@ Get QR code <% end %> - -

Scan this code with the camera on your mobile device

+ +

+ Scan this code to join <%= Current.account.name %>: +

<%= qr_code_image(url) %> diff --git a/app/views/users/_transfer.html.erb b/app/views/users/_transfer.html.erb index 13f895ebc7..4158605300 100644 --- a/app/views/users/_transfer.html.erb +++ b/app/views/users/_transfer.html.erb @@ -18,13 +18,16 @@ Display auto-login QR code <% end %> - + +

+ Scan this code to instantly log in on another device: +

+ <%= qr_code_image(url) %>
-
@@ -35,4 +38,4 @@ Copy auto-login link <% end %> - \ No newline at end of file +