diff options
author | Stefan Malzner <stefan@adlk.io> | 2019-06-07 11:25:54 +0200 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2019-06-07 11:25:54 +0200 |
commit | 9f2ab40b7602bc3df26ebb093b484b9917768f69 (patch) | |
tree | d00f2833c695cfe5e504fcc87578fe392f396585 /packages/forms/src/button | |
parent | Merge pull request #1473 from meetfranz/fix/reset-news-on-logout (diff) | |
download | ferdium-app-9f2ab40b7602bc3df26ebb093b484b9917768f69.tar.gz ferdium-app-9f2ab40b7602bc3df26ebb093b484b9917768f69.tar.zst ferdium-app-9f2ab40b7602bc3df26ebb093b484b9917768f69.zip |
Make buttons flexible in height
Diffstat (limited to 'packages/forms/src/button')
-rw-r--r-- | packages/forms/src/button/index.tsx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/packages/forms/src/button/index.tsx b/packages/forms/src/button/index.tsx index 6959cde73..9faedc8f1 100644 --- a/packages/forms/src/button/index.tsx +++ b/packages/forms/src/button/index.tsx | |||
@@ -44,7 +44,7 @@ const styles = (theme: Theme) => ({ | |||
44 | width: (props: IProps) => (props.stretch ? '100%' : 'auto') as CSS.WidthProperty<string>, | 44 | width: (props: IProps) => (props.stretch ? '100%' : 'auto') as CSS.WidthProperty<string>, |
45 | fontSize: theme.uiFontSize, | 45 | fontSize: theme.uiFontSize, |
46 | textDecoration: 'none', | 46 | textDecoration: 'none', |
47 | height: theme.buttonHeight, | 47 | // height: theme.buttonHeight, |
48 | 48 | ||
49 | '&:hover': { | 49 | '&:hover': { |
50 | opacity: 0.8, | 50 | opacity: 0.8, |
@@ -129,8 +129,7 @@ const styles = (theme: Theme) => ({ | |||
129 | position: (props: IProps): CSS.PositionProperty => props.stretch ? 'absolute' : 'inherit', | 129 | position: (props: IProps): CSS.PositionProperty => props.stretch ? 'absolute' : 'inherit', |
130 | }, | 130 | }, |
131 | icon: { | 131 | icon: { |
132 | marginLeft: -5, | 132 | margin: [1, 10, 0, -5], |
133 | marginRight: 10, | ||
134 | }, | 133 | }, |
135 | }); | 134 | }); |
136 | 135 | ||
@@ -142,7 +141,6 @@ class ButtonComponent extends Component<IProps> { | |||
142 | buttonType: 'primary' as ButtonType, | 141 | buttonType: 'primary' as ButtonType, |
143 | stretch: false, | 142 | stretch: false, |
144 | busy: false, | 143 | busy: false, |
145 | // target: '_self' | ||
146 | }; | 144 | }; |
147 | 145 | ||
148 | state = { | 146 | state = { |
@@ -220,7 +218,7 @@ class ButtonComponent extends Component<IProps> { | |||
220 | {icon && ( | 218 | {icon && ( |
221 | <Icon | 219 | <Icon |
222 | path={icon} | 220 | path={icon} |
223 | size={1} | 221 | size={0.8} |
224 | className={classes.icon} | 222 | className={classes.icon} |
225 | /> | 223 | /> |
226 | )} | 224 | )} |