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/theme/src | |
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/theme/src')
-rw-r--r-- | packages/theme/src/themes/default/index.ts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/theme/src/themes/default/index.ts b/packages/theme/src/themes/default/index.ts index 2290b18e3..f2632ee20 100644 --- a/packages/theme/src/themes/default/index.ts +++ b/packages/theme/src/themes/default/index.ts | |||
@@ -42,7 +42,7 @@ export const colorWebviewLoaderBackground = color(legacyStyles.themeGrayLighter) | |||
42 | // Input | 42 | // Input |
43 | export const labelColor = legacyStyles.themeGrayLight; | 43 | export const labelColor = legacyStyles.themeGrayLight; |
44 | export const inputColor = legacyStyles.themeGray; | 44 | export const inputColor = legacyStyles.themeGray; |
45 | export const inputHeight = '35px'; | 45 | export const inputHeight = 40; |
46 | export const inputBackground = legacyStyles.themeGrayLightest; | 46 | export const inputBackground = legacyStyles.themeGrayLightest; |
47 | export const inputBorder = `1px solid ${legacyStyles.themeGrayLighter}`; | 47 | export const inputBorder = `1px solid ${legacyStyles.themeGrayLighter}`; |
48 | export const inputModifierColor = legacyStyles.themeGrayLight; | 48 | export const inputModifierColor = legacyStyles.themeGrayLight; |
@@ -108,6 +108,8 @@ export const buttonInvertedBackground = 'none'; | |||
108 | export const buttonInvertedTextColor = brandPrimary; | 108 | export const buttonInvertedTextColor = brandPrimary; |
109 | export const buttonInvertedBorder = `1px solid ${brandPrimary}`; | 109 | export const buttonInvertedBorder = `1px solid ${brandPrimary}`; |
110 | 110 | ||
111 | export const buttonHeight = inputHeight; | ||
112 | |||
111 | export const buttonLoaderColor = { | 113 | export const buttonLoaderColor = { |
112 | primary: '#FFF', | 114 | primary: '#FFF', |
113 | secondary: buttonSecondaryTextColor, | 115 | secondary: buttonSecondaryTextColor, |