Skip to content

Commit 51c26ac

Browse files
author
Liz Lee
authored
Merge pull request #116 from Wikia/button-border
fixing border style override
2 parents 51d9471 + e09184f commit 51c26ac

File tree

9 files changed

+44
-40
lines changed

9 files changed

+44
-40
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ Reference Page and documentation are available at [http://fandomdesignsystem.com
66
https://wikia-inc.atlassian.net/wiki/display/DESYS/Design+System
77

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

1113
## Copyright
1214
Code and documentation copyright 2016 Wikia, Inc.

dist/css/styles.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/scss/wds-components/_buttons.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

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

25-
border: 1px solid;
25+
border-style: solid;
26+
border-width: 1px;
2627
color: $wds-color-white;
2728
cursor: pointer;
2829
display: inline-block;

docs/assets/design-system.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/assets/design-system.js

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/assets/vendor.js

Lines changed: 19 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/assets/wds.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<meta name="viewport" content="width=device-width, initial-scale=1">
99

1010

11-
<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" />
11+
<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" />
1212

1313
<link rel="stylesheet" href="/assets/vendor.css">
1414
<link rel="stylesheet" href="/assets/design-system.css">

style-guide/styles/wds-components/_buttons.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222

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

25-
border: 1px solid;
25+
border-style: solid;
26+
border-width: 1px;
2627
color: $wds-color-white;
2728
cursor: pointer;
2829
display: inline-block;

0 commit comments

Comments
 (0)