diff options
author | Dominik Guzei <dominik.guzei@gmail.com> | 2019-04-10 11:10:57 +0200 |
---|---|---|
committer | Dominik Guzei <dominik.guzei@gmail.com> | 2019-04-10 11:10:57 +0200 |
commit | e593568afa238388374394806999ceccbd85c15e (patch) | |
tree | f53f162a85ead7211ad0ff693f6543251d720e98 | |
parent | add css transition to drawer workspace item hover (diff) | |
download | ferdium-app-e593568afa238388374394806999ceccbd85c15e.tar.gz ferdium-app-e593568afa238388374394806999ceccbd85c15e.tar.zst ferdium-app-e593568afa238388374394806999ceccbd85c15e.zip |
fix drawer add workspace label styles
-rw-r--r-- | packages/theme/src/themes/default/index.ts | 4 | ||||
-rw-r--r-- | src/features/workspaces/components/WorkspaceDrawer.js | 13 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 4 |
3 files changed, 12 insertions, 9 deletions
diff --git a/packages/theme/src/themes/default/index.ts b/packages/theme/src/themes/default/index.ts index d2b9014b4..eb7e80b9f 100644 --- a/packages/theme/src/themes/default/index.ts +++ b/packages/theme/src/themes/default/index.ts | |||
@@ -169,8 +169,8 @@ export const workspaces = { | |||
169 | padding: 20, | 169 | padding: 20, |
170 | background: drawerBg, | 170 | background: drawerBg, |
171 | addButton: { | 171 | addButton: { |
172 | color: legacyStyles.themeGrayLight, | 172 | color: color(legacyStyles.themeGrayLight).lighten(0.1).hex(), |
173 | hoverColor: color(legacyStyles.themeGrayLight).lighten(0.1).hex(), | 173 | hoverColor: legacyStyles.themeGrayLight, |
174 | }, | 174 | }, |
175 | listItem: { | 175 | listItem: { |
176 | hoverBackground: color(drawerBg).darken(0.01).hex(), | 176 | hoverBackground: color(drawerBg).darken(0.01).hex(), |
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js index bb77aa72d..ae67b9ea4 100644 --- a/src/features/workspaces/components/WorkspaceDrawer.js +++ b/src/features/workspaces/components/WorkspaceDrawer.js | |||
@@ -80,9 +80,12 @@ const styles = theme => ({ | |||
80 | }, | 80 | }, |
81 | addNewWorkspaceLabel: { | 81 | addNewWorkspaceLabel: { |
82 | height: 'auto', | 82 | height: 'auto', |
83 | color: theme.workspaceDrawerServicesColor, | 83 | color: theme.workspaces.drawer.addButton.color, |
84 | marginTop: 20, | 84 | marginTop: 40, |
85 | marginLeft: theme.workspaceDrawerPadding, | 85 | textAlign: 'center', |
86 | '& > svg': { | ||
87 | fill: theme.workspaces.drawer.addButton.color, | ||
88 | }, | ||
86 | '& > span': { | 89 | '& > span': { |
87 | fontSize: '13px', | 90 | fontSize: '13px', |
88 | marginLeft: 10, | 91 | marginLeft: 10, |
@@ -90,9 +93,9 @@ const styles = theme => ({ | |||
90 | top: -3, | 93 | top: -3, |
91 | }, | 94 | }, |
92 | '&:hover': { | 95 | '&:hover': { |
93 | color: theme.workspaceDrawerAddButtonHoverColor, | 96 | color: theme.workspaces.drawer.addButton.hoverColor, |
94 | '& > svg': { | 97 | '& > svg': { |
95 | fill: theme.workspaceDrawerAddButtonHoverColor, | 98 | fill: theme.workspaces.drawer.addButton.hoverColor, |
96 | }, | 99 | }, |
97 | }, | 100 | }, |
98 | }, | 101 | }, |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index e55489418..db1d51f3b 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -306,7 +306,7 @@ | |||
306 | "validation.url": "{field} is not a valid URL", | 306 | "validation.url": "{field} is not a valid URL", |
307 | "welcome.loginButton": "Login to your account", | 307 | "welcome.loginButton": "Login to your account", |
308 | "welcome.signupButton": "Create a free account", | 308 | "welcome.signupButton": "Create a free account", |
309 | "workspaceDrawer.addNewWorkspaceLabel": "add new workspace", | 309 | "workspaceDrawer.addNewWorkspaceLabel": "Add new workspace", |
310 | "workspaceDrawer.allServices": "All services", | 310 | "workspaceDrawer.allServices": "All services", |
311 | "workspaceDrawer.headline": "Workspaces", | 311 | "workspaceDrawer.headline": "Workspaces", |
312 | "workspaceDrawer.item.noServicesAddedYet": "No services added yet", | 312 | "workspaceDrawer.item.noServicesAddedYet": "No services added yet", |
@@ -315,4 +315,4 @@ | |||
315 | "workspaceDrawer.workspaceFeatureInfo": "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>", | 315 | "workspaceDrawer.workspaceFeatureInfo": "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.</p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.</p>", |
316 | "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", | 316 | "workspaceDrawer.workspacesSettingsTooltip": "Edit workspaces settings", |
317 | "workspaces.switchingIndicator.switchingTo": "Switching to" | 317 | "workspaces.switchingIndicator.switchingTo": "Switching to" |
318 | } \ No newline at end of file | 318 | } |