diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/components/auth/Login.js | 13 | ||||
-rw-r--r-- | src/components/layout/AppLayout.js | 6 | ||||
-rw-r--r-- | src/components/services/content/Services.js | 12 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 6 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 6 | ||||
-rw-r--r-- | src/i18n/messages/src/components/auth/Login.json | 42 | ||||
-rw-r--r-- | src/i18n/messages/src/components/layout/AppLayout.json | 13 | ||||
-rw-r--r-- | src/i18n/messages/src/components/services/content/Services.json | 26 | ||||
-rw-r--r-- | src/i18n/messages/src/containers/settings/EditSettingsScreen.json | 41 | ||||
-rw-r--r-- | src/theme/default/legacy.js | 6 |
10 files changed, 139 insertions, 32 deletions
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js index f8caebd7e..1563e471a 100644 --- a/src/components/auth/Login.js +++ b/src/components/auth/Login.js | |||
@@ -34,6 +34,14 @@ const messages = defineMessages({ | |||
34 | id: 'login.invalidCredentials', | 34 | id: 'login.invalidCredentials', |
35 | defaultMessage: '!!!Email or password not valid', | 35 | defaultMessage: '!!!Email or password not valid', |
36 | }, | 36 | }, |
37 | customServerQuestion: { | ||
38 | id: 'login.customServerQuestion', | ||
39 | defaultMessage: '!!!Using a custom Ferdi server?', | ||
40 | }, | ||
41 | customServerSuggestion: { | ||
42 | id: 'login.customServerSuggestion', | ||
43 | defaultMessage: '!!!Try importing your Franz account', | ||
44 | }, | ||
37 | tokenExpired: { | 45 | tokenExpired: { |
38 | id: 'login.tokenExpired', | 46 | id: 'login.tokenExpired', |
39 | defaultMessage: '!!!Your session expired, please login again.', | 47 | defaultMessage: '!!!Your session expired, please login again.', |
@@ -141,14 +149,13 @@ export default @observer class Login extends Component { | |||
141 | <p className="error-message center">{intl.formatMessage(messages.invalidCredentials)}</p> | 149 | <p className="error-message center">{intl.formatMessage(messages.invalidCredentials)}</p> |
142 | { window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' && ( | 150 | { window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' && ( |
143 | <p className="error-message center"> | 151 | <p className="error-message center"> |
144 | Using a custom Ferdi server? Try | 152 | {intl.formatMessage(messages.customServerQuestion)}{' '} |
145 | {' '} | ||
146 | <Link | 153 | <Link |
147 | to={`${window.ferdi.stores.settings.all.app.server.replace('v1', '')}/import`} | 154 | to={`${window.ferdi.stores.settings.all.app.server.replace('v1', '')}/import`} |
148 | target="_blank" | 155 | target="_blank" |
149 | style={{ cursor: 'pointer', textDecoration: 'underline' }} | 156 | style={{ cursor: 'pointer', textDecoration: 'underline' }} |
150 | > | 157 | > |
151 | importing your Franz account | 158 | {intl.formatMessage(messages.customServerSuggestion)} |
152 | </Link> | 159 | </Link> |
153 | </p> | 160 | </p> |
154 | )} | 161 | )} |
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 02550c87f..5c3d301e0 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -34,6 +34,10 @@ const messages = defineMessages({ | |||
34 | id: 'infobar.requiredRequestsFailed', | 34 | id: 'infobar.requiredRequestsFailed', |
35 | defaultMessage: '!!!Could not load services and user information', | 35 | defaultMessage: '!!!Could not load services and user information', |
36 | }, | 36 | }, |
37 | authRequestFailed: { | ||
38 | id: 'infobar.authRequestFailed', | ||
39 | defaultMessage: '!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.', | ||
40 | }, | ||
37 | }); | 41 | }); |
38 | 42 | ||
39 | const styles = theme => ({ | 43 | const styles = theme => ({ |
@@ -154,7 +158,7 @@ class AppLayout extends Component { | |||
154 | onClick={retryRequiredRequests} | 158 | onClick={retryRequiredRequests} |
155 | > | 159 | > |
156 | <span className="mdi mdi-flash" /> | 160 | <span className="mdi mdi-flash" /> |
157 | There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists. | 161 | {intl.formatMessage(messages.authRequestFailed)} |
158 | </InfoBar> | 162 | </InfoBar> |
159 | )} | 163 | )} |
160 | {showServicesUpdatedInfoBar && ( | 164 | {showServicesUpdatedInfoBar && ( |
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js index 9fe737529..5fad070f0 100644 --- a/src/components/services/content/Services.js +++ b/src/components/services/content/Services.js | |||
@@ -16,6 +16,14 @@ const messages = defineMessages({ | |||
16 | id: 'services.getStarted', | 16 | id: 'services.getStarted', |
17 | defaultMessage: '!!!Get started', | 17 | defaultMessage: '!!!Get started', |
18 | }, | 18 | }, |
19 | login: { | ||
20 | id: 'services.login', | ||
21 | defaultMessage: '!!!Please login to use Ferdi.', | ||
22 | }, | ||
23 | serverInfo: { | ||
24 | id: 'services.serverInfo', | ||
25 | defaultMessage: '!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.', | ||
26 | }, | ||
19 | }); | 27 | }); |
20 | 28 | ||
21 | export default @observer class Services extends Component { | 29 | export default @observer class Services extends Component { |
@@ -64,8 +72,8 @@ export default @observer class Services extends Component { | |||
64 | <h1>{intl.formatMessage(messages.welcome)}</h1> | 72 | <h1>{intl.formatMessage(messages.welcome)}</h1> |
65 | { !isLoggedIn && ( | 73 | { !isLoggedIn && ( |
66 | <> | 74 | <> |
67 | <p>Please login to use Ferdi.</p> | 75 | <p>{intl.formatMessage(messages.login)}</p> |
68 | <p>Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.</p> | 76 | <p>{intl.formatMessage(messages.serverInfo)}</p> |
69 | </> | 77 | </> |
70 | ) } | 78 | ) } |
71 | <Appear | 79 | <Appear |
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 246952125..38f73c20f 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -41,6 +41,10 @@ const messages = defineMessages({ | |||
41 | id: 'settings.app.form.minimizeToSystemTray', | 41 | id: 'settings.app.form.minimizeToSystemTray', |
42 | defaultMessage: '!!!Minimize Ferdi to system tray', | 42 | defaultMessage: '!!!Minimize Ferdi to system tray', |
43 | }, | 43 | }, |
44 | server: { | ||
45 | id: 'settings.app.form.server', | ||
46 | defaultMessage: '!!!Server', | ||
47 | }, | ||
44 | language: { | 48 | language: { |
45 | id: 'settings.app.form.language', | 49 | id: 'settings.app.form.language', |
46 | defaultMessage: '!!!Language', | 50 | defaultMessage: '!!!Language', |
@@ -151,7 +155,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
151 | default: DEFAULT_APP_SETTINGS.minimizeToSystemTray, | 155 | default: DEFAULT_APP_SETTINGS.minimizeToSystemTray, |
152 | }, | 156 | }, |
153 | server: { | 157 | server: { |
154 | label: 'Server', | 158 | label: intl.formatMessage(messages.server), |
155 | value: settings.all.app.server || API, | 159 | value: settings.all.app.server || API, |
156 | default: API, | 160 | default: API, |
157 | }, | 161 | }, |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index d920c3c5f..440002823 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -26,6 +26,7 @@ | |||
26 | "infobar.buttonInstallUpdate": "Restart & install update", | 26 | "infobar.buttonInstallUpdate": "Restart & install update", |
27 | "infobar.buttonReloadServices": "Reload services", | 27 | "infobar.buttonReloadServices": "Reload services", |
28 | "infobar.requiredRequestsFailed": "Could not load services and user information", | 28 | "infobar.requiredRequestsFailed": "Could not load services and user information", |
29 | "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.", | ||
29 | "infobar.servicesUpdated": "Your services have been updated.", | 30 | "infobar.servicesUpdated": "Your services have been updated.", |
30 | "infobar.updateAvailable": "A new update for Ferdi is available.", | 31 | "infobar.updateAvailable": "A new update for Ferdi is available.", |
31 | "invite.email.label": "Email address", | 32 | "invite.email.label": "Email address", |
@@ -37,6 +38,8 @@ | |||
37 | "login.email.label": "Email address", | 38 | "login.email.label": "Email address", |
38 | "login.headline": "Sign in", | 39 | "login.headline": "Sign in", |
39 | "login.invalidCredentials": "Email or password not valid", | 40 | "login.invalidCredentials": "Email or password not valid", |
41 | "login.customServerQuestion": "Using a custom Ferdi server?", | ||
42 | "login.customServerSuggestion": "Try importing your Franz account", | ||
40 | "login.link.password": "Reset password", | 43 | "login.link.password": "Reset password", |
41 | "login.link.signup": "Create a free account", | 44 | "login.link.signup": "Create a free account", |
42 | "login.password.label": "Password", | 45 | "login.password.label": "Password", |
@@ -124,6 +127,8 @@ | |||
124 | "service.webviewLoader.loading": "Loading", | 127 | "service.webviewLoader.loading": "Loading", |
125 | "services.getStarted": "Get started", | 128 | "services.getStarted": "Get started", |
126 | "services.welcome": "Welcome to Ferdi", | 129 | "services.welcome": "Welcome to Ferdi", |
130 | "services.login": "Please login to use Ferdi.", | ||
131 | "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.", | ||
127 | "settings.account.account.editButton": "Edit account", | 132 | "settings.account.account.editButton": "Edit account", |
128 | "settings.account.accountType.basic": "Basic Account", | 133 | "settings.account.accountType.basic": "Basic Account", |
129 | "settings.account.accountType.premium": "Premium Supporter Account", | 134 | "settings.account.accountType.premium": "Premium Supporter Account", |
@@ -159,6 +164,7 @@ | |||
159 | "settings.app.form.enableSystemTray": "Show Ferdi in system tray", | 164 | "settings.app.form.enableSystemTray": "Show Ferdi in system tray", |
160 | "settings.app.form.language": "Language", | 165 | "settings.app.form.language": "Language", |
161 | "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", | 166 | "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", |
167 | "settings.app.form.server": "Server", | ||
162 | "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window", | 168 | "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window", |
163 | "settings.app.form.showDisabledServices": "Display disabled services tabs", | 169 | "settings.app.form.showDisabledServices": "Display disabled services tabs", |
164 | "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled", | 170 | "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled", |
diff --git a/src/i18n/messages/src/components/auth/Login.json b/src/i18n/messages/src/components/auth/Login.json index 177f6000b..d593eac68 100644 --- a/src/i18n/messages/src/components/auth/Login.json +++ b/src/i18n/messages/src/components/auth/Login.json | |||
@@ -65,15 +65,41 @@ | |||
65 | } | 65 | } |
66 | }, | 66 | }, |
67 | { | 67 | { |
68 | "id": "login.customServerQuestion", | ||
69 | "defaultMessage": "!!!Using a custom Ferdi server?", | ||
70 | "file": "src/components/auth/Login.js", | ||
71 | "start": { | ||
72 | "line": 37, | ||
73 | "column": 24 | ||
74 | }, | ||
75 | "end": { | ||
76 | "line": 40, | ||
77 | "column": 3 | ||
78 | } | ||
79 | }, | ||
80 | { | ||
81 | "id": "login.customServerSuggestion", | ||
82 | "defaultMessage": "!!!Try importing your Franz account", | ||
83 | "file": "src/components/auth/Login.js", | ||
84 | "start": { | ||
85 | "line": 41, | ||
86 | "column": 26 | ||
87 | }, | ||
88 | "end": { | ||
89 | "line": 44, | ||
90 | "column": 3 | ||
91 | } | ||
92 | }, | ||
93 | { | ||
68 | "id": "login.tokenExpired", | 94 | "id": "login.tokenExpired", |
69 | "defaultMessage": "!!!Your session expired, please login again.", | 95 | "defaultMessage": "!!!Your session expired, please login again.", |
70 | "file": "src/components/auth/Login.js", | 96 | "file": "src/components/auth/Login.js", |
71 | "start": { | 97 | "start": { |
72 | "line": 37, | 98 | "line": 45, |
73 | "column": 16 | 99 | "column": 16 |
74 | }, | 100 | }, |
75 | "end": { | 101 | "end": { |
76 | "line": 40, | 102 | "line": 48, |
77 | "column": 3 | 103 | "column": 3 |
78 | } | 104 | } |
79 | }, | 105 | }, |
@@ -82,11 +108,11 @@ | |||
82 | "defaultMessage": "!!!Your session expired, please login again.", | 108 | "defaultMessage": "!!!Your session expired, please login again.", |
83 | "file": "src/components/auth/Login.js", | 109 | "file": "src/components/auth/Login.js", |
84 | "start": { | 110 | "start": { |
85 | "line": 41, | 111 | "line": 49, |
86 | "column": 16 | 112 | "column": 16 |
87 | }, | 113 | }, |
88 | "end": { | 114 | "end": { |
89 | "line": 44, | 115 | "line": 52, |
90 | "column": 3 | 116 | "column": 3 |
91 | } | 117 | } |
92 | }, | 118 | }, |
@@ -95,11 +121,11 @@ | |||
95 | "defaultMessage": "!!!Create a free account", | 121 | "defaultMessage": "!!!Create a free account", |
96 | "file": "src/components/auth/Login.js", | 122 | "file": "src/components/auth/Login.js", |
97 | "start": { | 123 | "start": { |
98 | "line": 45, | 124 | "line": 53, |
99 | "column": 14 | 125 | "column": 14 |
100 | }, | 126 | }, |
101 | "end": { | 127 | "end": { |
102 | "line": 48, | 128 | "line": 56, |
103 | "column": 3 | 129 | "column": 3 |
104 | } | 130 | } |
105 | }, | 131 | }, |
@@ -108,11 +134,11 @@ | |||
108 | "defaultMessage": "!!!Forgot password", | 134 | "defaultMessage": "!!!Forgot password", |
109 | "file": "src/components/auth/Login.js", | 135 | "file": "src/components/auth/Login.js", |
110 | "start": { | 136 | "start": { |
111 | "line": 49, | 137 | "line": 57, |
112 | "column": 16 | 138 | "column": 16 |
113 | }, | 139 | }, |
114 | "end": { | 140 | "end": { |
115 | "line": 52, | 141 | "line": 60, |
116 | "column": 3 | 142 | "column": 3 |
117 | } | 143 | } |
118 | } | 144 | } |
diff --git a/src/i18n/messages/src/components/layout/AppLayout.json b/src/i18n/messages/src/components/layout/AppLayout.json index ff61972eb..5bb4ad3ba 100644 --- a/src/i18n/messages/src/components/layout/AppLayout.json +++ b/src/i18n/messages/src/components/layout/AppLayout.json | |||
@@ -37,5 +37,18 @@ | |||
37 | "line": 36, | 37 | "line": 36, |
38 | "column": 3 | 38 | "column": 3 |
39 | } | 39 | } |
40 | }, | ||
41 | { | ||
42 | "id": "infobar.authRequestFailed", | ||
43 | "defaultMessage": "!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.", | ||
44 | "file": "src/components/layout/AppLayout.js", | ||
45 | "start": { | ||
46 | "line": 37, | ||
47 | "column": 21 | ||
48 | }, | ||
49 | "end": { | ||
50 | "line": 40, | ||
51 | "column": 3 | ||
52 | } | ||
40 | } | 53 | } |
41 | ] \ No newline at end of file | 54 | ] \ No newline at end of file |
diff --git a/src/i18n/messages/src/components/services/content/Services.json b/src/i18n/messages/src/components/services/content/Services.json index 7fef6a4b2..fac438178 100644 --- a/src/i18n/messages/src/components/services/content/Services.json +++ b/src/i18n/messages/src/components/services/content/Services.json | |||
@@ -24,5 +24,31 @@ | |||
24 | "line": 18, | 24 | "line": 18, |
25 | "column": 3 | 25 | "column": 3 |
26 | } | 26 | } |
27 | }, | ||
28 | { | ||
29 | "id": "services.login", | ||
30 | "defaultMessage": "!!!Please login to use Ferdi.", | ||
31 | "file": "src/components/services/content/Services.js", | ||
32 | "start": { | ||
33 | "line": 19, | ||
34 | "column": 9 | ||
35 | }, | ||
36 | "end": { | ||
37 | "line": 22, | ||
38 | "column": 3 | ||
39 | } | ||
40 | }, | ||
41 | { | ||
42 | "id": "services.serverInfo", | ||
43 | "defaultMessage": "!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.", | ||
44 | "file": "src/components/services/content/Services.js", | ||
45 | "start": { | ||
46 | "line": 23, | ||
47 | "column": 14 | ||
48 | }, | ||
49 | "end": { | ||
50 | "line": 26, | ||
51 | "column": 3 | ||
52 | } | ||
27 | } | 53 | } |
28 | ] \ No newline at end of file | 54 | ] \ No newline at end of file |
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json index b979b625c..7645ae2c2 100644 --- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json +++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json | |||
@@ -65,15 +65,28 @@ | |||
65 | } | 65 | } |
66 | }, | 66 | }, |
67 | { | 67 | { |
68 | "id": "settings.app.form.server", | ||
69 | "defaultMessage": "!!!Server", | ||
70 | "file": "src/containers/settings/EditSettingsScreen.js", | ||
71 | "start": { | ||
72 | "line": 44, | ||
73 | "column": 10 | ||
74 | }, | ||
75 | "end": { | ||
76 | "line": 47, | ||
77 | "column": 3 | ||
78 | } | ||
79 | }, | ||
80 | { | ||
68 | "id": "settings.app.form.language", | 81 | "id": "settings.app.form.language", |
69 | "defaultMessage": "!!!Language", | 82 | "defaultMessage": "!!!Language", |
70 | "file": "src/containers/settings/EditSettingsScreen.js", | 83 | "file": "src/containers/settings/EditSettingsScreen.js", |
71 | "start": { | 84 | "start": { |
72 | "line": 44, | 85 | "line": 48, |
73 | "column": 12 | 86 | "column": 12 |
74 | }, | 87 | }, |
75 | "end": { | 88 | "end": { |
76 | "line": 47, | 89 | "line": 51, |
77 | "column": 3 | 90 | "column": 3 |
78 | } | 91 | } |
79 | }, | 92 | }, |
@@ -82,11 +95,11 @@ | |||
82 | "defaultMessage": "!!!Dark Mode", | 95 | "defaultMessage": "!!!Dark Mode", |
83 | "file": "src/containers/settings/EditSettingsScreen.js", | 96 | "file": "src/containers/settings/EditSettingsScreen.js", |
84 | "start": { | 97 | "start": { |
85 | "line": 48, | 98 | "line": 52, |
86 | "column": 12 | 99 | "column": 12 |
87 | }, | 100 | }, |
88 | "end": { | 101 | "end": { |
89 | "line": 51, | 102 | "line": 55, |
90 | "column": 3 | 103 | "column": 3 |
91 | } | 104 | } |
92 | }, | 105 | }, |
@@ -95,11 +108,11 @@ | |||
95 | "defaultMessage": "!!!Display disabled services tabs", | 108 | "defaultMessage": "!!!Display disabled services tabs", |
96 | "file": "src/containers/settings/EditSettingsScreen.js", | 109 | "file": "src/containers/settings/EditSettingsScreen.js", |
97 | "start": { | 110 | "start": { |
98 | "line": 52, | 111 | "line": 56, |
99 | "column": 24 | 112 | "column": 24 |
100 | }, | 113 | }, |
101 | "end": { | 114 | "end": { |
102 | "line": 55, | 115 | "line": 59, |
103 | "column": 3 | 116 | "column": 3 |
104 | } | 117 | } |
105 | }, | 118 | }, |
@@ -108,11 +121,11 @@ | |||
108 | "defaultMessage": "!!!Show unread message badge when notifications are disabled", | 121 | "defaultMessage": "!!!Show unread message badge when notifications are disabled", |
109 | "file": "src/containers/settings/EditSettingsScreen.js", | 122 | "file": "src/containers/settings/EditSettingsScreen.js", |
110 | "start": { | 123 | "start": { |
111 | "line": 56, | 124 | "line": 60, |
112 | "column": 29 | 125 | "column": 29 |
113 | }, | 126 | }, |
114 | "end": { | 127 | "end": { |
115 | "line": 59, | 128 | "line": 63, |
116 | "column": 3 | 129 | "column": 3 |
117 | } | 130 | } |
118 | }, | 131 | }, |
@@ -121,11 +134,11 @@ | |||
121 | "defaultMessage": "!!!Enable spell checking", | 134 | "defaultMessage": "!!!Enable spell checking", |
122 | "file": "src/containers/settings/EditSettingsScreen.js", | 135 | "file": "src/containers/settings/EditSettingsScreen.js", |
123 | "start": { | 136 | "start": { |
124 | "line": 60, | 137 | "line": 64, |
125 | "column": 23 | 138 | "column": 23 |
126 | }, | 139 | }, |
127 | "end": { | 140 | "end": { |
128 | "line": 63, | 141 | "line": 67, |
129 | "column": 3 | 142 | "column": 3 |
130 | } | 143 | } |
131 | }, | 144 | }, |
@@ -134,11 +147,11 @@ | |||
134 | "defaultMessage": "!!!Enable GPU Acceleration", | 147 | "defaultMessage": "!!!Enable GPU Acceleration", |
135 | "file": "src/containers/settings/EditSettingsScreen.js", | 148 | "file": "src/containers/settings/EditSettingsScreen.js", |
136 | "start": { | 149 | "start": { |
137 | "line": 64, | 150 | "line": 68, |
138 | "column": 25 | 151 | "column": 25 |
139 | }, | 152 | }, |
140 | "end": { | 153 | "end": { |
141 | "line": 67, | 154 | "line": 71, |
142 | "column": 3 | 155 | "column": 3 |
143 | } | 156 | } |
144 | }, | 157 | }, |
@@ -147,11 +160,11 @@ | |||
147 | "defaultMessage": "!!!Include beta versions", | 160 | "defaultMessage": "!!!Include beta versions", |
148 | "file": "src/containers/settings/EditSettingsScreen.js", | 161 | "file": "src/containers/settings/EditSettingsScreen.js", |
149 | "start": { | 162 | "start": { |
150 | "line": 68, | 163 | "line": 72, |
151 | "column": 8 | 164 | "column": 8 |
152 | }, | 165 | }, |
153 | "end": { | 166 | "end": { |
154 | "line": 71, | 167 | "line": 75, |
155 | "column": 3 | 168 | "column": 3 |
156 | } | 169 | } |
157 | } | 170 | } |
diff --git a/src/theme/default/legacy.js b/src/theme/default/legacy.js index 44496948d..46847c60b 100644 --- a/src/theme/default/legacy.js +++ b/src/theme/default/legacy.js | |||
@@ -5,9 +5,9 @@ export const themeBrandInfo = '#5bc0de'; | |||
5 | export const themeBrandWarning = '#FF9F00'; | 5 | export const themeBrandWarning = '#FF9F00'; |
6 | export const themeBrandDanger = '#d9534f'; | 6 | export const themeBrandDanger = '#d9534f'; |
7 | 7 | ||
8 | export const themeGrayDark = '#7367F0'; | 8 | export const themeGrayDark = '#373a3c'; |
9 | export const themeGray = '#7367F0'; | 9 | export const themeGray = '#55595c'; |
10 | export const themeGrayLight = '#CE9FFC'; | 10 | export const themeGrayLight = '#818a91'; |
11 | export const themeGrayLighter = '#eceeef'; | 11 | export const themeGrayLighter = '#eceeef'; |
12 | export const themeGrayLightest = '#f7f7f9'; | 12 | export const themeGrayLightest = '#f7f7f9'; |
13 | 13 | ||