From 49f01a6fda23817b2cb421d7536902cda19a1639 Mon Sep 17 00:00:00 2001 From: Felix Heidecke Date: Fri, 25 Oct 2019 15:43:36 +0200 Subject: [PATCH] Minor cleanup --- apps/files/css/files.css | 50 +++++++++++++++++---------------------- apps/files/js/filelist.js | 10 ++++---- 2 files changed, 27 insertions(+), 33 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 23774f26d876..8c3c7e4f462d 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -522,16 +522,16 @@ table td.filename .uploadtext { #fileList tr:not(:hover):not(.selected) td.filename .thumbnail.sharetree-item:after { position: absolute; - display: block; - content: ''; - bottom: 0px; - right: -5px; - z-index: 10; - background-image: url(../img/shareinfo.svg); - width: 14px; - height: 14px; - background-repeat: no-repeat; - background-position: center; + display: block; + content: ''; + bottom: 0px; + right: -5px; + z-index: 10; + background-image: url(../img/shareinfo.svg); + width: 14px; + height: 14px; + background-repeat: no-repeat; + background-position: center; } .shareTree { @@ -552,7 +552,7 @@ table td.filename .uploadtext { border-radius: 50%; float: left; margin-right: 10px; - transform: translateY(5px); + margin-top: 5px; } .shareTree-item-icon { @@ -569,12 +569,6 @@ table td.filename .uploadtext { display: block; } -.shareTree-item-path:before, -.shareTree-item-path:after { - content: '"'; -} - - /* Show checkbox when hovering, checked, or selected */ html.ie8 #fileList tr td.filename > .selectCheckBox:checked, html.ie8 #fileList tr.selected td.filename > .selectCheckBox, @@ -1044,11 +1038,11 @@ html.ie8 #controls .button.new { sharing indicator on the top right is still pending --------------------------------------------------- -#controls #shareinfo_indicator { + #controls #shareinfo_indicator { float: right; - height: 32px; - position: relative; - align-items: center; + height: 32px; + position: relative; + align-items: center; padding: 6px 7px 0 0; } @@ -1066,13 +1060,13 @@ html.ie8 #controls .button.new { #controls #shareinfo_indicator .text:after { content: ""; position: absolute; - width: 0; - height: 0; - border-style: solid; - border-width: 4px 4px 0 4px; - border-color: #927800 transparent transparent transparent; - right: 10px; - top: calc(50% - 2px); + width: 0; + height: 0; + border-style: solid; + border-width: 4px 4px 0 4px; + border-color: #927800 transparent transparent transparent; + right: 10px; + top: calc(50% - 2px); } #controls #shareinfo_indicator:not(:hover) .list { diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index c662a18d83c1..546a74618dd5 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1092,8 +1092,8 @@ this.$fileList.trigger(jQuery.Event('updated')); - this._setShareTree().then(function() { - $('#filestable').trigger(jQuery.Event('shareTreeSet')); + this._updateShareTree().then(function() { + $('#filestable').trigger(jQuery.Event('shareTreeUpdated')); }); _.defer(function() { @@ -1508,7 +1508,7 @@ } }); - $('#filestable').on('shareTreeSet', function() { + $('#filestable').on('shareTreeUpdated', function() { self._setShareTreeIcons(); }) }, @@ -1856,7 +1856,7 @@ return Promise.all(crumbs) }, - _setShareTree: function() { + _updateShareTree: function() { let self = this; return this.getPathShareInfo(this.getCurrentDirectory()).then(function(path) { @@ -1872,7 +1872,7 @@ // Add share-tree icon to files and folders // each per in the table - $('#fileList tr td.filename .thumbnail:not(.sharetree-item)').addClass('sharetree-item') + this.$el.find('#fileList tr td.filename .thumbnail:not(.sharetree-item)').addClass('sharetree-item') }, _setShareTreeView: function() {