diff options
| author |  Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-21 16:35:38 +0100 |
|---|---|---|
| committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-03-21 16:36:19 +0100 |
| commit | 93137229bf3b04e4589ae315a81ed2de7a171ded (patch) | |
| tree | 703432658a50425e2a295f527c9fdb392211bfd3 /packages/forms/src/button/index.tsx | |
| parent | add workspaces count badge in settings navigation (diff) | |
| download | ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.tar.gz ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.tar.zst ferdium-app-93137229bf3b04e4589ae315a81ed2de7a171ded.zip | |
fix merge conflicts with latest develop
Diffstat (limited to 'packages/forms/src/button/index.tsx')
| -rw-r--r-- | packages/forms/src/button/index.tsx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/forms/src/button/index.tsx b/packages/forms/src/button/index.tsx index 7a7f83dab..6959cde73 100644 --- a/packages/forms/src/button/index.tsx +++ b/packages/forms/src/button/index.tsx | |||
| @@ -44,6 +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 | 48 | ||
| 48 | '&:hover': { | 49 | '&:hover': { |
| 49 | opacity: 0.8, | 50 | opacity: 0.8, |