Skip to content

Commit

Permalink
fix(fluid-list-box): merge conflict update
Browse files Browse the repository at this point in the history
  • Loading branch information
ariellalgilmore committed Nov 5, 2024
1 parent ccbf58b commit c903665
Showing 1 changed file with 1 addition and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit c903665

Please sign in to comment.