From 0fc85f11a59ee6ea0cd40d4991e9542508d0f756 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 19 Feb 2025 13:20:42 -0600 Subject: [PATCH] Need splat for list items, don't wiggle popped on hover --- app/assets/stylesheets/bubbles.css | 31 ++++++++++++++++--------- app/views/bubbles/list/_bubble.html.erb | 1 + 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/bubbles.css b/app/assets/stylesheets/bubbles.css index 8227a3f3c..da7ddbb18 100644 --- a/app/assets/stylesheets/bubbles.css +++ b/app/assets/stylesheets/bubbles.css @@ -118,7 +118,7 @@ } @media (hover: hover) { - .windshield .bubble:hover & { + .windshield .bubble:not(.popped):hover & { transform: rotate(calc(var(--rotation) + var(--bubble-shift) * 1)) translate(0rem, 1rem); } } @@ -143,15 +143,15 @@ } @media (hover: hover) { - .windshield .bubble:hover & { + .windshield .bubble:not(.popped):hover & { transform: translate(0, -1rem); } - .windshield .bubble:hover & + & { + .windshield .bubble:not(.popped):hover & + & { transform: translate(1rem, -1rem); } - .windshield .bubble:hover & + & + & { + .windshield .bubble:not(.popped):hover & + & + & { transform: translate(1.5rem, -0.5rem);; } } @@ -212,7 +212,7 @@ } @media (hover: hover) { - .windshield .bubble:hover & { + .windshield .bubble:not(.popped):hover & { transform: translate(-0.5rem, -2rem); } } @@ -242,7 +242,7 @@ } @media (hover: hover) { - .windshield .bubble:hover & { + .windshield .bubble:not(.popped):hover & { transform: rotate(calc(var(--rotation) + var(--bubble-shift) * 1)) translate(0rem, 0.5rem); } } @@ -269,15 +269,15 @@ } @media (hover: hover) { - .windshield .bubble:hover & { + .windshield .bubble:not(.popped):hover & { transform: translate(1rem, 1rem); } - .windshield .bubble:hover & + & { + .windshield .bubble:not(.popped):hover & + & { transform: translate(0, -1rem); } - .windshield .bubble:hover & + & + & { + .windshield .bubble:not(.popped):hover & + & + & { transform: translate(-1rem, -1rem); } } @@ -303,7 +303,7 @@ transition: 0.2s ease; @media (hover: hover) { - .windshield .bubble:hover & { + .windshield .bubble:not(.popped):hover & { transform: rotate(calc(var(--bubble-rotate) + var(--bubble-shift))) scale(0.9); } } @@ -595,13 +595,22 @@ .splat__svg { display: none; pointer-events: none; + transform: rotate(var(--bubble-rotate)); .popped & { display: block; fill: color-mix(in srgb, var(--bubble-color) 25%, var(--color-bg)); position: absolute; scale: 130%; - transform: rotate(var(--bubble-rotate)); z-index: -1; } + + .bubbles-list & { + block-size: var(--bubble-size); + fill: color-mix(in srgb, var(--bubble-color) 35%, var(--color-bg)); + inline-size: var(--bubble-size); + position: relative; + scale: 1; + z-index: 0; + } } diff --git a/app/views/bubbles/list/_bubble.html.erb b/app/views/bubbles/list/_bubble.html.erb index 6e066608b..63bf54c54 100644 --- a/app/views/bubbles/list/_bubble.html.erb +++ b/app/views/bubbles/list/_bubble.html.erb @@ -2,6 +2,7 @@ data-controller="animation" data-animation-play-class="bubble--wobble" data-animation-play-on-load-value="true" data-action="mouseover->animation#play"> <%= link_to bucket_bubble_path(bubble.bucket, bubble), class: "flex-item-no-shrink" do %>
+ <% end %>