Skip to content

Commit 9b0e6ac

Browse files
committed
Implement new container layout
Signed-off-by: Julius Härtl <jus@bitgrid.net>
1 parent 3107e55 commit 9b0e6ac

File tree

4 files changed

+18
-8
lines changed

4 files changed

+18
-8
lines changed

src/components/NcAppContent/NcAppContent.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -323,14 +323,14 @@ export default {
323323
<style lang="scss" scoped>
324324

325325
.app-content {
326-
position: relative;
326+
position: initial;
327327
z-index: 1000;
328328
flex-basis: 100vw;
329-
min-width: 0;
330-
min-height: 100%;
329+
height: 100%;
331330
// Overriding server styles TODO: cleanup!
332331
margin: 0 !important;
333332
background-color: var(--color-main-background);
333+
overflow: scroll;
334334

335335
// Variables
336336
// the whitespace between the topbar content and its edges

src/components/NcAppNavigation/NcAppNavigation.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ export default {
149149
padding: 4px;
150150
// Above appcontent
151151
z-index: 1800;
152-
height: calc(100vh - #{$header-height});
152+
height: 100%;
153153
box-sizing: border-box;
154154
-webkit-user-select: none;
155155
-moz-user-select: none;
@@ -162,6 +162,7 @@ export default {
162162
background-color: var(--color-main-background-blur, var(--color-main-background));
163163
-webkit-backdrop-filter: var(--filter-background-blur, none);
164164
backdrop-filter: var(--filter-background-blur, none);
165+
165166
&--close {
166167
margin-left: - $navigation-width;
167168
transform: translateX(-100%);

src/components/NcAppSidebar/NcAppSidebar.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -639,9 +639,10 @@ $top-buttons-spacing: 6px;
639639
width: 27vw;
640640
min-width: $sidebar-min-width;
641641
max-width: $sidebar-max-width;
642-
height: calc(100vh - var(--header-height));
642+
height: 100%;
643643
border-left: 1px solid var(--color-border);
644644
background: var(--color-main-background);
645+
645646
.app-sidebar-header {
646647
> .app-sidebar__close {
647648
position: absolute;

src/components/NcContent/NcContent.vue

+11-3
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,18 @@ export default {
8181
<style lang="scss" scoped>
8282
.content {
8383
box-sizing: border-box;
84-
position: relative;
84+
margin: var(--body-container-margin);
85+
margin-top: 50px;
8586
display: flex;
86-
padding-top: 50px;
87-
min-height: 100%;
87+
width: calc(100% - var(--body-container-margin) * 2);
88+
height: var(--body-height);
89+
overflow: hidden;
90+
padding: 0;
91+
92+
&:not(.with-sidebar--full) {
93+
position: fixed;
94+
}
95+
8896
:deep(*) {
8997
box-sizing: border-box;
9098
}

0 commit comments

Comments
 (0)