Merge pull request #378 from rgarmsen2295/mm-316c

MM-316 Allows users to drag and drop files from their computer to the center pane or RHS to upload them

5 files changed, 42 insertions, 7 deletions

diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index 78006ff18..5b68b488f 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -24,6 +24,7 @@ body {
     height: 100%;
     > .row.main {
       height: 100%;
+      position: relative;
     }
   }
   > .container-fluid {
diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss
index ca06d7def..1375a10e7 100644
--- a/web/sass-files/sass/partials/_files.scss
+++ b/web/sass-files/sass/partials/_files.scss
@@ -193,11 +193,12 @@
     border-right: 1px solid #ddd;
     vertical-align: center;
 
-        // helper to center the image icon in the preview window
-        .file-details__preview-helper {
-          height: 100%;
-          display: inline-block;
-          vertical-align: middle;
-        }
-      }
+    // helper to center the image icon in the preview window
+    .file-details__preview-helper {
+      height: 100%;
+      display: inline-block;
+      vertical-align: middle;
     }
+  }
+}
+
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 98b17120d..56b31205b 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -106,6 +106,32 @@ body.ios {
 	}
 }
 
+.file-overlay {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background-color: rgba(0, 0, 0, 0.6);
+	text-align: center;
+	color: #FFF;
+	display: table;
+	font-size: 1.7em;
+	font-weight: 600;
+	z-index: 6;
+
+	> div {
+		display: table-cell;
+		vertical-align: middle;
+	}
+
+	.fa {
+		display: block;
+		font-size: 2em;
+		margin: 0 0 0.3em;
+	}
+}
+
 #post-list {
 	.post-list-holder-by-time {
 		background: #fff;
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index f28df1f89..733d81c2b 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -189,6 +189,9 @@
 }
 
 @media screen and (max-width: 960px) {
+    .center-file-overlay {
+        font-size: 1.5em;
+    }
     .post {
         .post-header .post-header-col.post-header__reply {
             .comment-icon__container__hide {
@@ -240,6 +243,9 @@
     }
 }
 @media screen and (max-width: 768px) {
+    .center-file-overlay {
+        font-size: 1.3em;
+    }
     .date-separator, .new-separator {
         &.hovered--after {
             &:before {
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index 5d866715e..2376c9212 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -6,6 +6,7 @@
     border-right: $border-gray;
     padding: 0 0 2em 0;
     background: #fafafa;
+    z-index: 5;
     &.sidebar--padded {
         padding-top: 44px;
     }