Skip to content
This repository has been archived by the owner on Nov 12, 2021. It is now read-only.

[WIP DON'T MERGE] Update button styles for secondary and tertiary #46

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

[WIP DON'T MERGE] Update button styles for secondary and tertiary #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e6f2ca6
Remove custom secondary button example
line47 Jun 17, 2021
b44a93e
Remove button styles no longer needed
line47 Jun 17, 2021
3d03f6e
Set up button variables
line47 Jun 17, 2021
6941dc0
Removing old variables no longer needed
line47 Jun 17, 2021
3f9e584
Merge branch 'master' into sw-secondary-and-tertiary-buttons
line47 Aug 13, 2021
2a0ff3a
Update primary and tertiary styles
line47 Aug 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions docs/src/pages/components/Button/Button.docs.scss
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions docs/src/pages/components/Button/button-secondary.example.html
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions src/styles/components/_Button.scss
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/styles/components/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import 'Button';
@import 'Footer';
@import 'FormLabel';
@import 'Header';
Expand Down
2 changes: 1 addition & 1 deletion src/styles/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
*/

// Settings: Globally-available variables, mixins, functions and config (Sass code that doesn't output CSS)
@import 'settings/index';
@import '@cmsgov/design-system/dist/scss/settings/index';
@import 'settings/index';
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The settings needed to be moved to after the initial design system set up to make sure variables are available

// Use default CMSDS font-faces
@import '@cmsgov/design-system/dist/scss/font';

Expand Down
41 changes: 35 additions & 6 deletions src/styles/settings/_override.forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,39 @@
$button-border-width: 2px;

// On HealthCare.gov, primary buttons have the success color
// Input fields should not have a border radius
$input-border-radius: 0;

// Primary button
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Still need to add styles for secondary and tertiary based on HCgov designs

$button-primary-text-color: $color-white;
$button-primary-bg: $color-green;
$button-primary-bg--hover: $color-success-dark;
$button-primary-bg--focus: $color-success-dark;
$button-primary-bg--active: $color-success-darker;
$button-primary-border-color: transparent;
// hover
$button-primary-text-color--hover: $color-white;
$button-primary-bg--hover: $color-green-dark;
$button-primary-border-color--hover: transparent;
// active
$button-primary-text-color--active: $color-white;
$button-primary-bg--active: $color-green-darker;
$button-primary-border-color--active: transparent;
// disabled
$button-primary-text-color--disabled: $color-gray-dark;
$button-primary-bg--disabled: $color-gray-lighter;
$button-primary-border-color--disabled: $color-gray-lighter;

// Likewise, input fields should not have a border radius
$input-border-radius: 0;
// Tertiary button
$button-tertiary-text-decoration: underline;
$button-tertiary-text-color: $color-primary;
$button-tertiary-bg: transparent;
$button-tertiary-border-color: transparent;
// hover
$button-tertiary-text-color--hover: $color-primary-darker;
$button-tertiary-bg--hover: transparent;
$button-tertiary-border-color--hover: transparent;
// active
$button-tertiary-text-color--active: $color-primary-darkest;
$button-tertiary-bg--active: transparent;
$button-tertiary-border-color--active: transparent;
// disabled
$button-tertiary-text-color--disabled: $color-gray-lighter;
$button-tertiary-bg--disabled: transparent;
$button-tertiary-border-color--disabled: transparent;