diff options
author | kytwb <412895+kytwb@users.noreply.github.com> | 2021-06-12 19:51:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-12 19:51:28 +0200 |
commit | b0ecce5eab2a6d0eed3ade7c43e252ca9bac7edb (patch) | |
tree | aed0253b61ca035f3388a7d6a369ffe75f195a58 /src/features/appearance | |
parent | Bypassed code signing since that is also incorrect in GH settings. (diff) | |
download | ferdium-app-b0ecce5eab2a6d0eed3ade7c43e252ca9bac7edb.tar.gz ferdium-app-b0ecce5eab2a6d0eed3ade7c43e252ca9bac7edb.tar.zst ferdium-app-b0ecce5eab2a6d0eed3ade7c43e252ca9bac7edb.zip |
Fix active Todos service behaviour (#1481)
* Return false instead of null in isTodosServiceAdded
* Resolve from TODOS_RECIPES_ID instead of hardcoded TODOS_RECIPE_ID
* Fix TodosWebview width toggling when isTodosServiceActive
* Add more todo service recipe IDs
* Refactor todos state management
* Moved todos service URL and recipe ID computation logic to todos/store
* Simplified TodosWebview by delegating to the store for the URL and
removing the (unused) payment logic
* Made the todos service computation logic in the Service model depend
on the logic in todos/store
* Made ServicesStore depend on the todos service logic from the Service
model
* Todos appearance fixes
* Hide double horizontal rules if todo settings are hidden due to an
added todo service
* Hide todos panel border when the panel is hidden or expanded
* Make expanded todos panel obey sidebar width and vertical style
settings
* Make todos/store use isValidExternalURL
* Harden isValidExternalURL against malformed URLs
* Reduce todo URL string duplication in config.js
Co-authored-by: Kristóf Marussy <kristof@marussy.com>
Diffstat (limited to 'src/features/appearance')
-rw-r--r-- | src/features/appearance/index.js | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/features/appearance/index.js b/src/features/appearance/index.js index 82a0971eb..b5648250e 100644 --- a/src/features/appearance/index.js +++ b/src/features/appearance/index.js | |||
@@ -93,10 +93,10 @@ function generateServiceRibbonWidthStyle(widthStr, iconSizeStr, vertical) { | |||
93 | } | 93 | } |
94 | ` : ` | 94 | ` : ` |
95 | .sidebar { | 95 | .sidebar { |
96 | width: ${width - 2}px !important; | 96 | width: ${width}px !important; |
97 | } | 97 | } |
98 | .tab-item { | 98 | .tab-item { |
99 | width: ${width - 2}px !important; | 99 | width: ${width}px !important; |
100 | height: ${width - 5 + iconSize}px !important; | 100 | height: ${width - 5 + iconSize}px !important; |
101 | } | 101 | } |
102 | .tab-item .tab-item__icon { | 102 | .tab-item .tab-item__icon { |
@@ -105,6 +105,9 @@ function generateServiceRibbonWidthStyle(widthStr, iconSizeStr, vertical) { | |||
105 | .sidebar__button { | 105 | .sidebar__button { |
106 | font-size: ${width / 3}px !important; | 106 | font-size: ${width / 3}px !important; |
107 | } | 107 | } |
108 | .todos__todos-panel--expanded { | ||
109 | width: calc(100% - ${300 + width}px) !important; | ||
110 | } | ||
108 | `; | 111 | `; |
109 | } | 112 | } |
110 | 113 | ||
@@ -156,6 +159,10 @@ function generateVerticalStyle(widthStr, alwaysShowWorkspaces) { | |||
156 | .workspaces-drawer { | 159 | .workspaces-drawer { |
157 | maring-top: -${sidebarWidthStr} !important; | 160 | maring-top: -${sidebarWidthStr} !important; |
158 | } | 161 | } |
162 | |||
163 | .todos__todos-panel--expanded { | ||
164 | width: calc(100% - 300px) !important; | ||
165 | } | ||
159 | `; | 166 | `; |
160 | } | 167 | } |
161 | 168 | ||