summaryrefslogtreecommitdiffstats
path: root/core/css
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2017-12-22 09:11:16 +0100
committerGitHub <noreply@github.com>2017-12-22 09:11:16 +0100
commitd0e7b0d8c3bc24922644c605a3fa61b467a40a65 (patch)
tree427ebed2841f06d9e417a6fdfbb9c85a289a5385 /core/css
parent0b8a9fcaead4074d603c6a66f0c6c4c63d89dc51 (diff)
parent8cc90ab4de744f430b69f8a9f1f3447d0f926af0 (diff)
downloadnextcloud-server-d0e7b0d8c3bc24922644c605a3fa61b467a40a65.tar.gz
nextcloud-server-d0e7b0d8c3bc24922644c605a3fa61b467a40a65.zip
Merge pull request #7478 from nextcloud/breadcrumbs-buttons-fixes-gallery
Fixed breadcrumbs calculation and actions flow
Diffstat (limited to 'core/css')
-rw-r--r--core/css/mobile.scss2
-rw-r--r--core/css/styles.scss16
2 files changed, 5 insertions, 13 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..1b76e3c68de 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -223,29 +223,23 @@ body {
#controls {
box-sizing: border-box;
- position: fixed;
- top: 45px;
- right: 0;
- left: 0;
+ position: -webkit-sticky;
+ position: sticky;
height: 44px;
- width: calc(100% - 250px);
padding: 0;
margin: 0;
background-color: rgba($color-main-background, 0.95);
- z-index: 50;
+ z-index: 55;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
- display: inline-flex;
+ display: flex;
+ top: 0;
}
/* position controls for apps with app-navigation */
-#app-navigation + #app-content #controls {
- left: 250px;
-}
-
.viewer-mode #app-navigation + #app-content #controls {
left: 0;
}