diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 4 | ||||
-rw-r--r-- | src/components/ui/Modal/styles.ts | 2 | ||||
-rw-r--r-- | src/config.ts | 2 | ||||
-rw-r--r-- | src/features/appearance/index.ts | 12 | ||||
-rw-r--r-- | src/styles/settings.scss | 22 |
5 files changed, 19 insertions, 23 deletions
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 3b2fe4af4..b358a395f 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -366,7 +366,7 @@ class EditSettingsForm extends Component { | |||
366 | > | 366 | > |
367 | {intl.formatMessage(messages.headlineAdvanced)} | 367 | {intl.formatMessage(messages.headlineAdvanced)} |
368 | </h2> | 368 | </h2> |
369 | <h2 | 369 | {(isMac || isWindows || process.env.APPIMAGE) && <h2 |
370 | id="updates" | 370 | id="updates" |
371 | className={ | 371 | className={ |
372 | this.state.activeSetttingsTab === 'updates' | 372 | this.state.activeSetttingsTab === 'updates' |
@@ -381,7 +381,7 @@ class EditSettingsForm extends Component { | |||
381 | {automaticUpdates && (updateIsReadyToInstall || isUpdateAvailable) && ( | 381 | {automaticUpdates && (updateIsReadyToInstall || isUpdateAvailable) && ( |
382 | <span className="update-available">•</span> | 382 | <span className="update-available">•</span> |
383 | )} | 383 | )} |
384 | </h2> | 384 | </h2>} |
385 | </div> | 385 | </div> |
386 | 386 | ||
387 | {/* General */} | 387 | {/* General */} |
diff --git a/src/components/ui/Modal/styles.ts b/src/components/ui/Modal/styles.ts index c2bebf9bb..87ef36f1d 100644 --- a/src/components/ui/Modal/styles.ts +++ b/src/components/ui/Modal/styles.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | export default theme => ({ | 1 | export default theme => ({ |
2 | component: { | 2 | component: { |
3 | zIndex: 500, | 3 | zIndex: 9999, |
4 | position: 'absolute', | 4 | position: 'absolute', |
5 | }, | 5 | }, |
6 | overlay: { | 6 | overlay: { |
diff --git a/src/config.ts b/src/config.ts index 2079d7cc0..5c9fbaee4 100644 --- a/src/config.ts +++ b/src/config.ts | |||
@@ -113,7 +113,7 @@ export const TODO_APPS = { | |||
113 | [CUSTOM_TODO_SERVICE]: 'Other service', | 113 | [CUSTOM_TODO_SERVICE]: 'Other service', |
114 | }; | 114 | }; |
115 | 115 | ||
116 | export const DEFAULT_TODO_SERVICE = TODO_FRANZ_TODOS_URL; | 116 | export const DEFAULT_TODO_SERVICE = TODO_TODOIST_URL; |
117 | export const DEFAULT_TODO_RECIPE_ID = | 117 | export const DEFAULT_TODO_RECIPE_ID = |
118 | TODO_SERVICE_RECIPE_IDS[DEFAULT_TODO_SERVICE]; | 118 | TODO_SERVICE_RECIPE_IDS[DEFAULT_TODO_SERVICE]; |
119 | export const DEFAULT_TODO_SERVICE_NAME = TODO_APPS[DEFAULT_TODO_SERVICE]; | 119 | export const DEFAULT_TODO_SERVICE_NAME = TODO_APPS[DEFAULT_TODO_SERVICE]; |
diff --git a/src/features/appearance/index.ts b/src/features/appearance/index.ts index 122fa2411..9c0268707 100644 --- a/src/features/appearance/index.ts +++ b/src/features/appearance/index.ts | |||
@@ -26,11 +26,12 @@ function darkenAbsolute(originalColor, absoluteChange) { | |||
26 | } | 26 | } |
27 | 27 | ||
28 | function generateAccentStyle(accentColorStr) { | 28 | function generateAccentStyle(accentColorStr) { |
29 | let accentColor = color(DEFAULT_APP_SETTINGS.accentColor); | 29 | let accentColor; |
30 | try { | 30 | try { |
31 | accentColor = color(accentColorStr); | 31 | accentColor = color(accentColorStr); |
32 | } catch { | 32 | } catch { |
33 | // Ignore invalid accent color. | 33 | accentColorStr = DEFAULT_APP_SETTINGS.accentColor; |
34 | accentColor = color(accentColorStr); | ||
34 | } | 35 | } |
35 | const darkerColorStr = darkenAbsolute(accentColor, 5).hex(); | 36 | const darkerColorStr = darkenAbsolute(accentColor, 5).hex(); |
36 | return ` | 37 | return ` |
@@ -69,7 +70,8 @@ function generateAccentStyle(accentColorStr) { | |||
69 | .theme__dark .franz-form__button, | 70 | .theme__dark .franz-form__button, |
70 | .franz-form__button, | 71 | .franz-form__button, |
71 | .ferdi__fab, | 72 | .ferdi__fab, |
72 | .franz-form .franz-form__slider-wrapper .slider::-webkit-slider-thumb { | 73 | .franz-form .franz-form__slider-wrapper .slider::-webkit-slider-thumb, |
74 | span.loader div > div > div { | ||
73 | background: ${accentColorStr}; | 75 | background: ${accentColorStr}; |
74 | } | 76 | } |
75 | 77 | ||
@@ -99,6 +101,10 @@ function generateAccentStyle(accentColorStr) { | |||
99 | background: ${darkerColorStr}; | 101 | background: ${darkerColorStr}; |
100 | } | 102 | } |
101 | 103 | ||
104 | .settings__close { | ||
105 | border-color: ${darkerColorStr}!important; | ||
106 | } | ||
107 | |||
102 | .theme__dark .franz-form__button.franz-form__button--inverted, | 108 | .theme__dark .franz-form__button.franz-form__button--inverted, |
103 | .franz-form__button.franz-form__button--inverted { | 109 | .franz-form__button.franz-form__button--inverted { |
104 | background: none; | 110 | background: none; |
diff --git a/src/styles/settings.scss b/src/styles/settings.scss index 00744df88..3178f718d 100644 --- a/src/styles/settings.scss +++ b/src/styles/settings.scss | |||
@@ -153,13 +153,11 @@ | |||
153 | 153 | ||
154 | .settings { | 154 | .settings { |
155 | border-radius: $theme-border-radius; | 155 | border-radius: $theme-border-radius; |
156 | box-shadow: 0 20px 50px rgba($dark-theme-black, 0.5); | ||
157 | display: flex; | 156 | display: flex; |
158 | height: 100%; | 157 | height: 100%; |
159 | max-height: 720px; | 158 | max-height: 720px; |
160 | max-width: 900px; | 159 | max-width: 900px; |
161 | min-height: 400px; | 160 | min-height: 400px; |
162 | overflow: hidden; | ||
163 | position: relative; | 161 | position: relative; |
164 | width: 100%; | 162 | width: 100%; |
165 | z-index: 9999; | 163 | z-index: 9999; |
@@ -169,7 +167,8 @@ | |||
169 | flex: 1; | 167 | flex: 1; |
170 | flex-direction: column; | 168 | flex-direction: column; |
171 | height: auto; | 169 | height: auto; |
172 | border-radius: 0 $theme-border-radius $theme-border-radius 0; | 170 | border-radius: $theme-border-radius; |
171 | box-shadow: 0 20px 50px rgba($dark-theme-black, 0.5); | ||
173 | overflow: hidden; | 172 | overflow: hidden; |
174 | background: #fff; | 173 | background: #fff; |
175 | } | 174 | } |
@@ -273,7 +272,7 @@ | |||
273 | 272 | ||
274 | .settings__close { | 273 | .settings__close { |
275 | background: $theme-brand-primary; | 274 | background: $theme-brand-primary; |
276 | // border-left: 1px solid darken($theme-brand-primary, 8%); | 275 | border-left: 1px solid darken($theme-brand-primary, 8%); |
277 | color: #fff; | 276 | color: #fff; |
278 | font-size: 20px; | 277 | font-size: 20px; |
279 | height: 50px; | 278 | height: 50px; |
@@ -283,6 +282,7 @@ | |||
283 | @media (prefers-reduced-motion: no-preference) { | 282 | @media (prefers-reduced-motion: no-preference) { |
284 | transition: background $theme-transition-time; | 283 | transition: background $theme-transition-time; |
285 | } | 284 | } |
285 | border-top-right-radius: $theme-border-radius; | ||
286 | cursor: pointer; | 286 | cursor: pointer; |
287 | 287 | ||
288 | &::before { | 288 | &::before { |
@@ -513,14 +513,14 @@ | |||
513 | flex-direction: column; | 513 | flex-direction: column; |
514 | height: auto; | 514 | height: auto; |
515 | width: 240px; | 515 | width: 240px; |
516 | height: 100%; | 516 | height: calc(100% - 100px); |
517 | align-self: center; | 517 | align-self: center; |
518 | border-top-left-radius: $theme-border-radius; | 518 | border-top-left-radius: $theme-border-radius; |
519 | border-bottom-left-radius: $theme-border-radius; | 519 | border-bottom-left-radius: $theme-border-radius; |
520 | overflow: hidden; | 520 | overflow: hidden; |
521 | box-shadow: 0 20px 50px rgba($dark-theme-black, 0.5); | ||
521 | 522 | ||
522 | .settings-navigation__link { | 523 | .settings-navigation__link { |
523 | position: relative; | ||
524 | align-items: center; | 524 | align-items: center; |
525 | justify-content: space-between; | 525 | justify-content: space-between; |
526 | color: $theme-text-color; | 526 | color: $theme-text-color; |
@@ -535,18 +535,8 @@ | |||
535 | } | 535 | } |
536 | border-bottom: 1px solid darken($theme-gray-lightest, 3%); | 536 | border-bottom: 1px solid darken($theme-gray-lightest, 3%); |
537 | 537 | ||
538 | .badge { | ||
539 | background: $theme-gray-light; | ||
540 | color: #fff; | ||
541 | } | ||
542 | |||
543 | &:hover { | 538 | &:hover { |
544 | background: darken($theme-gray-lightest, 8%); | 539 | background: darken($theme-gray-lightest, 8%); |
545 | |||
546 | .badge { | ||
547 | background: $theme-gray-light; | ||
548 | color: #fff; | ||
549 | } | ||
550 | } | 540 | } |
551 | 541 | ||
552 | &.is-active { | 542 | &.is-active { |