Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:wellcometrust/design-system into…
Browse files Browse the repository at this point in the history
… task/8709-design-token-prototyping
  • Loading branch information
creido-welly committed Jul 29, 2021
2 parents 3bf3147 + f5f40b8 commit 7cc62e5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
5 changes: 3 additions & 2 deletions src/components/Button/button.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import '../../styles/common';

.ds-btn {
// button scoped variables
:root {
--button-bgcolour-primary: var(--colour-amber-30);
--button-bgcolour-primary-active: var(--colour-amber-30);
--button-bgcolour-primary-focus: var(--colour-amber-30);
Expand Down Expand Up @@ -37,7 +36,9 @@
--button-colour-tertiary-focus: var(--colour-grey-80);
--button-colour-tertiary-hover: var(--colour-grey-80);
--button-colour-tertiary-disabled: var(--colour-grey-40);
}

.ds-btn {
@include btn-base;
border-radius: calc(0.25 * var(--space-unit));
display: inline-flex;
Expand Down
1 change: 0 additions & 1 deletion src/styles/20-tools/_mixins/_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

@mixin btn-base {
align-items: center;
background: transparent;
border: 0;
box-sizing: border-box;
cursor: pointer;
Expand Down

0 comments on commit 7cc62e5

Please sign in to comment.