Skip to content

Commit

Permalink
Merge pull request mmistakes#335 from mpdeimos/accent_color
Browse files Browse the repository at this point in the history
Provide accent color to buttons and notices
  • Loading branch information
mmistakes committed Aug 7, 2019
2 parents edb1b2f + 247b6f3 commit 29257db
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 1 deletion.
2 changes: 1 addition & 1 deletion _sass/so-simple/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
}

/* button colors */
$buttoncolors: (primary, $primary-color), (inverse, #fff),
$buttoncolors: (primary, $primary-color), (accent, $accent-color), (inverse, #fff),
(light-outline, transparent), (success, $success-color),
(warning, $warning-color), (danger, $danger-color), (info, $info-color),
(facebook, $facebook-color), (twitter, $twitter-color),
Expand Down
6 changes: 6 additions & 0 deletions _sass/so-simple/_notices.scss
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@
@include notice(mix(#fff, $primary-color, 70%));
}

/* Accent notice */

.notice--accent {
@include notice(mix(#fff, $accent-color, 70%));
}

/* Info notice */

.notice--info {
Expand Down
5 changes: 5 additions & 0 deletions docs/_posts/2013-01-11-markup-html-elements-and-formatting.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ Make any link standout more when applying the `.btn` class.

[Default Button](#){: .btn}
[Primary Button](#){: .btn .btn--primary}
[Accent Button](#){: .btn .btn--accent}
[Success Button](#){: .btn .btn--success}
[Warning Button](#){: .btn .btn--warning}
[Danger Button](#){: .btn .btn--danger}
Expand All @@ -125,6 +126,7 @@ Make any link standout more when applying the `.btn` class.
```markdown
[Default Button Text](#link){: .btn}
[Primary Button Text](#link){: .btn .btn--primary}
[Accent Button Text](#link){: .btn .btn--accent}
[Success Button Text](#link){: .btn .btn--success}
[Warning Button Text](#link){: .btn .btn--warning}
[Danger Button Text](#link){: .btn .btn--danger}
Expand Down Expand Up @@ -153,6 +155,9 @@ Make any link standout more when applying the `.btn` class.
**Watch out!** This paragraph of text has been [emphasized](#) with the `{: .notice--primary}` class.
{: .notice--primary}

**Watch out!** This paragraph of text has been [emphasized](#) with the `{: .notice--accent}` class.
{: .notice--accent}

**Watch out!** This paragraph of text has been [emphasized](#) with the `{: .notice--info}` class.
{: .notice--info}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ Make any link standout more when applying the `.btn` class.

[Default Button](#){: .btn}
[Primary Button](#){: .btn .btn--primary}
[Accent Button](#){: .btn .btn--accent}
[Success Button](#){: .btn .btn--success}
[Warning Button](#){: .btn .btn--warning}
[Danger Button](#){: .btn .btn--danger}
Expand All @@ -125,6 +126,7 @@ Make any link standout more when applying the `.btn` class.
```markdown
[Default Button Text](#link){: .btn}
[Primary Button Text](#link){: .btn .btn--primary}
[Accent Button Text](#link){: .btn .btn--accent}
[Success Button Text](#link){: .btn .btn--success}
[Warning Button Text](#link){: .btn .btn--warning}
[Danger Button Text](#link){: .btn .btn--danger}
Expand Down Expand Up @@ -153,6 +155,9 @@ Make any link standout more when applying the `.btn` class.
**Watch out!** This paragraph of text has been [emphasized](#) with the `{: .notice--primary}` class.
{: .notice--primary}

**Watch out!** This paragraph of text has been [emphasized](#) with the `{: .notice--accent}` class.
{: .notice--accent}

**Watch out!** This paragraph of text has been [emphasized](#) with the `{: .notice--info}` class.
{: .notice--info}

Expand Down

0 comments on commit 29257db

Please sign in to comment.