From b704220133c060d8b2192ff2ce5970cbd8c3849d Mon Sep 17 00:00:00 2001 From: perploug Date: Wed, 30 Oct 2013 22:16:51 +0100 Subject: [PATCH] Enable upload drag/drop message on folder browser --- src/Umbraco.Web.UI.Client/src/less/property-editors.less | 9 ++++----- .../src/views/dashboard/media/mediafolderbrowser.html | 5 ++++- .../propertyeditors/folderbrowser/folderbrowser.html | 4 +++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less index 38b03aa1ac..42f111467d 100644 --- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less +++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less @@ -171,7 +171,7 @@ ul.color-picker li a { padding: 20px; opacity: 1; - border: 3px dashed @grayLight; + border: 1px dashed @grayLight; text-align: center; font-size: 14px; @@ -181,12 +181,11 @@ ul.color-picker li a { .umb-upload-drop-zone .info i.icon, .umb-upload-button-big i.icon{ - font-size: 85px; - line-height: 100px + font-size: 55px; + line-height: 70px } -.umb-upload-button-big {display: none} -.touch .umb-upload-button-big {display: block} +.umb-upload-button-big {display: block} .umb-upload-button-big input { left: 0; bottom: 0; diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediafolderbrowser.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediafolderbrowser.html index 910ae4d60a..bf45d04ea5 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediafolderbrowser.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediafolderbrowser.html @@ -6,7 +6,10 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupload-processing': processing() || loadingFiles}"> - + + +

Click to upload

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html index 7e69796fd4..0a96ef9b40 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html @@ -6,7 +6,9 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupload-processing': processing() || loadingFiles}"> - +

Click to upload