Skip to content

Commit

Permalink
[bug] Rounded raised button would have white square edges #493
Browse files Browse the repository at this point in the history
  • Loading branch information
iRoachie committed Jul 16, 2017
1 parent bb8c0f3 commit e487f23
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/buttons/Button.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,7 @@ const Button = props => {

const baseFont = {
color: (textStyle && textStyle.color) || color || stylesObject.text.color,
size:
(textStyle && textStyle.fontSize) ||
size: (textStyle && textStyle.fontSize) ||
fontSize ||
(!large && stylesObject.smallFont.fontSize) ||
stylesObject.text.fontSize,
Expand Down Expand Up @@ -231,6 +230,7 @@ Button.propTypes = {

const stylesObject = {
container: {
backgroundColor: 'transparent',
marginLeft: 15,
marginRight: 15,
},
Expand Down
4 changes: 4 additions & 0 deletions src/buttons/__tests__/__snapshots__/Button.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ exports[`Button Component should render with custom icon component 1`] = `
style={
Array [
Object {
"backgroundColor": "transparent",
"marginLeft": 15,
"marginRight": 15,
},
Expand Down Expand Up @@ -92,6 +93,7 @@ exports[`Button Component should render with default icon 1`] = `
style={
Array [
Object {
"backgroundColor": "transparent",
"marginLeft": 15,
"marginRight": 15,
},
Expand Down Expand Up @@ -180,6 +182,7 @@ exports[`Button Component should render with icon type 1`] = `
style={
Array [
Object {
"backgroundColor": "transparent",
"marginLeft": 15,
"marginRight": 15,
},
Expand Down Expand Up @@ -266,6 +269,7 @@ exports[`Button Component should render without issues 1`] = `
style={
Array [
Object {
"backgroundColor": "transparent",
"marginLeft": 15,
"marginRight": 15,
},
Expand Down

0 comments on commit e487f23

Please sign in to comment.