Put the quota bar to the bottom

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
index 0263d79e79f978b5184f61936ad665b40a14114e..a064c160cfa62aa0bada3834c2b172d152f37251 100644 (file)
--- a/apps/files/css/files.scss
+++ b/apps/files/css/files.scss
@@ -756,7 +756,12 @@ table.dragshadow td.size {
        margin: 0 !important;
        border: none;
        border-radius: 0;
-       background-color: transparent;
+       position: fixed !important;
+       bottom: 44px;
+       width: inherit !important;
+       background-color: #fff;
+       border-right: 1px solid #eee;
+       z-index:1;
 
        .quota-container {
                height: 5px;
@@ -769,6 +774,11 @@ table.dragshadow td.size {
        }
 }
 
+/* increase the padding of the last item to not hide below the quota item */
+.app-files #app-navigation > ul li:nth-last-child(1) {
+       margin-bottom: 44px;
+}
+
 #quotatext,
 #quotatext-additional {
        padding: 0;

diff --git a/apps/files/js/app.js b/apps/files/js/app.js
index 5f1bf1a7b1e43333d848a6d4d97c8639726fe036..47011d23f4424f51b60efc9e2077128dbdaf1bc7 100644 (file)
--- a/apps/files/js/app.js
+++ b/apps/files/js/app.js
@@ -109,7 +109,7 @@
                        this._onPopState(urlParams);
 
                        $('#quota.has-tooltip').tooltip({
-                               placement: 'bottom'
+                               placement: 'top'
                        });
 
                        this._debouncedPersistShowHiddenFilesState = _.debounce(this._persistShowHiddenFilesState, 1200);

diff --git a/apps/files_trashbin/css/trash.css b/apps/files_trashbin/css/trash.css
index f150e557231b3c657aee86e5b647513bb8d605d8..f1096d5924c8e4ba06c3bdd68bd3e88635103bf1 100644 (file)
--- a/apps/files_trashbin/css/trash.css
+++ b/apps/files_trashbin/css/trash.css
@@ -20,20 +20,17 @@
        display: none;
 }
 
-#app-navigation > ul {
-       padding-bottom: 44px;
-}
-
 /* move Deleted Files to bottom of sidebar */
 .nav-trashbin {
        position: fixed !important;
-       bottom: 44px;
+       bottom: 88px;
        width: inherit !important;
        background-color: #fff;
        border-right: 1px solid #eee;
+       margin-bottom: 0px !important;
 }
 /* double padding to account for Deleted files entry, issue with Firefox */
 .app-files #app-navigation > ul li:nth-last-child(2) {
-       margin-bottom: 44px;
+       margin-bottom: 88px;
 }