aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-09-17 17:16:32 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-09-21 14:00:38 +0200
commit11023aa0fea00655d407b0e4d8f9c5f2353838be (patch)
tree4cb116cf83ec0ef8d745e5260b42ca08e2c6b7b1
parent2010c1339d8c6a1784dbb5b2bc0238c2c87f11fe (diff)
downloadnextcloud-server-11023aa0fea00655d407b0e4d8f9c5f2353838be.tar.gz
nextcloud-server-11023aa0fea00655d407b0e4d8f9c5f2353838be.zip
Fix quota order
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
-rw-r--r--apps/files/css/files.scss1
-rw-r--r--apps/files/templates/appnavigation.php16
2 files changed, 8 insertions, 9 deletions
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
index 79d6ab7952a..10f37840580 100644
--- a/apps/files/css/files.scss
+++ b/apps/files/css/files.scss
@@ -778,7 +778,6 @@ table.dragshadow td.size {
border-radius: 0;
background-color: transparent;
z-index:1;
- order: 3 !important; /* after the trash */
.quota-container {
height: 5px;
diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php
index 0a40c7ba815..c6c0ba36518 100644
--- a/apps/files/templates/appnavigation.php
+++ b/apps/files/templates/appnavigation.php
@@ -1,5 +1,13 @@
<div id="app-navigation">
<ul class="with-icon">
+ <?php foreach ($_['navigationItems'] as $item) { ?>
+ <li data-id="<?php p($item['id']) ?>" class="nav-<?php p($item['id']) ?> <?php p($item['classes']) ?>">
+ <a href="<?php p(isset($item['href']) ? $item['href'] : '#') ?>"
+ class="nav-icon-<?php p($item['icon'] !== '' ? $item['icon'] : $item['id']) ?> svg">
+ <?php p($item['name']);?>
+ </a>
+ </li>
+ <?php } ?>
<li id="quota" class="section pinned <?php
if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
?>has-tooltip" title="<?php p($_['usage_relative'] . '%');
@@ -18,14 +26,6 @@
</div>
</a>
</li>
- <?php foreach ($_['navigationItems'] as $item) { ?>
- <li data-id="<?php p($item['id']) ?>" class="nav-<?php p($item['id']) ?> <?php p($item['classes']) ?>">
- <a href="<?php p(isset($item['href']) ? $item['href'] : '#') ?>"
- class="nav-icon-<?php p($item['icon'] !== '' ? $item['icon'] : $item['id']) ?> svg">
- <?php p($item['name']);?>
- </a>
- </li>
- <?php } ?>
</ul>
<div id="app-settings">
<div id="app-settings-header">