From 6c60b85a87ce17037437353108584116f56d9847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hermann?= Date: Fri, 27 Mar 2020 13:31:50 +0100 Subject: [PATCH] Fix breadcrumb in move or copy file dialog Signed-off-by: npmbuildbot[bot] --- core/css/styles.scss | 9 +++++++-- core/js/dist/login.js | 2 +- core/js/dist/login.js.map | 2 +- core/js/dist/main.js | 2 +- core/js/dist/main.js.map | 2 +- core/js/dist/maintenance.js | 2 +- core/js/dist/maintenance.js.map | 2 +- core/src/OC/dialogs.js | 6 ++++++ core/templates/filepicker.html | 23 +++++++++++++---------- 9 files changed, 32 insertions(+), 18 deletions(-) diff --git a/core/css/styles.scss b/core/css/styles.scss index 2daf76f7ac..1660527532 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -718,6 +718,8 @@ code { /* ---- DIALOGS ---- */ #oc-dialog-filepicker-content { position: relative; + display: flex; + flex-direction:column; .dirtree { flex-wrap: wrap; @@ -778,7 +780,9 @@ code { border: 1px solid var(--color-border-dark); border-radius: var(--border-radius-pill); position: relative; - top: -5px; + left: 15px; + top:3px; + order:1; .icon.icon-add{ background-image: var(--icon-add-000); @@ -811,7 +815,8 @@ code { box-sizing: border-box; display: inline-block; overflow-y: auto; - height: 100%; + flex: 1; + /*height: 100%;*/ /* overflow under the button row */ width: 100%; overflow-x: hidden; diff --git a/core/js/dist/login.js b/core/js/dist/login.js index 05d3265558..cd93afadcd 100644 --- a/core/js/dist/login.js +++ b/core/js/dist/login.js @@ -44,7 +44,7 @@ function(e){var t,n,r,i,a,o,s,u,c,l,d,f,h,p,m,_,y,v,g,M="sizzle"+1*new Date,L=e. * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . - */var $={YES_NO_BUTTONS:70,OK_BUTTONS:71,FILEPICKER_TYPE_CHOOSE:1,FILEPICKER_TYPE_MOVE:2,FILEPICKER_TYPE_COPY:3,FILEPICKER_TYPE_COPY_MOVE:4,FILEPICKER_TYPE_CUSTOM:5,dialogsCounter:0,alert:function(e,t,n,r){this.message(e,t,"alert",$.OK_BUTTON,n,r)},info:function(e,t,n,r){this.message(e,t,"info",$.OK_BUTTON,n,r)},confirm:function(e,t,n,r){return this.message(e,t,"notice",$.YES_NO_BUTTONS,n,r)},confirmDestructive:function(e,t,n,r,i){return this.message(e,t,"none",n,r,i)},confirmHtml:function(e,t,n,r){return this.message(e,t,"notice",$.YES_NO_BUTTONS,n,r,!0)},prompt:function(e,n,r,i,a,o){return s.a.when(this._getMessageTemplate()).then((function(u){var c="oc-dialog-"+$.dialogsCounter+"-content",d="#"+c,f=u.octemplate({dialog_name:c,title:n,message:e,type:"notice"}),h=s()("");h.attr("type",o?"password":"text").attr("id",c+"-input").attr("placeholder",a);var p=s()("