aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Weimann <mail@michael-weimann.eu>2018-08-19 11:54:37 +0200
committerMichael Weimann <mail@michael-weimann.eu>2018-08-19 12:02:27 +0200
commit18b677ee0225eb259b1901e8dcb5d3fb836d255a (patch)
tree1ac2b3b49ea0c307cff8d9ad8e9f2e61402f4d67
parent4b71df7b15e50815e060da73bb73b7d54dc06333 (diff)
downloadnextcloud-server-18b677ee0225eb259b1901e8dcb5d3fb836d255a.tar.gz
nextcloud-server-18b677ee0225eb259b1901e8dcb5d3fb836d255a.zip
Adds a vendor prefix for position sticky
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
-rw-r--r--core/css/apps.scss4
-rw-r--r--core/css/functions.scss11
-rw-r--r--core/css/styles.scss3
-rw-r--r--settings/css/settings.scss4
4 files changed, 15 insertions, 7 deletions
diff --git a/core/css/apps.scss b/core/css/apps.scss
index 1446187ad83..1120459230a 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -639,7 +639,7 @@ kbd {
min-width: $sidebar-min-width;
max-width: $sidebar-max-width;
display: block;
- position: sticky;
+ @include position('sticky');
top: $header-height;
right:0;
overflow-y: auto;
@@ -1046,7 +1046,7 @@ $popovericon-size: 16px;
/* CONTENT LIST ------------------------------------------------------------ */
.app-content-list {
width: 300px;
- position: sticky;
+ @include position('sticky');
top: $header-height;
border-right: 1px solid var(--color-border);
display: flex;
diff --git a/core/css/functions.scss b/core/css/functions.scss
index 30075df7f58..0815ba29ab6 100644
--- a/core/css/functions.scss
+++ b/core/css/functions.scss
@@ -59,4 +59,13 @@
.icon-#{$icon}.icon-white {
@include icon-color($icon, $dir, $color-white, $version, $core);
}
-} \ No newline at end of file
+}
+
+@mixin position($value) {
+ @if $value == 'sticky' {
+ position: -webkit-sticky; // Safari support
+ position: sticky;
+ } @else {
+ position: $value;
+ }
+}
diff --git a/core/css/styles.scss b/core/css/styles.scss
index 80534e22227..6a72df0e177 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -163,8 +163,7 @@ body {
#controls {
box-sizing: border-box;
- position: -webkit-sticky;
- position: sticky;
+ @include position('sticky');
height: 44px;
padding: 0;
margin: 0;
diff --git a/settings/css/settings.scss b/settings/css/settings.scss
index 7b5f21a289e..5746f26ac0b 100644
--- a/settings/css/settings.scss
+++ b/settings/css/settings.scss
@@ -632,7 +632,7 @@ span.usersLastLoginTooltip {
thead tr {
z-index: 100;
background-color: var(--color-main-background);
- position: sticky;
+ @include position('sticky');
// positional attribute is required for position to take affect.
top: 0;
}
@@ -1439,7 +1439,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
/* various */
&#grid-header,
&#new-user {
- position: sticky;
+ @include position('sticky');
align-self: normal;
background-color: var(--color-main-background);
z-index: 55; /* above multiselect */