diff options
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | src/features/appearance/index.js | 11 |
2 files changed, 13 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 426bae6cb..806ebceb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md | |||
@@ -1,3 +1,10 @@ | |||
1 | # [v5.6.1-nightly.55](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.54...v5.6.1-nightly.55) (2021-09-10) | ||
2 | |||
3 | ### Bug fixes | ||
4 | |||
5 | - Fix sidebar dimension when used in horizontal style (#1896) 💖 @CSY54 | ||
6 | - Partially reverted the cookie-handling for outlook since it caused crashes 💖 @vraravam | ||
7 | |||
1 | # [v5.6.1-nightly.54](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.53...v5.6.1-nightly.54) (2021-09-09) | 8 | # [v5.6.1-nightly.54](https://github.com/getferdi/ferdi/compare/v5.6.1-nightly.53...v5.6.1-nightly.54) (2021-09-09) |
2 | 9 | ||
3 | ### Bug fixes | 10 | ### Bug fixes |
diff --git a/src/features/appearance/index.js b/src/features/appearance/index.js index c3425ba9c..3aab2fcad 100644 --- a/src/features/appearance/index.js +++ b/src/features/appearance/index.js | |||
@@ -122,7 +122,7 @@ function generateShowDragAreaStyle(accentColor) { | |||
122 | background-color: ${accentColor}; | 122 | background-color: ${accentColor}; |
123 | } | 123 | } |
124 | #root { | 124 | #root { |
125 | /** Remove 22px from app height, otherwise the page will be to high */ | 125 | /** Remove 22px from app height, otherwise the page will be too high */ |
126 | height: calc(100% - 22px); | 126 | height: calc(100% - 22px); |
127 | } | 127 | } |
128 | `; | 128 | `; |
@@ -139,11 +139,12 @@ function generateVerticalStyle(widthStr, alwaysShowWorkspaces) { | |||
139 | document.head.appendChild(link); | 139 | document.head.appendChild(link); |
140 | } | 140 | } |
141 | const width = Number(widthStr); | 141 | const width = Number(widthStr); |
142 | const sidebarWidthStr = `${width - 4}px`; | 142 | const sidebarWidth = width - 4; |
143 | const verticalStyleOffset = 23; | ||
143 | 144 | ||
144 | return ` | 145 | return ` |
145 | .sidebar { | 146 | .sidebar { |
146 | height: ${sidebarWidthStr} !important; | 147 | height: ${sidebarWidth + verticalStyleOffset + 1}px !important; |
147 | ${alwaysShowWorkspaces ? ` | 148 | ${alwaysShowWorkspaces ? ` |
148 | width: calc(100% - 300px) !important; | 149 | width: calc(100% - 300px) !important; |
149 | ` : ''} | 150 | ` : ''} |
@@ -154,11 +155,11 @@ function generateVerticalStyle(widthStr, alwaysShowWorkspaces) { | |||
154 | } | 155 | } |
155 | 156 | ||
156 | .app .app__content { | 157 | .app .app__content { |
157 | padding-top: ${sidebarWidthStr} !important; | 158 | padding-top: ${sidebarWidth + verticalStyleOffset + 1}px !important; |
158 | } | 159 | } |
159 | 160 | ||
160 | .workspaces-drawer { | 161 | .workspaces-drawer { |
161 | maring-top: -${sidebarWidthStr} !important; | 162 | margin-top: -${sidebarWidth - verticalStyleOffset - 1}px !important; |
162 | } | 163 | } |
163 | 164 | ||
164 | .todos__todos-panel--expanded { | 165 | .todos__todos-panel--expanded { |