Skip to content

Commit

Permalink
fix(android): fix Button layout (#657)
Browse files Browse the repository at this point in the history
  • Loading branch information
machour authored and Houssein Djirdeh committed Dec 10, 2017
1 parent fa70d90 commit 4bbc9f4
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions src/components/button.component.js
Expand Up @@ -79,8 +79,6 @@ const sizes = {
paddingBottom: 5,
paddingEnd: 8,
paddingLeft: 8,
marginLeft: 4,
marginRight: 4,
},
textStyle: {
fontSize: normalize(12),
Expand All @@ -95,8 +93,6 @@ const sizes = {
paddingBottom: 8,
paddingRight: 14,
paddingLeft: 14,
marginLeft: 6,
marginRight: 6,
},
textStyle: {
fontSize: normalize(14),
Expand All @@ -111,8 +107,6 @@ const sizes = {
paddingBottom: 13,
paddingRight: 17,
paddingLeft: 17,
marginLeft: 8,
marginRight: 8,
},
textStyle: {
fontSize: normalize(16),
Expand Down Expand Up @@ -152,6 +146,10 @@ const defaultDisabledTextStyle = {
color: '#d2d2d2',
};

const defaultContainerViewStyle = {
borderRadius: 2,
};

export class Button extends Component {
props: {
icon: string,
Expand All @@ -178,6 +176,7 @@ export class Button extends Component {
{...this.props}
title={isAndroid ? title.toUpperCase() : title}
raised={isAndroid}
containerViewStyle={defaultContainerViewStyle}
buttonStyle={{
...defaultButtonStyle,
...types[type].buttonStyle,
Expand Down

0 comments on commit 4bbc9f4

Please sign in to comment.