diff options
| author |  Dominik Guzei <dominik.guzei@gmail.com> | 2019-04-10 16:40:11 +0200 |
|---|---|---|
| committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-04-10 16:40:11 +0200 |
| commit | fa1f764e4eb4df1c8fcc9b79b58ceeac3d63cdb4 (patch) | |
| tree | 2051271328c390be6c78b0a214c948e0c0c5f865 /packages/forms/src/input/styles.ts | |
| parent | add context menu for workspace drawer items (diff) | |
| parent | test package order (diff) | |
| download | ferdium-app-fa1f764e4eb4df1c8fcc9b79b58ceeac3d63cdb4.tar.gz ferdium-app-fa1f764e4eb4df1c8fcc9b79b58ceeac3d63cdb4.tar.zst ferdium-app-fa1f764e4eb4df1c8fcc9b79b58ceeac3d63cdb4.zip | |
merge conflicts with latest develop
Diffstat (limited to 'packages/forms/src/input/styles.ts')
| -rw-r--r-- | packages/forms/src/input/styles.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/forms/src/input/styles.ts b/packages/forms/src/input/styles.ts index 2f7ea65f2..e2ab30a4f 100644 --- a/packages/forms/src/input/styles.ts +++ b/packages/forms/src/input/styles.ts | |||
| @@ -4,7 +4,7 @@ import CSS from 'csstype'; | |||
| 4 | const prefixStyles = (theme: Theme) => ({ | 4 | const prefixStyles = (theme: Theme) => ({ |
| 5 | background: theme.inputPrefixBackground, | 5 | background: theme.inputPrefixBackground, |
| 6 | color: theme.inputPrefixColor, | 6 | color: theme.inputPrefixColor, |
| 7 | lineHeight: theme.inputHeight, | 7 | lineHeight: `${theme.inputHeight}px`, |
| 8 | padding: '0 10px', | 8 | padding: '0 10px', |
| 9 | fontSize: theme.uiFontSize, | 9 | fontSize: theme.uiFontSize, |
| 10 | }); | 10 | }); |