diff --git a/app/assets/stylesheets/cards.css b/app/assets/stylesheets/cards.css index 2a228094f..6f5425e1d 100644 --- a/app/assets/stylesheets/cards.css +++ b/app/assets/stylesheets/cards.css @@ -4,6 +4,7 @@ .card { --avatar-size: 2.75em; + --card-bg-color: color-mix(in srgb, var(--card-color) 4%, var(--color-canvas)); --card-padding-inline: var(--inline-space-double); --card-padding-block: var(--block-space); --border-color: transparent; @@ -11,7 +12,7 @@ --border-size: 0; aspect-ratio: var(--card-aspect-ratio, auto); - background-color: color-mix(in srgb, var(--card-color) 4%, var(--color-canvas)); + background-color: var(--card-bg-color); border-radius: var(--border-radius); box-shadow: var(--shadow); color: color-mix(in srgb, var(--card-color) 40%, var(--color-ink)); diff --git a/app/assets/stylesheets/inputs.css b/app/assets/stylesheets/inputs.css index 6643ed065..61a1e43c6 100644 --- a/app/assets/stylesheets/inputs.css +++ b/app/assets/stylesheets/inputs.css @@ -24,6 +24,10 @@ &:where(:focus) { --focus-ring-offset: -1px; } + + &[readonly] { + --focus-ring-size: 0; + } } .input--file { @@ -124,6 +128,9 @@ /* Switches */ .switch { + --switch-color: var(--color-ink-medium); + --switch-hover-brightness: 0.9; + block-size: 1.75em; border-radius: 2em; display: inline-flex; @@ -144,7 +151,7 @@ } .switch__btn { - background-color: var(--color-ink-medium); + background-color: var(--switch-color); border-radius: 2em; cursor: pointer; inset: 0; @@ -164,13 +171,20 @@ transition: 150ms ease; } + @media (any-hover: hover) { + &:hover { + background-color: color-mix(in srgb, var(--switch-color) 80%, var(--color-ink)); + } + } + .switch__input:disabled + & { - background-color: var(--color-ink-medium) !important; + --switch-color: var(--color-ink-medium) !important; + cursor: not-allowed; } .switch__input:checked + & { - background-color: var(--color-link); + --switch-color: var(--color-link); &::before { transform: translateX(1.2em); diff --git a/app/views/cards/display/common/_assignees.html.erb b/app/views/cards/display/common/_assignees.html.erb index 19d5d1c83..614a976e0 100644 --- a/app/views/cards/display/common/_assignees.html.erb +++ b/app/views/cards/display/common/_assignees.html.erb @@ -4,7 +4,7 @@ <% end %>
> - diff --git a/app/views/cards/display/perma/_tags.html.erb b/app/views/cards/display/perma/_tags.html.erb index 637b55097..4e870078c 100644 --- a/app/views/cards/display/perma/_tags.html.erb +++ b/app/views/cards/display/perma/_tags.html.erb @@ -12,7 +12,7 @@
> - diff --git a/app/views/cards/display/public_preview/_meta.html.erb b/app/views/cards/display/public_preview/_meta.html.erb index 6b62fe970..a49cbfbcb 100644 --- a/app/views/cards/display/public_preview/_meta.html.erb +++ b/app/views/cards/display/public_preview/_meta.html.erb @@ -28,7 +28,7 @@ <% end %>
> - diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb index fe318394e..19d95cae0 100644 --- a/app/views/cards/show.html.erb +++ b/app/views/cards/show.html.erb @@ -27,8 +27,11 @@ <% end %>
- <%= link_to cards_path(collection_ids: [ @card.collection ]), class: "txt-large overflow-ellipsis margin-none txt-ink", style: "view-transistion-name: card-collection-title", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> - ← <%= @card.collection.name %> + <%= link_to cards_path(collection_ids: [ @card.collection ]), class: "btn borderless txt-large", style: "--btn-padding: 0.25ch 1ch 0.25ch 0.75ch; view-transistion-name: card-collection-title;", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> + + ← + <%= @card.collection.name %> + <% end %>
diff --git a/app/views/collections/edit/_publication.html.erb b/app/views/collections/edit/_publication.html.erb index 72f315b8d..ce5568451 100644 --- a/app/views/collections/edit/_publication.html.erb +++ b/app/views/collections/edit/_publication.html.erb @@ -11,13 +11,13 @@ <%= form.check_box :published, class: "switch__input", checked: true, data: { action: "change->form#submit" } %> Turn off the public link - <% end %> + <% end %> <%= icon_tag "world" %>
- <%= text_field_tag :publication_url, published_collection_url(collection), disabled: true, class: "full-width input fill-white" %> + <%= text_field_tag :publication_url, published_collection_url(collection), readonly: true, class: "full-width input fill-white" %>
<%= button_to_copy_to_clipboard(published_collection_url(collection)) do %> <%= icon_tag "copy-paste" %> @@ -44,7 +44,7 @@ <%= form.check_box :published, class: "switch__input", checked: false, data: { action: "change->form#submit" } %> Turn on the public link - <% end %> + <% end %> <%= icon_tag "world" %>