Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix(props): rename type prop to variant #88

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion demo/components/customiser/customiser.js
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ class Customiser extends React.Component {
size="medium"
href={this.props.repository}
target="_blank"
type="github"
variant="github"
cssModule={this.props.module}
>
Source
Expand Down
26 changes: 13 additions & 13 deletions demo/examples/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,11 @@ import AwesomeButtonSocial from 'react-awesome-button/src/components/AwesomeButt
},
{
title: 'Primary Button',
jsx: '<AwesomeButton type="primary">Primary</AwesomeButton>',
jsx: '<AwesomeButton variant="primary">Primary</AwesomeButton>',
component: (
<AwesomeButton
cssModule={Modules.Modules[theme]}
type="primary"
variant="primary"
>
Primary
</AwesomeButton>
Expand All @@ -183,15 +183,15 @@ import AwesomeButtonSocial from 'react-awesome-button/src/components/AwesomeButt
title: 'Secondary Progress Button',
jsx: `
<AwesomeButtonProgress
type="secondary"
variant="secondary"
size="medium"
action={(element, next) => doSomethingThenCall(next)}
>
Primary
</AwesomeButtonProgress>`,
component: (
<AwesomeButtonProgress
type="secondary"
variant="secondary"
size="medium"
action={(element, next) => {
setTimeout(() => {
Expand All @@ -209,25 +209,25 @@ import AwesomeButtonSocial from 'react-awesome-button/src/components/AwesomeButt
jsx: `
<AwesomeButton
size="icon"
type="primary"
variant="primary"
>
<i className="fa fa-codepen" />
</AwesomeButton>
<AwesomeButton
size="small"
type="primary"
variant="primary"
>
Small
</AwesomeButton>
<AwesomeButton
size="small"
type="primary"
variant="primary"
>
Medium
</AwesomeButton>
<AwesomeButton
size="small"
type="primary"
variant="primary"
>
Large
</AwesomeButton>`,
Expand All @@ -236,28 +236,28 @@ import AwesomeButtonSocial from 'react-awesome-button/src/components/AwesomeButt
<AwesomeButton
cssModule={Modules.Modules[theme]}
size="icon"
type="primary"
variant="primary"
>
<i className="fa fa-codepen" aria-hidden />
</AwesomeButton>
<AwesomeButton
cssModule={Modules.Modules[theme]}
size="small"
type="primary"
variant="primary"
>
Small
</AwesomeButton>
<AwesomeButton
cssModule={Modules.Modules[theme]}
size="medium"
type="primary"
variant="primary"
>
Medium
</AwesomeButton>
<AwesomeButton
cssModule={Modules.Modules[theme]}
size="large"
type="primary"
variant="primary"
>
Large
</AwesomeButton>
Expand All @@ -282,7 +282,7 @@ function Component() {
return (
<AwesomeButton
cssModule={styles}
type="primary"
variant="primary"
>
Primary Blue Themed Button
</AwesomeButton>
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js

Large diffs are not rendered by default.

104 changes: 68 additions & 36 deletions dist/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@
--button-secondary-color-hover: #e1eaf1;
--button-secondary-color-active: #cfdee9;
--button-secondary-border: 2px solid #1E88E5;
--button-plain-color: #ffffff;
--button-plain-color-dark: #1360a4;
--button-plain-color-light: #1E88E5;
--button-plain-color-hover: #f2f2f2;
--button-plain-color-active: #e6e6e6;
--button-plain-border: 2px solid #1E88E5;
--button-anchor-color: #0e4f88;
--button-anchor-color-dark: #072743;
--button-anchor-color-light: white;
Expand Down Expand Up @@ -253,9 +259,9 @@ button.aws-btn .aws-btn__wrapper {
background: #324877; }
.aws-btn--facebook .aws-btn__content {
background: #4868ad;
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--facebook .aws-btn__content path {
fill: #FFFFFF; }
fill: #ffffff; }
.aws-btn--facebook.aws-btn--progress .aws-btn__content > span {
display: -webkit-box;
display: -ms-flexbox;
Expand All @@ -269,14 +275,14 @@ button.aws-btn .aws-btn__wrapper {
-ms-flex-pack: center;
justify-content: center; }
.aws-btn--facebook.aws-btn--progress .aws-btn__progress:before, .aws-btn--facebook.aws-btn--progress .aws-btn__progress:after {
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--messenger .aws-btn__wrapper:before {
background: #0960d1; }
.aws-btn--messenger .aws-btn__content {
background: #3186f6;
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--messenger .aws-btn__content path {
fill: #FFFFFF; }
fill: #ffffff; }
.aws-btn--messenger.aws-btn--progress .aws-btn__content > span {
display: -webkit-box;
display: -ms-flexbox;
Expand All @@ -290,14 +296,14 @@ button.aws-btn .aws-btn__wrapper {
-ms-flex-pack: center;
justify-content: center; }
.aws-btn--messenger.aws-btn--progress .aws-btn__progress:before, .aws-btn--messenger.aws-btn--progress .aws-btn__progress:after {
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--twitter .aws-btn__wrapper:before {
background: #0074a1; }
.aws-btn--twitter .aws-btn__content {
background: #00aced;
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--twitter .aws-btn__content path {
fill: #FFFFFF; }
fill: #ffffff; }
.aws-btn--twitter.aws-btn--progress .aws-btn__content > span {
display: -webkit-box;
display: -ms-flexbox;
Expand All @@ -311,14 +317,14 @@ button.aws-btn .aws-btn__wrapper {
-ms-flex-pack: center;
justify-content: center; }
.aws-btn--twitter.aws-btn--progress .aws-btn__progress:before, .aws-btn--twitter.aws-btn--progress .aws-btn__progress:after {
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--linkedin .aws-btn__wrapper:before {
background: #004569; }
.aws-btn--linkedin .aws-btn__content {
background: #0077b5;
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--linkedin .aws-btn__content path {
fill: #FFFFFF; }
fill: #ffffff; }
.aws-btn--linkedin.aws-btn--progress .aws-btn__content > span {
display: -webkit-box;
display: -ms-flexbox;
Expand All @@ -332,14 +338,14 @@ button.aws-btn .aws-btn__wrapper {
-ms-flex-pack: center;
justify-content: center; }
.aws-btn--linkedin.aws-btn--progress .aws-btn__progress:before, .aws-btn--linkedin.aws-btn--progress .aws-btn__progress:after {
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--whatsapp .aws-btn__wrapper:before {
background: #1a9247; }
.aws-btn--whatsapp .aws-btn__content {
background: #25d366;
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--whatsapp .aws-btn__content path {
fill: #FFFFFF; }
fill: #ffffff; }
.aws-btn--whatsapp.aws-btn--progress .aws-btn__content > span {
display: -webkit-box;
display: -ms-flexbox;
Expand All @@ -353,14 +359,14 @@ button.aws-btn .aws-btn__wrapper {
-ms-flex-pack: center;
justify-content: center; }
.aws-btn--whatsapp.aws-btn--progress .aws-btn__progress:before, .aws-btn--whatsapp.aws-btn--progress .aws-btn__progress:after {
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--github .aws-btn__wrapper:before {
background: #030304; }
.aws-btn--github .aws-btn__content {
background: #25292e;
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--github .aws-btn__content path {
fill: #FFFFFF; }
fill: #ffffff; }
.aws-btn--github.aws-btn--progress .aws-btn__content > span {
display: -webkit-box;
display: -ms-flexbox;
Expand All @@ -374,14 +380,14 @@ button.aws-btn .aws-btn__wrapper {
-ms-flex-pack: center;
justify-content: center; }
.aws-btn--github.aws-btn--progress .aws-btn__progress:before, .aws-btn--github.aws-btn--progress .aws-btn__progress:after {
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--reddit .aws-btn__wrapper:before {
background: #cb2703; }
.aws-btn--reddit .aws-btn__content {
background: #fc461e;
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--reddit .aws-btn__content path {
fill: #FFFFFF; }
fill: #ffffff; }
.aws-btn--reddit.aws-btn--progress .aws-btn__content > span {
display: -webkit-box;
display: -ms-flexbox;
Expand All @@ -395,14 +401,14 @@ button.aws-btn .aws-btn__wrapper {
-ms-flex-pack: center;
justify-content: center; }
.aws-btn--reddit.aws-btn--progress .aws-btn__progress:before, .aws-btn--reddit.aws-btn--progress .aws-btn__progress:after {
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--pinterest .aws-btn__wrapper:before {
background: #740611; }
.aws-btn--pinterest .aws-btn__content {
background: #bd091c;
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--pinterest .aws-btn__content path {
fill: #FFFFFF; }
fill: #ffffff; }
.aws-btn--pinterest.aws-btn--progress .aws-btn__content > span {
display: -webkit-box;
display: -ms-flexbox;
Expand All @@ -416,14 +422,14 @@ button.aws-btn .aws-btn__wrapper {
-ms-flex-pack: center;
justify-content: center; }
.aws-btn--pinterest.aws-btn--progress .aws-btn__progress:before, .aws-btn--pinterest.aws-btn--progress .aws-btn__progress:after {
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--gplus .aws-btn__wrapper:before {
background: #a3392d; }
.aws-btn--gplus .aws-btn__content {
background: #ce5b4e;
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--gplus .aws-btn__content path {
fill: #FFFFFF; }
fill: #ffffff; }
.aws-btn--gplus.aws-btn--progress .aws-btn__content > span {
display: -webkit-box;
display: -ms-flexbox;
Expand All @@ -437,14 +443,14 @@ button.aws-btn .aws-btn__wrapper {
-ms-flex-pack: center;
justify-content: center; }
.aws-btn--gplus.aws-btn--progress .aws-btn__progress:before, .aws-btn--gplus.aws-btn--progress .aws-btn__progress:after {
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--youtube .aws-btn__wrapper:before {
background: #881014; }
.aws-btn--youtube .aws-btn__content {
background: #cc181e;
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--youtube .aws-btn__content path {
fill: #FFFFFF; }
fill: #ffffff; }
.aws-btn--youtube.aws-btn--progress .aws-btn__content > span {
display: -webkit-box;
display: -ms-flexbox;
Expand All @@ -458,14 +464,14 @@ button.aws-btn .aws-btn__wrapper {
-ms-flex-pack: center;
justify-content: center; }
.aws-btn--youtube.aws-btn--progress .aws-btn__progress:before, .aws-btn--youtube.aws-btn--progress .aws-btn__progress:after {
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--mail .aws-btn__wrapper:before {
background: #9c9c9c; }
.aws-btn--mail .aws-btn__content {
background: #cfcfcf;
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--mail .aws-btn__content path {
fill: #FFFFFF; }
fill: #ffffff; }
.aws-btn--mail.aws-btn--progress .aws-btn__content > span {
display: -webkit-box;
display: -ms-flexbox;
Expand All @@ -479,14 +485,14 @@ button.aws-btn .aws-btn__wrapper {
-ms-flex-pack: center;
justify-content: center; }
.aws-btn--mail.aws-btn--progress .aws-btn__progress:before, .aws-btn--mail.aws-btn--progress .aws-btn__progress:after {
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--instagram .aws-btn__wrapper:before {
background: radial-gradient(circle at 25% 110%, #b9a800 0%, #938500 5%, #b10f00 45%, #8c0061 60%, #002ca9 90%); }
.aws-btn--instagram .aws-btn__content {
background: radial-gradient(circle at 25% 110%, #fdf497 0%, #fdf497 5%, #fd5949 45%, #d6249f 60%, #285AEB 90%);
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--instagram .aws-btn__content path {
fill: #FFFFFF; }
fill: #ffffff; }
.aws-btn--instagram.aws-btn--progress .aws-btn__content > span {
display: -webkit-box;
display: -ms-flexbox;
Expand All @@ -500,7 +506,7 @@ button.aws-btn .aws-btn__wrapper {
-ms-flex-pack: center;
justify-content: center; }
.aws-btn--instagram.aws-btn--progress .aws-btn__progress:before, .aws-btn--instagram.aws-btn--progress .aws-btn__progress:after {
color: #FFFFFF; }
color: #ffffff; }
.aws-btn--primary .aws-btn__wrapper:before {
background: var(--button-primary-color-dark); }
.aws-btn--primary .aws-btn__content {
Expand Down Expand Up @@ -553,6 +559,32 @@ button.aws-btn .aws-btn__wrapper {
justify-content: center; }
.aws-btn--secondary.aws-btn--progress .aws-btn__progress:before, .aws-btn--secondary.aws-btn--progress .aws-btn__progress:after {
color: var(--button-secondary-color-light); }
.aws-btn--plain .aws-btn__wrapper:before {
background: var(--button-plain-color-dark); }
.aws-btn--plain .aws-btn__content {
background: var(--button-plain-color);
color: var(--button-plain-color-light);
border: var(--button-plain-border); }
.aws-btn--plain .aws-btn__content path {
fill: var(--button-plain-color-light); }
.aws-btn--plain .aws-btn__wrapper:hover .aws-btn__content {
background: var(--button-plain-color-hover); }
.aws-btn--plain.aws-btn--active .aws-btn__wrapper .aws-btn__content {
background: var(--button-plain-color-active); }
.aws-btn--plain.aws-btn--progress .aws-btn__content > span {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
height: 100%;
width: 100%;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-box-pack: center;
-ms-flex-pack: center;
justify-content: center; }
.aws-btn--plain.aws-btn--progress .aws-btn__progress:before, .aws-btn--plain.aws-btn--progress .aws-btn__progress:after {
color: var(--button-plain-color-light); }
.aws-btn--link .aws-btn__wrapper:before {
background: var(--button-anchor-color-dark); }
.aws-btn--link .aws-btn__content {
Expand Down
Loading