Skip to content

fixing border style override #116

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Mar 9, 2017
Merged

fixing border style override #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f996ebe
fixing border style override
lizlux Mar 8, 2017
7a94152
Adding specific link to contribution
Mar 9, 2017
e09184f
building project
lizlux Mar 9, 2017
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
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ Reference Page and documentation are available at [http://fandomdesignsystem.com
https://wikia-inc.atlassian.net/wiki/display/DESYS/Design+System

## Contributors
See [contributors on GitHub](https://github.com/Wikia/design-system/graphs/contributors).
[Contribute to this project](http://fandomdesignsystem.com/#/overview/contributing)

See all [contributors on GitHub](https://github.com/Wikia/design-system/graphs/contributors).

## Copyright
Code and documentation copyright 2016 Wikia, Inc.
2 changes: 1 addition & 1 deletion dist/css/styles.css
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion dist/scss/wds-components/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@

@include button-background-color($wds-color-link);

border: 1px solid;
border-style: solid;
border-width: 1px;
color: $wds-color-white;
cursor: pointer;
display: inline-block;
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/design-system.css
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions docs/assets/design-system.js
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions docs/assets/vendor.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/assets/wds.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">


<meta name="design-system/config/environment" content="%7B%22modulePrefix%22%3A%22design-system%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22/%22%2C%22locationType%22%3A%22hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%7D%2C%22APP%22%3A%7B%22name%22%3A%22design-system%22%2C%22version%22%3A%225.2.0+43d73cd2%22%7D%2C%22exportApplicationGlobal%22%3Afalse%7D" />
<meta name="design-system/config/environment" content="%7B%22modulePrefix%22%3A%22design-system%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22/%22%2C%22locationType%22%3A%22hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%7D%2C%22APP%22%3A%7B%22name%22%3A%22design-system%22%2C%22version%22%3A%225.3.0+7a941522%22%7D%2C%22exportApplicationGlobal%22%3Afalse%7D" />

<link rel="stylesheet" href="/assets/vendor.css">
<link rel="stylesheet" href="/assets/design-system.css">
Expand Down
3 changes: 2 additions & 1 deletion style-guide/styles/wds-components/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@

@include button-background-color($wds-color-link);

border: 1px solid;
border-style: solid;
border-width: 1px;
color: $wds-color-white;
cursor: pointer;
display: inline-block;
Expand Down