summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMarin Treselj <marin@pixelipo.com>2017-12-13 14:49:11 +0100
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-12-20 13:48:09 +0100
commit228ca16bea8a39d50c0085d04396713763cdb288 (patch)
tree89ce4c17e63821f42ec4fd859cdc00f7f6d7a4a7 /core
parent7a9e65ceed793604588399d4eaefa7908ad44379 (diff)
downloadnextcloud-server-228ca16bea8a39d50c0085d04396713763cdb288.tar.gz
nextcloud-server-228ca16bea8a39d50c0085d04396713763cdb288.zip
Dynamic control bar width
Signed-off-by: Marin Treselj <marin@pixelipo.com>
Diffstat (limited to 'core')
-rw-r--r--core/css/mobile.scss2
-rw-r--r--core/css/styles.scss12
2 files changed, 2 insertions, 12 deletions
diff --git a/core/css/mobile.scss b/core/css/mobile.scss
index 19518479987..6f1583cb77a 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 5474b41a2b4..54775f67f62 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;
}