From c9036650ce759e65cce963b73f5f8896799a5a6e Mon Sep 17 00:00:00 2001 From: ariellalgilmore Date: Tue, 5 Nov 2024 09:51:41 -0800 Subject: [PATCH] fix(fluid-list-box): merge conflict update --- .../components/fluid-list-box/_fluid-list-box.scss | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/packages/styles/scss/components/fluid-list-box/_fluid-list-box.scss b/packages/styles/scss/components/fluid-list-box/_fluid-list-box.scss index 67c2080c1c38..d7d3cf8d6fde 100644 --- a/packages/styles/scss/components/fluid-list-box/_fluid-list-box.scss +++ b/packages/styles/scss/components/fluid-list-box/_fluid-list-box.scss @@ -21,8 +21,7 @@ position: relative; background: $field; block-size: 100%; - transition: - background-color $duration-fast-01 motion(standard, productive), + transition: background-color $duration-fast-01 motion(standard, productive), outline $duration-fast-01 motion(standard, productive); } @@ -283,16 +282,6 @@ inset-inline-start: $spacing-05; } - .#{$prefix}--list-box__wrapper--fluid - .#{$prefix}--skeleton - .#{$prefix}--list-box__field, - .#{$prefix}--list-box__wrapper--fluid - .#{$prefix}--skeleton - .#{$prefix}--list-box__label { - animation: 3000ms ease-in-out skeleton infinite; - background: $skeleton-element; - } - // AILabel styles .#{$prefix}--list-box__wrapper--fluid.#{$prefix}--list-box__wrapper--slug .#{$prefix}--ai-label,