resolve conflicts

This commit is contained in:
2025-04-03 11:33:23 +04:00
parent cf89a4cd3b
commit b0baf42862
8 changed files with 60 additions and 97 deletions

View File

@@ -1,20 +1,18 @@
div.m3.m3-segmented-buttons
padding: 0
height: 40px
display: flex
flex-direction: row
display: inline-flex
border-radius: 20px
box-sizing: border-box
border-collapse: collapse
& > button.m3.m3-button-segment
width: auto
height: 40px
display: flex
padding: 10px
min-width: 108px
border-radius: 0
width: max-content
padding-inline: 10px
margin: 0 -0.5px 0 -0.5px
margin: 0 -0.5px
display: inline-flex
background-color: transparent
border: 1px solid var(--md-sys-color-outline)
@@ -46,9 +44,9 @@ div.m3.m3-segmented-buttons
fill: var(--md-sys-color-on-secondary-container)
& > span.m3.m3-button-segment-state-layer
position: absolute
width: 100%
height: 100%
position: absolute
& > span.m3.m3-button-segment-state-layer, span.m3.m3-ripple-domain
transition: .2s cubic-bezier(0.2, 0, 0, 1)