summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-03-02 21:27:20 +0100
committerGitHub <noreply@github.com>2018-03-02 21:27:20 +0100
commit46bb3fee81d91e0c89262a8795e6bf047caa6bfe (patch)
tree59560021a5770f43e94fa047035a6b82a9862433 /core
parent364e7fe1be64ea02dd817d4a458db8d50140b31a (diff)
parentbc2032bed78a1901ff8fca74ba0230acfe38f551 (diff)
downloadnextcloud-server-46bb3fee81d91e0c89262a8795e6bf047caa6bfe.tar.gz
nextcloud-server-46bb3fee81d91e0c89262a8795e6bf047caa6bfe.zip
Merge pull request #8609 from nextcloud/ie11-nav-flex-fix
[stable13] Fixed app navigation for IE11
Diffstat (limited to 'core')
-rw-r--r--core/css/apps.scss12
1 files changed, 8 insertions, 4 deletions
diff --git a/core/css/apps.scss b/core/css/apps.scss
index a92db4ed4ab..eda16deca2e 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -218,7 +218,7 @@ kbd {
text-overflow: ellipsis;
color: $color-main-text;
opacity: .57;
- flex: 1 1 0;
+ flex: 1 1 0px;
z-index: 100; /* above the bullet to allow click*/
/* TODO: forbid using img as icon in menu? */
&:first-child img {
@@ -457,7 +457,7 @@ kbd {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
- flex: 1 1 0;
+ flex: 1 1 0px;
line-height: 44px;
}
.app-navigation-entry-deleted-button {
@@ -481,6 +481,7 @@ kbd {
opacity 250ms ease-in-out,
z-index 250ms ease-in-out;
position: absolute;
+ left: 0;
background-color: $color-main-background;
box-sizing: border-box;
}
@@ -1009,6 +1010,8 @@ kbd {
object-fit: cover;
user-select: none;
cursor: pointer;
+ top: 50%;
+ margin-top: -20px;
}
.app-content-list-item-line-one,
@@ -1019,7 +1022,7 @@ kbd {
overflow: hidden;
text-overflow: ellipsis;
order: 1;
- flex: 1 1 0;
+ flex: 1 1 0px;
padding-right: 10px;
cursor: pointer;
}
@@ -1027,7 +1030,8 @@ kbd {
.app-content-list-item-line-two {
opacity: .5;
order: 3;
- flex: 1 0 calc(100% - 24px);
+ flex: 1 0;
+ flex-basis: calc(100% - 24px);
}
.app-content-list-item-details {