diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-11-14 17:19:35 +0100 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-11-14 17:19:35 +0100 |
| commit | 2b7832d0c92c34ff5fa52300ed849524a247405b (patch) | |
| tree | ebaa0dbe8120e513773eb32c1465d3cf28e2e622 /core/css | |
| parent | fef51895c2689275805bc166bc3f5be95a836b35 (diff) | |
| download | nextcloud-server-2b7832d0c92c34ff5fa52300ed849524a247405b.tar.gz nextcloud-server-2b7832d0c92c34ff5fa52300ed849524a247405b.zip | |
Fix breakpoint and shrinking of the content + list
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core/css')
| -rw-r--r-- | core/css/apps.scss | 16 | ||||
| -rw-r--r-- | core/css/mobile.scss | 4 | ||||
| -rw-r--r-- | core/css/variables.scss | 3 |
3 files changed, 18 insertions, 5 deletions
diff --git a/core/css/apps.scss b/core/css/apps.scss index b7afc19705d..4991908e2de 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -599,6 +599,15 @@ kbd { /* APP-CONTENT AND WRAPPER ------------------------------------------ */ /* Part where the content will be loaded into */ + +/** + * !Important. We are defining the minimum requirement we want for flex + * Just before the mobile breakpoint we have $breakpoint-mobile (768px) - $navigation-width + * -> 468px. In that case we want 200px for the list and 268px for the content + */ +$min-list-width: 200px; +$min-content-width: $breakpoint-mobile - $navigation-width - $min-list-width; + #app-content { z-index: 1000; background-color: var(--color-main-background); @@ -626,7 +635,7 @@ kbd { /* CONTENT DETAILS AFTER LIST*/ .app-content-details { /* grow full width */ - flex-grow: 1; + flex: 1 1 $min-content-width; #app-navigation-toggle-back { display: none; } @@ -1100,7 +1109,6 @@ $popovericon-size: 16px; /* CONTENT LIST ------------------------------------------------------------ */ .app-content-list { - max-width: 300px; @include position('sticky'); top: $header-height; border-right: 1px solid var(--color-border); @@ -1111,7 +1119,9 @@ $popovericon-size: 16px; max-height: calc(100vh - #{$header-height}); overflow-y: auto; overflow-x: hidden; - flex: 0 1 300px; + flex: 1 1 $min-list-width; + min-width: $min-list-width; + max-width: $min-list-width + 100px; /* Default item */ .app-content-list-item { diff --git a/core/css/mobile.scss b/core/css/mobile.scss index f7f3827eba5..3e21672df82 100644 --- a/core/css/mobile.scss +++ b/core/css/mobile.scss @@ -1,4 +1,4 @@ -@media only screen and (max-width: 768px) { +@media only screen and (max-width: $breakpoint-mobile) { /* position share dropdown */ #dropdown { @@ -114,7 +114,7 @@ display: none; } #body-settings #controls { - min-width: 768px !important; + min-width: $breakpoint-mobile !important; } /* do not show dates in filepicker */ diff --git a/core/css/variables.scss b/core/css/variables.scss index a827629479c..d7419f0d744 100644 --- a/core/css/variables.scss +++ b/core/css/variables.scss @@ -87,3 +87,6 @@ $header-height: 50px; $navigation-width: 300px; $sidebar-min-width: 300px; $sidebar-max-width: 500px; + +// mobile +$breakpoint-mobile: 768px; |