Merge pull request django-cms#623 from divio/feature/drag-and-drop-wi…

…dget-upload drag and drop widget upload
kapt-labs · Dec 8, 2015 · 17fc308 · 17fc308
2 parents 09e30b1 + f4e9465
commit 17fc308
Show file tree

Hide file tree

Showing 14 changed files with 684 additions and 87 deletions.
diff --git a/filer/private/sass/layout/_all.scss b/filer/private/sass/layout/_all.scss
@@ -3,3 +3,4 @@
 @import "old";
 @import "main";
 @import "modal";
+@import "drag-and-drop";
diff --git a/filer/private/sass/layout/_drag-and-drop.scss b/filer/private/sass/layout/_drag-and-drop.scss
@@ -0,0 +1,36 @@
+.dropzone {
+    border-radius: $border-radius-base;
+    border: solid 1px $gray-lighter;
+    background-color: $gray-lightest;
+    &.dz-drag-hover {
+        border: solid 1px $color-primary !important;
+    }
+    .dz-message {
+        color: $gray;
+        float: right;
+        width: 85%;
+        margin: 40px 0 0;
+    }
+    .icon {
+        color: $gray;
+        margin-right: 10px;
+    }
+    .fileUpload {
+        position: relative;
+        overflow: hidden;
+        margin: 40px 0 0;
+        &.fileUpload-btn {
+            @include button-variant($btn-action-color, $btn-action-bgcolor, $btn-action-border, true);
+        }
+    }
+    .fileUpload input.upload {
+        position: absolute;
+        top: 0;
+        right: 0;
+        margin: 0;
+        padding: 0;
+        font-size: 20px;
+        cursor: pointer;
+        opacity: 0;
+    }
+}
diff --git a/filer/private/sass/libs/_all.scss b/filer/private/sass/libs/_all.scss
@@ -2,3 +2,4 @@
 
 @import "bootstrap.custom.min";
 @import "font-awesome.min";
+@import "dropzone";
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@

		@import "bootstrap.custom.min";
		@import "font-awesome.min";
		@import "dropzone";