Skip to content

Commit

Permalink
Revert: Fix border overlap between Buttons in outlined ButtonGroup (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
ggdouglas authored Sep 30, 2024
1 parent 3f4a894 commit 7f83b30
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 25 deletions.
15 changes: 0 additions & 15 deletions packages/core/src/components/button/_button-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -142,26 +142,17 @@ Styleguide button-group
}

&.#{$ns}-outlined {
> .#{$ns}-popover-target > .#{$ns}-button,
> .#{$ns}-button {
@include pt-button-outlined();
}

&:not(.#{$ns}-vertical) {
> .#{$ns}-popover-target:not(:last-child) > .#{$ns}-button,
> .#{$ns}-button:not(:last-child) {
border-right: none;
}
}
}

&:not(.#{$ns}-vertical) {
> .#{$ns}-popover-target:not(:last-child) .#{$ns}-button.#{$ns}-outlined,
> .#{$ns}-button.#{$ns}-outlined:not(:last-child) {
border-right: none;
}
}

.#{$ns}-popover-wrapper,
.#{$ns}-popover-target {
display: flex;
Expand Down Expand Up @@ -261,16 +252,10 @@ Styleguide button-group
}

&.#{$ns}-outlined {
> .#{$ns}-popover-target:not(:last-child) .#{$ns}-button,
> .#{$ns}-button:not(:last-child) {
border-bottom: none;
}
}

> .#{$ns}-popover-target:not(:last-child) .#{$ns}-button.#{$ns}-outlined,
> .#{$ns}-button.#{$ns}-outlined:not(:last-child) {
border-bottom: none;
}
}

&.#{$ns}-align-left .#{$ns}-button {
Expand Down
13 changes: 3 additions & 10 deletions packages/core/src/components/popover/_popover-in-button-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,7 @@
> .#{$ns}-popover-target:not(:last-child) .#{$ns}-button {
border-bottom-right-radius: 0;
border-top-right-radius: 0;
}

&:not(.#{$ns}-outlined) {
> .#{$ns}-popover-target:not(:last-child) .#{$ns}-button:not(.#{$ns}-outlined) {
margin-right: -$button-border-width;
}
margin-right: -$button-border-width;
}
}

Expand All @@ -39,10 +34,8 @@
border-radius: 0 0 $pt-border-radius $pt-border-radius;
}

&:not(.#{$ns}-outlined) {
> .#{$ns}-popover-target:not(:last-child) .#{$ns}-button:not(.#{$ns}-outlined) {
margin-bottom: -$button-border-width;
}
> .#{$ns}-popover-target:not(:last-child) .#{$ns}-button {
margin-bottom: -$button-border-width;
}
}
}
Expand Down

1 comment on commit 7f83b30

@svc-palantir-github
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert: Fix border overlap between Buttons in outlined ButtonGroup (#7002)

Build artifact links for this commit: documentation | landing | table | demo

This is an automated comment from the deploy-preview CircleCI job.

Please sign in to comment.