From 1050454e16b622371b3554ec8d37ec9420119ac1 Mon Sep 17 00:00:00 2001 From: Marin Treselj Date: Wed, 13 Dec 2017 14:49:11 +0100 Subject: [PATCH 1/4] Dynamic control bar width Signed-off-by: Marin Treselj --- core/css/mobile.scss | 2 -- core/css/styles.scss | 12 ++---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/core/css/mobile.scss b/core/css/mobile.scss index 1951847998740..6f1583cb77a04 100644 --- a/core/css/mobile.scss +++ b/core/css/mobile.scss @@ -83,9 +83,7 @@ /* position controls for apps with app-navigation */ #app-navigation+#app-content #controls { - left: 0 !important; padding-left: 44px; - width: 100%; } /* .viewer-mode is when text editor, PDF viewer, etc is open */ diff --git a/core/css/styles.scss b/core/css/styles.scss index 5474b41a2b47f..54775f67f62ae 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -223,12 +223,8 @@ body { #controls { box-sizing: border-box; - position: fixed; - top: 45px; - right: 0; - left: 0; + position: relative; height: 44px; - width: calc(100% - 250px); padding: 0; margin: 0; background-color: rgba($color-main-background, 0.95); @@ -237,15 +233,11 @@ body { -moz-user-select: none; -ms-user-select: none; user-select: none; - display: inline-flex; + display: flex; } /* position controls for apps with app-navigation */ -#app-navigation + #app-content #controls { - left: 250px; -} - .viewer-mode #app-navigation + #app-content #controls { left: 0; } From 9f798a7214b277a127ca9a1bf1bc07bb26d7625a Mon Sep 17 00:00:00 2001 From: Marin Treselj Date: Tue, 19 Dec 2017 15:09:09 +0100 Subject: [PATCH 2/4] Make contorls stick to the top when scrolling Signed-off-by: Marin Treselj --- apps/files/css/files.scss | 4 ---- core/css/styles.scss | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 5d29c5348d2ef..ed4314445b422 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -48,10 +48,6 @@ width: 100%; } -#filestable.has-controls { - top: 44px; -} - #filestable tbody tr { height: 51px; } diff --git a/core/css/styles.scss b/core/css/styles.scss index 54775f67f62ae..edcaeb17429a2 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -223,7 +223,7 @@ body { #controls { box-sizing: border-box; - position: relative; + position: sticky; height: 44px; padding: 0; margin: 0; @@ -234,6 +234,7 @@ body { -ms-user-select: none; user-select: none; display: flex; + top: 0; } /* position controls for apps with app-navigation */ From 69af108e8ea3228b4d96b1f4f64b6212e85b426c Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 20 Dec 2017 12:07:32 +0100 Subject: [PATCH 3/4] Properly show action icons Signed-off-by: Morris Jobke --- apps/files/css/files.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index ed4314445b422..bb2b1898aafa5 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -20,7 +20,6 @@ .actions.creatable { position: relative; - z-index: -30; display: flex; flex: 1 1; .button:not(:last-child) { From 3ea43be6abcdc52f964a6140500a8c1dc487b779 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 20 Dec 2017 12:24:17 +0100 Subject: [PATCH 4/4] Add the webkit sticky position prefix Signed-off-by: Morris Jobke --- core/css/styles.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/core/css/styles.scss b/core/css/styles.scss index edcaeb17429a2..0ae5f45a3eb7b 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -223,6 +223,7 @@ body { #controls { box-sizing: border-box; + position: -webkit-sticky; position: sticky; height: 44px; padding: 0;