Skip to content

Commit

Permalink
New Component: ButtonGroup #61
Browse files Browse the repository at this point in the history
  • Loading branch information
gucal committed Mar 21, 2024
1 parent 4cee111 commit 9f38cbd
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions theme-base/components/button/_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
width: $buttonIconOnlyWidth;
}

.p-buttonset {
.p-button-group {
display: flex;

.p-button {
Expand All @@ -207,7 +207,7 @@
}
}

.p-button.p-button-secondary, .p-buttonset.p-button-secondary > .p-button, .p-splitbutton.p-button-secondary > .p-button, .p-fileupload-choose.p-button-secondary {
.p-button.p-button-secondary, .p-button-group.p-button-secondary > .p-button, .p-splitbutton.p-button-secondary > .p-button, .p-fileupload-choose.p-button-secondary {
color: $secondaryButtonTextColor;
background: $secondaryButtonBg;
border: $secondaryButtonBorder;
Expand Down Expand Up @@ -265,7 +265,7 @@
}
}

.p-button.p-button-info, .p-buttonset.p-button-info > .p-button, .p-splitbutton.p-button-info > .p-button, .p-fileupload-choose.p-button-info {
.p-button.p-button-info, .p-button-group.p-button-info > .p-button, .p-splitbutton.p-button-info > .p-button, .p-fileupload-choose.p-button-info {
color: $infoButtonTextColor;
background: $infoButtonBg;
border: $infoButtonBorder;
Expand Down Expand Up @@ -323,7 +323,7 @@
}
}

.p-button.p-button-success, .p-buttonset.p-button-success > .p-button, .p-splitbutton.p-button-success > .p-button, .p-fileupload-choose.p-button-success {
.p-button.p-button-success, .p-button-group.p-button-success > .p-button, .p-splitbutton.p-button-success > .p-button, .p-fileupload-choose.p-button-success {
color: $successButtonTextColor;
background: $successButtonBg;
border: $successButtonBorder;
Expand Down Expand Up @@ -381,7 +381,7 @@
}
}

.p-button.p-button-warning, .p-buttonset.p-button-warning > .p-button, .p-splitbutton.p-button-warning > .p-button, .p-fileupload-choose.p-button-warning {
.p-button.p-button-warning, .p-button-group.p-button-warning > .p-button, .p-splitbutton.p-button-warning > .p-button, .p-fileupload-choose.p-button-warning {
color: $warningButtonTextColor;
background: $warningButtonBg;
border: $warningButtonBorder;
Expand Down Expand Up @@ -439,7 +439,7 @@
}
}

.p-button.p-button-help, .p-buttonset.p-button-help > .p-button, .p-splitbutton.p-button-help > .p-button, .p-fileupload-choose.p-button-help {
.p-button.p-button-help, .p-button-group.p-button-help > .p-button, .p-splitbutton.p-button-help > .p-button, .p-fileupload-choose.p-button-help {
color: $helpButtonTextColor;
background: $helpButtonBg;
border: $helpButtonBorder;
Expand Down Expand Up @@ -497,7 +497,7 @@
}
}

.p-button.p-button-danger, .p-buttonset.p-button-danger > .p-button, .p-splitbutton.p-button-danger > .p-button, .p-fileupload-choose.p-button-danger {
.p-button.p-button-danger, .p-button-group.p-button-danger > .p-button, .p-splitbutton.p-button-danger > .p-button, .p-fileupload-choose.p-button-danger {
color: $dangerButtonTextColor;
background: $dangerButtonBg;
border: $dangerButtonBorder;
Expand Down Expand Up @@ -556,7 +556,7 @@
}

@if variable-exists(contrastButtonTextColor) {
.p-button.p-button-contrast, .p-buttonset.p-button-contrast > .p-button, .p-splitbutton.p-button-contrast > .p-button {
.p-button.p-button-contrast, .p-button-group.p-button-contrast > .p-button, .p-splitbutton.p-button-contrast > .p-button {
color: $contrastButtonTextColor;
background: $contrastButtonBg;
border: $contrastButtonBorder;
Expand Down
14 changes: 7 additions & 7 deletions themes/material/extensions/_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
}
}

.p-button.p-button-secondary, .p-buttonset.p-button-secondary > .p-button, .p-splitbutton.p-button-secondary > .p-button, .p-fileupload-choose.p-button-secondary {
.p-button.p-button-secondary, .p-button-group.p-button-secondary > .p-button, .p-splitbutton.p-button-secondary > .p-button, .p-fileupload-choose.p-button-secondary {
&:not(:disabled):focus {
background: rgba($secondaryButtonBg, .76);
}
Expand All @@ -94,7 +94,7 @@
}
}

.p-button.p-button-info, .p-buttonset.p-button-info > .p-button, .p-splitbutton.p-button-info > .p-button, .p-fileupload-choose.p-button-info {
.p-button.p-button-info, .p-button-group.p-button-info > .p-button, .p-splitbutton.p-button-info > .p-button, .p-fileupload-choose.p-button-info {
&:not(:disabled):focus {
background: rgba($infoButtonBg, .76);
}
Expand All @@ -119,7 +119,7 @@
}
}

.p-button.p-button-success, .p-buttonset.p-button-success > .p-button, .p-splitbutton.p-button-success > .p-button, .p-fileupload-choose.p-button-success {
.p-button.p-button-success, .p-button-group.p-button-success > .p-button, .p-splitbutton.p-button-success > .p-button, .p-fileupload-choose.p-button-success {
&:not(:disabled):focus {
background: rgba($successButtonBg, .76);
}
Expand All @@ -144,7 +144,7 @@
}
}

.p-button.p-button-warning, .p-buttonset.p-button-warning > .p-button, .p-splitbutton.p-button-warning > .p-button, .p-fileupload-choose.p-button-warning {
.p-button.p-button-warning, .p-button-group.p-button-warning > .p-button, .p-splitbutton.p-button-warning > .p-button, .p-fileupload-choose.p-button-warning {
&:not(:disabled):focus {
background: rgba($warningButtonBg, .76);
}
Expand All @@ -169,7 +169,7 @@
}
}

.p-button.p-button-help, .p-buttonset.p-button-help > .p-button, .p-splitbutton.p-button-help > .p-button, .p-fileupload-choose.p-button-help {
.p-button.p-button-help, .p-button-group.p-button-help > .p-button, .p-splitbutton.p-button-help > .p-button, .p-fileupload-choose.p-button-help {
&:not(:disabled):focus {
background: rgba($helpButtonBg, .76);
}
Expand All @@ -194,7 +194,7 @@
}
}

.p-button.p-button-danger, .p-buttonset.p-button-danger > .p-button, .p-splitbutton.p-button-danger > .p-button, .p-fileupload-choose.p-button-danger {
.p-button.p-button-danger, .p-button-group.p-button-danger > .p-button, .p-splitbutton.p-button-danger > .p-button, .p-fileupload-choose.p-button-danger {
&:not(:disabled):focus {
background: rgba($dangerButtonBg, .76);
}
Expand All @@ -220,7 +220,7 @@
}

.p-button.p-button-contrast,
.p-buttonset.p-button-contrast > .p-button,
.p-button-group.p-button-contrast > .p-button,
.p-splitbutton.p-button-contrast > .p-button {
&:enabled:focus {
background: rgba($contrastButtonBg, 0.76);
Expand Down
2 changes: 1 addition & 1 deletion themes/viva/_extensions.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}
}

.p-buttonset,
.p-button-group,
.p-togglebutton {
.p-button-label {
font-weight: 400;
Expand Down

0 comments on commit 9f38cbd

Please sign in to comment.