aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2019-03-20 16:10:04 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2019-03-20 16:10:04 +0100
commit2f91e643642f6604e3cb60ad94258e777c5a32ad (patch)
tree7112bb4b55671bccf613850fe212e374b29f9ac8 /packages
parentBring lerna back in sync (diff)
downloadferdium-app-2f91e643642f6604e3cb60ad94258e777c5a32ad.tar.gz
ferdium-app-2f91e643642f6604e3cb60ad94258e777c5a32ad.tar.zst
ferdium-app-2f91e643642f6604e3cb60ad94258e777c5a32ad.zip
fix height difference
Diffstat (limited to 'packages')
-rw-r--r--packages/forms/src/button/index.tsx1
-rw-r--r--packages/theme/src/themes/default/index.ts4
2 files changed, 4 insertions, 1 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,
diff --git a/packages/theme/src/themes/default/index.ts b/packages/theme/src/themes/default/index.ts
index 8a71e61cf..273792d46 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
43export const labelColor = legacyStyles.themeGrayLight; 43export const labelColor = legacyStyles.themeGrayLight;
44export const inputColor = legacyStyles.themeGray; 44export const inputColor = legacyStyles.themeGray;
45export const inputHeight = '35px'; 45export const inputHeight = 40;
46export const inputBackground = legacyStyles.themeGrayLightest; 46export const inputBackground = legacyStyles.themeGrayLightest;
47export const inputBorder = `1px solid ${legacyStyles.themeGrayLighter}`; 47export const inputBorder = `1px solid ${legacyStyles.themeGrayLighter}`;
48export const inputModifierColor = legacyStyles.themeGrayLight; 48export const inputModifierColor = legacyStyles.themeGrayLight;
@@ -108,6 +108,8 @@ export const buttonInvertedBackground = 'none';
108export const buttonInvertedTextColor = brandPrimary; 108export const buttonInvertedTextColor = brandPrimary;
109export const buttonInvertedBorder = `1px solid ${brandPrimary}`; 109export const buttonInvertedBorder = `1px solid ${brandPrimary}`;
110 110
111export const buttonHeight = inputHeight;
112
111export const buttonLoaderColor = { 113export const buttonLoaderColor = {
112 primary: '#FFF', 114 primary: '#FFF',
113 secondary: buttonSecondaryTextColor, 115 secondary: buttonSecondaryTextColor,