Skip to content

Commit

Permalink
Button improvements (#820)
Browse files Browse the repository at this point in the history
  • Loading branch information
thecalcc authored Jan 31, 2024
1 parent 0ed5792 commit 6150971
Showing 1 changed file with 24 additions and 20 deletions.
44 changes: 24 additions & 20 deletions app/styles/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -146,32 +146,32 @@ $new-button-active-shadow-hollow: inset 0 0 0 1px;
--sd-btn-border: var(--sd-colour-interactive-btn-border);
--sd-btn-color: var(--sd-colour-interactive);
}

&.btn--success {
--sd-btn-border: var(--sd-colour-success-btn-border);
--sd-btn-color: var(--sd-colour-success);
}

&.btn--warning {
--sd-btn-border: var(--sd-colour-warning-btn-border);
--sd-btn-color: var(--sd-colour-warning);
}

&.btn--alert {
--sd-btn-border: var(--sd-colour-alert-btn-border);
--sd-btn-color: var(--sd-colour-alert);
}

&.btn--highlight {
--sd-btn-border: var(--sd-colour-highlight-btn-border);
--sd-btn-color: var(--sd-colour-highlight);
}

&.btn--sd-green {
--sd-btn-border: var(--sd-colour-superdesk-btn-border);
--sd-btn-color: var(--sd-colour-superdesk);
}

&.btn--secondary {
--sd-btn-border: var(--sd-colour-secondary-btn-border);
--sd-btn-color: var(--sd-colour-secondary);
Expand Down Expand Up @@ -201,27 +201,27 @@ $new-button-active-shadow-hollow: inset 0 0 0 1px;
&.btn--primary {
--sd-btn-hs: var(--sd-colour-primary-hs);
}

&.btn--success {
--sd-btn-hs: var(--sd-colour-success-hs);
}

&.btn--warning {
--sd-btn-hs: var(--sd-colour-warning-hs);
}

&.btn--alert {
--sd-btn-hs: var(--sd-colour-alert-hs);
}

&.btn--highlight {
--sd-btn-hs: var(--sd-colour-highlight-hs);
}

&.btn--sd-green {
--sd-btn-hs: var(--sd-colour-superdesk-hs);
}

&.btn--secondary {
--sd-btn-hs: var(--sd-colour-secondary-hs);
}
Expand Down Expand Up @@ -264,11 +264,15 @@ $new-button-active-shadow-hollow: inset 0 0 0 1px;
&.btn--disabled, &[disabled] {
opacity: $button-opacity-disabled;
cursor: not-allowed;
pointer-events: none;

:not(.no-disable) {
pointer-events: none;
}

box-shadow: none !important;

&:hover, &:active {
cursor: not-allowed;
cursor: not-allowed;
}
}
}
Expand Down Expand Up @@ -440,7 +444,7 @@ $new-button-active-shadow-hollow: inset 0 0 0 1px;
width: 2.4rem;
line-height: 2.4rem;
}

}

.icn-btn--outline {
Expand Down Expand Up @@ -491,7 +495,7 @@ $new-button-active-shadow-hollow: inset 0 0 0 1px;
}
}

// Button navigation
// Button navigation
.button-nav {
display: flex;
flex-direction: row;
Expand Down Expand Up @@ -529,7 +533,7 @@ $new-button-active-shadow-hollow: inset 0 0 0 1px;
}
}

// Button icon group
// Button icon group
.btn-icon-group {
display: flex;
align-items: center;
Expand All @@ -541,13 +545,13 @@ $new-button-active-shadow-hollow: inset 0 0 0 1px;
}


// BUTTON GROUPS
// BUTTON GROUPS
.button-group {
display: flex;
flex-direction: row;
align-items: center;
gap: $sd-base-increment;

.btn {
margin: 0;
}
Expand Down Expand Up @@ -776,7 +780,7 @@ $new-button-active-shadow-hollow: inset 0 0 0 1px;
.sd-spinner {
margin-inline-start: -0.3rem;
}

&.btn--icon-only {
.sd-spinner {
margin-inline-start: 0;
Expand Down

0 comments on commit 6150971

Please sign in to comment.