From 2b7832d0c92c34ff5fa52300ed849524a247405b Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Wed, 14 Nov 2018 17:19:35 +0100 Subject: Fix breakpoint and shrinking of the content + list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/css/variables.scss | 3 +++ 1 file changed, 3 insertions(+) (limited to 'core/css/variables.scss') 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; -- cgit v1.2.3 From f8bed7d58577685234a100cdb5f55d4cca94096f Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Wed, 14 Nov 2018 18:34:26 +0100 Subject: Allow apps to use the variables too MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/css/apps.scss | 9 ++++----- core/css/variables.scss | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'core/css/variables.scss') diff --git a/core/css/apps.scss b/core/css/apps.scss index 4991908e2de..039374bf726 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -605,8 +605,7 @@ kbd { * 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; +$min-content-width: $breakpoint-mobile - $navigation-width - $list-min-width; #app-content { z-index: 1000; @@ -1119,9 +1118,9 @@ $popovericon-size: 16px; max-height: calc(100vh - #{$header-height}); overflow-y: auto; overflow-x: hidden; - flex: 1 1 $min-list-width; - min-width: $min-list-width; - max-width: $min-list-width + 100px; + flex: 1 1 $list-min-width; + min-width: $list-min-width; + max-width: $list-max-width; /* Default item */ .app-content-list-item { diff --git a/core/css/variables.scss b/core/css/variables.scss index d7419f0d744..2ec9ba333b4 100644 --- a/core/css/variables.scss +++ b/core/css/variables.scss @@ -87,6 +87,8 @@ $header-height: 50px; $navigation-width: 300px; $sidebar-min-width: 300px; $sidebar-max-width: 500px; +$list-min-width: 200px; +$list-max-width: 300px; // mobile $breakpoint-mobile: 768px; -- cgit v1.2.3