aboutsummaryrefslogtreecommitdiffstats
path: root/packages/theme/src/themes/dark/index.ts
diff options
context:
space:
mode:
authorLibravatar Kristóf Marussy <kristof@marussy.com>2021-05-12 18:48:40 +0200
committerLibravatar GitHub <noreply@github.com>2021-05-12 18:48:40 +0200
commit2a2f6fe945b87f50c95a31efb7c47c664e58a8bf (patch)
treef38165789e3a68b83a91b6882d75885c47579371 /packages/theme/src/themes/dark/index.ts
parentUpdated the documentation (#1394) (diff)
downloadferdium-app-2a2f6fe945b87f50c95a31efb7c47c664e58a8bf.tar.gz
ferdium-app-2a2f6fe945b87f50c95a31efb7c47c664e58a8bf.tar.zst
ferdium-app-2a2f6fe945b87f50c95a31efb7c47c664e58a8bf.zip
Fix some appearance issues (#1398)
* Fix property spelling in Sidebar component * Fix typo in todos partition name * Use the FerdiDev setting.json in dev mode The app.setPath calls are still a mess and need to be fixed, but this at least allows me to experiment locally. * Make @meetfranz/theme follow the accent color We inject the value of the accent color into the themes, so the buttons show the appropriate color. This allows removing some existing css hacks. In order to do this, the themes had to be turned into functions that take the brand color (accent color) as an argument instead of hard-coding it. The css-based accent color for legacy components is left unchanged. * Remove superfluous scrollbars While overflow: scroll doesn't look ugly on macs, because the system hides scrollbars by default (except on hower), on Linux and Windows, the disabled scrollbars appearing by default look ugly. We set overflow-y: auto instead to display a scrollbar only when needed. * Simplify theme generation in @meetfranz/themes * Remove default accent color code duplication * Apply accent color to styles not in themeInfo.json Some colors are darkened/lightened versions of the primary brand color, so they are not caught by build-theme-info. We create these styles with `color` manually. * Inset shadow on sidebar This creates a more flat look that projecting a shadow over the service, and avoid compositing a shadow over the webview. * Apply accent color to vertical style tab bar * Workspace drawer styling in vertical mode * Fix sidebar layout In vertical mode, the top of the service was clipped by the sidebar Also removes unnecessary whitespace in sidebar * Fix 1px wide line on right when todos are hidden * Fix window menu When building the menu bar, the File / app menu is added later, so we must be careful about indexing the menu bar. * Update locale files * Report the default accent color accurately * Fix inverted button with dark theme * Fix crash with invalid accent color Fall back to the default accent color instead * Darker secondary buttons in dark mode * Vertical workspace drawer style outside debug mode In order to reliably apply the style, we need to add a class name to the drawer manually, as component names only appear in class names in debug mode.
Diffstat (limited to 'packages/theme/src/themes/dark/index.ts')
-rw-r--r--packages/theme/src/themes/dark/index.ts304
1 files changed, 164 insertions, 140 deletions
diff --git a/packages/theme/src/themes/dark/index.ts b/packages/theme/src/themes/dark/index.ts
index b436d92f9..684865124 100644
--- a/packages/theme/src/themes/dark/index.ts
+++ b/packages/theme/src/themes/dark/index.ts
@@ -1,159 +1,183 @@
1import color from 'color'; 1import color from 'color';
2import { cloneDeep, merge } from 'lodash'; 2import { cloneDeep, merge } from 'lodash';
3 3
4import * as defaultStyles from '../default'; 4import makeDefaultThemeConfig from '../default';
5import * as legacyStyles from '../legacy'; 5import * as legacyStyles from '../legacy';
6 6
7export const colorBackground = legacyStyles.darkThemeGrayDarkest; 7export default (brandPrimary: string) => {
8export const colorContentBackground = legacyStyles.darkThemeGrayDarkest; 8 const defaultStyles = makeDefaultThemeConfig(brandPrimary);
9export const colorBackgroundSubscriptionContainer = legacyStyles.themeBrandInfo; 9 let brandPrimaryColor = color(legacyStyles.themeBrandPrimary);
10 try {
11 brandPrimaryColor = color(defaultStyles.brandPrimary);
12 } catch (e) {
13 // Ignore invalid color and fall back to default.
14 }
15
16 const colorBackground = legacyStyles.darkThemeGrayDarkest;
17 const colorText = legacyStyles.darkThemeTextColor;
18 const inputColor = legacyStyles.darkThemeGrayLightest;
19 const inputBackground = legacyStyles.themeGrayDark;
20 const inputBorder = `1px solid ${legacyStyles.darkThemeGrayLight}`;
21 const inputPrefixColor = color(legacyStyles.darkThemeGrayLighter).lighten(0.3).hex();
22 const buttonSecondaryTextColor = legacyStyles.darkThemeTextColor;
23 const selectColor = inputColor;
24 const drawerBg = color(colorBackground).lighten(0.3).hex();
25
26 const services = merge({}, defaultStyles.services, {
27 listItems: {
28 borderColor: legacyStyles.darkThemeGrayDarker,
29 hoverBgColor: legacyStyles.darkThemeGrayDarker,
30 disabled: {
31 color: legacyStyles.darkThemeGray,
32 },
33 },
34 });
10 35
11export const colorHeadline = legacyStyles.darkThemeTextColor; 36 return {
12export const colorText = legacyStyles.darkThemeTextColor; 37 ...defaultStyles,
13 38
14export const defaultContentBorder = legacyStyles.themeGrayDark; 39 colorBackground,
40 colorContentBackground: legacyStyles.darkThemeGrayDarkest,
41 colorBackgroundSubscriptionContainer: legacyStyles.themeBrandInfo,
15 42
16// Loader 43 colorHeadline: legacyStyles.darkThemeTextColor,
17export const colorFullscreenLoaderSpinner = '#FFF'; 44 colorText: legacyStyles.darkThemeTextColor,
18export const colorWebviewLoaderBackground = color(legacyStyles.darkThemeGrayDarkest).alpha(0.5).rgb().string();
19 45
20// Input 46 defaultContentBorder: legacyStyles.themeGrayDark,
21export const labelColor = legacyStyles.darkThemeTextColor;
22export const inputColor = legacyStyles.darkThemeGrayLightest;
23export const inputBackground = legacyStyles.themeGrayDark;
24export const inputBorder = `1px solid ${legacyStyles.darkThemeGrayLight}`;
25export const inputPrefixColor = color(legacyStyles.darkThemeGrayLighter).lighten(0.3).hex();
26export const inputPrefixBackground = legacyStyles.darkThemeGray;
27export const inputDisabledOpacity = 0.5;
28export const inputScorePasswordBackground = legacyStyles.darkThemeGrayDark;
29export const inputModifierColor = color(legacyStyles.darkThemeGrayLighter).lighten(0.3).hex();
30export const inputPlaceholderColor = color(legacyStyles.darkThemeGrayLighter).darken(0.1).hex();
31 47
32// Toggle 48 // Loader
33export const toggleBackground = legacyStyles.darkThemeGray; 49 colorFullscreenLoaderSpinner: '#FFF',
34export const toggleButton = legacyStyles.darkThemeGrayLighter; 50 colorWebviewLoaderBackground: color(legacyStyles.darkThemeGrayDarkest).alpha(0.5).rgb().string(),
35 51
36// Button 52 // Input
37export const buttonPrimaryTextColor = legacyStyles.darkThemeTextColor; 53 labelColor: legacyStyles.darkThemeTextColor,
54 inputColor,
55 inputBackground,
56 inputBorder,
57 inputPrefixColor,
58 inputPrefixBackground: legacyStyles.darkThemeGray,
59 inputDisabledOpacity: 0.5,
60 inputScorePasswordBackground: legacyStyles.darkThemeGrayDark,
61 inputModifierColor: color(legacyStyles.darkThemeGrayLighter).lighten(0.3).hex(),
62 inputPlaceholderColor: color(legacyStyles.darkThemeGrayLighter).darken(0.1).hex(),
38 63
39export const buttonSecondaryBackground = legacyStyles.darkThemeGrayLighter; 64 // Toggle
40export const buttonSecondaryTextColor = legacyStyles.darkThemeTextColor; 65 toggleBackground: legacyStyles.darkThemeGray,
66 toggleButton: legacyStyles.darkThemeGrayLighter,
41 67
42export const buttonDangerTextColor = legacyStyles.darkThemeTextColor; 68 // Button
69 buttonPrimaryTextColor: legacyStyles.darkThemeTextColor,
43 70
44export const buttonWarningTextColor = legacyStyles.darkThemeTextColor; 71 buttonSecondaryBackground: legacyStyles.darkThemeGrayLighter,
72 buttonSecondaryTextColor,
45 73
46export const buttonLoaderColor = { 74 buttonDangerTextColor: legacyStyles.darkThemeTextColor,
47 primary: '#FFF',
48 secondary: buttonSecondaryTextColor,
49 success: '#FFF',
50 warning: '#FFF',
51 danger: '#FFF',
52 inverted: defaultStyles.brandPrimary,
53};
54 75
55// Select 76 buttonWarningTextColor: legacyStyles.darkThemeTextColor,
56export const selectBackground = inputBackground; 77
57export const selectBorder = inputBorder; 78 buttonLoaderColor: {
58export const selectColor = inputColor; 79 primary: '#FFF',
59export const selectToggleColor = inputPrefixColor; 80 secondary: buttonSecondaryTextColor,
60export const selectPopupBackground = legacyStyles.darkThemeGrayLight; 81 success: '#FFF',
61export const selectOptionColor = '#FFF'; 82 warning: '#FFF',
62export const selectOptionBorder = `1px solid ${color(legacyStyles.darkThemeGrayLight).darken(0.2).hex()}`; 83 danger: '#FFF',
63export const selectOptionItemHover = color(legacyStyles.darkThemeGrayLight).darken(0.2).hex(); 84 inverted: defaultStyles.brandPrimary,
64export const selectOptionItemHoverColor = selectColor;
65export const selectSearchColor = inputBackground;
66
67// Modal
68export const colorModalOverlayBackground = color(legacyStyles.darkThemeBlack).alpha(0.9).rgb().string();
69export const colorModalBackground = legacyStyles.darkThemeGrayDark;
70
71// Services
72export const services = merge({}, defaultStyles.services, {
73 listItems: {
74 borderColor: legacyStyles.darkThemeGrayDarker,
75 hoverBgColor: legacyStyles.darkThemeGrayDarker,
76 disabled: {
77 color: legacyStyles.darkThemeGray,
78 },
79 },
80});
81
82// Service Icon
83export const serviceIcon = merge({}, defaultStyles.serviceIcon, {
84 isCustom: {
85 border: `1px solid ${legacyStyles.darkThemeGrayDark}`,
86 },
87});
88
89// Workspaces
90const drawerBg = color(colorBackground).lighten(0.3).hex();
91
92export const workspaces = merge({}, defaultStyles.workspaces, {
93 settings: {
94 listItems: cloneDeep(services.listItems),
95 },
96 drawer: {
97 background: drawerBg,
98 addButton: {
99 color: legacyStyles.darkThemeGrayLighter,
100 hoverColor: legacyStyles.darkThemeGraySmoke,
101 }, 85 },
102 listItem: { 86
103 border: color(drawerBg).lighten(0.2).hex(), 87 // Select
104 hoverBackground: color(drawerBg).lighten(0.2).hex(), 88 selectBackground: inputBackground,
105 activeBackground: defaultStyles.brandPrimary, 89 selectBorder: inputBorder,
106 name: { 90 selectColor,
107 color: colorText, 91 selectToggleColor: inputPrefixColor,
108 activeColor: 'white', 92 selectPopupBackground: legacyStyles.darkThemeGrayLight,
93 selectOptionColor: '#FFF',
94 selectOptionBorder: `1px solid ${color(legacyStyles.darkThemeGrayLight).darken(0.2).hex()}`,
95 selectOptionItemHover: color(legacyStyles.darkThemeGrayLight).darken(0.2).hex(),
96 selectOptionItemHoverColor: selectColor,
97 selectSearchColor: inputBackground,
98
99 // Modal
100 colorModalOverlayBackground: color(legacyStyles.darkThemeBlack).alpha(0.9).rgb().string(),
101 colorModalBackground: legacyStyles.darkThemeGrayDark,
102
103 // Services
104 services,
105
106 // Service Icon
107 serviceIcon: merge({}, defaultStyles.serviceIcon, {
108 isCustom: {
109 border: `1px solid ${legacyStyles.darkThemeGrayDark}`,
109 }, 110 },
110 services: { 111 }),
111 color: color(colorText).darken(0.5).hex(), 112
112 active: color(defaultStyles.brandPrimary).lighten(0.5).hex(), 113 // Workspaces
114 workspaces: merge({}, defaultStyles.workspaces, {
115 settings: {
116 listItems: cloneDeep(services.listItems),
113 }, 117 },
114 }, 118 drawer: {
115 }, 119 background: drawerBg,
116}); 120 addButton: {
117 121 color: legacyStyles.darkThemeGrayLighter,
118// Announcements 122 hoverColor: legacyStyles.darkThemeGraySmoke,
119export const announcements = merge({}, defaultStyles.announcements, { 123 },
120 spotlight: { 124 listItem: {
121 background: legacyStyles.darkThemeGrayDark, 125 border: color(drawerBg).lighten(0.2).hex(),
122 }, 126 hoverBackground: color(drawerBg).lighten(0.2).hex(),
123}); 127 activeBackground: defaultStyles.brandPrimary,
124 128 name: {
125// Signup 129 color: colorText,
126export const signup = merge({}, defaultStyles.signup, { 130 activeColor: 'white',
127 pricing: { 131 },
128 feature: { 132 services: {
129 background: legacyStyles.darkThemeGrayLight, 133 color: color(colorText).darken(0.5).hex(),
130 border: color(legacyStyles.darkThemeGrayLight).lighten(0.2).hex(), 134 active: brandPrimaryColor.lighten(0.5).hex(),
131 }, 135 },
132 }, 136 },
133}); 137 },
134 138 }),
135// Todos 139
136export const todos = merge({}, defaultStyles.todos, { 140 // Announcements
137 todosLayer: { 141 announcements: merge({}, defaultStyles.announcements, {
138 borderLeftColor: legacyStyles.darkThemeGrayDarker, 142 spotlight: {
139 }, 143 background: legacyStyles.darkThemeGrayDark,
140 toggleButton: { 144 },
141 background: defaultStyles.styleTypes.primary.accent, 145 }),
142 textColor: defaultStyles.styleTypes.primary.contrast, 146
143 shadowColor: 'rgba(0, 0, 0, 0.2)', 147 // Signup
144 }, 148 signup: merge({}, defaultStyles.signup, {
145 dragIndicator: { 149 pricing: {
146 background: legacyStyles.themeGrayLight, 150 feature: {
147 }, 151 background: legacyStyles.darkThemeGrayLight,
148}); 152 border: color(legacyStyles.darkThemeGrayLight).lighten(0.2).hex(),
149 153 },
150// TrialStatusBar 154 },
151export const trialStatusBar = merge({}, defaultStyles.trialStatusBar, { 155 }),
152 bar: { 156
153 background: legacyStyles.darkThemeGray, 157 // Todos
154 }, 158 todos: merge({}, defaultStyles.todos, {
155 progressBar: { 159 todosLayer: {
156 background: legacyStyles.darkThemeGrayLighter, 160 borderLeftColor: legacyStyles.darkThemeGrayDarker,
157 progressIndicator: legacyStyles.darkThemeGrayLightest, 161 },
158 }, 162 toggleButton: {
159}); 163 background: defaultStyles.styleTypes.primary.accent,
164 textColor: defaultStyles.styleTypes.primary.contrast,
165 shadowColor: 'rgba(0, 0, 0, 0.2)',
166 },
167 dragIndicator: {
168 background: legacyStyles.themeGrayLight,
169 },
170 }),
171
172 // TrialStatusBar
173 trialStatusBar: merge({}, defaultStyles.trialStatusBar, {
174 bar: {
175 background: legacyStyles.darkThemeGray,
176 },
177 progressBar: {
178 background: legacyStyles.darkThemeGrayLighter,
179 progressIndicator: legacyStyles.darkThemeGrayLightest,
180 },
181 }),
182 };
183};