5 files changed, 113 insertions, 13 deletions

diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss
index 01057423d..d3ab3b9f8 100644
--- a/web/sass-files/sass/partials/_files.scss
+++ b/web/sass-files/sass/partials/_files.scss
@@ -133,12 +133,34 @@
     height: 100%;
     background-color: #FFF;
     background-repeat: no-repeat;
+    overflow: hidden;
+    position: relative;
+    text-align: center;
     &.small {
       background-position: center;
     }
     &.normal {
       background-position: top left;
     }
+    .spinner.file__loading {
+        position: absolute;
+        left: 50%;
+        margin-left: -16px;
+        top: 50%;
+        margin-top: -16px;
+    }
+    .file__loaded {
+        max-width: initial;
+        &.landscape, &.quadrat {
+            height: 100px;
+        }
+        &.portrait {
+            width: 120px;
+        }
+    }
+    &:hover .file-playback-controls.stop {
+        @include opacity(1);
+    }
   }
   .post-image__thumbnail {
     float: left;
@@ -215,3 +237,20 @@
     }
   }
 }
+
+.file-playback-controls {
+    position: absolute;
+    right: 5px;
+    bottom: 0;
+    font-size: 22px;
+    cursor: pointer;
+    z-index: 2;
+    -webkit-transition: opacity 0.6s;
+    -moz-transition: opacity 0.6s;
+    -o-transition: opacity 0.6s;
+    transition: opacity 0.6s;
+
+    &.stop {
+        @include opacity(0);
+    }
+}
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 5570b5ce4..1dcdbf348 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -228,11 +228,24 @@
 				background: #FFF;
 				display: table-cell;
 				vertical-align: middle;
+				position: relative;
+
+				&:hover .file-playback-controls.stop {
+			        @include opacity(1);
+			    }
 			}
 			img {
 				max-width: 100%;
 				max-height: 100%;
 			}
+			.spinner.file__loading {
+				z-index: 2;
+				position: absolute;
+				left: 50%;
+				margin-left: -16px;
+				top: 50%;
+				margin-top: -16px;
+			}
 		}
 		.modal-content{
 			box-shadow: none;
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 0f3cc0ef6..6ecc0d965 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -119,20 +119,52 @@ body.ios {
 	background-color: rgba(0, 0, 0, 0.6);
 	text-align: center;
 	color: #FFF;
-	display: table;
-	font-size: 1.7em;
+	font-size: em(20px);
 	font-weight: 600;
 	z-index: 6;
 
-	> div {
-		display: table-cell;
-		vertical-align: middle;
+	&.right-file-overlay {
+		font-size: em(18px);
+		.overlay__circle {
+			width: 300px;
+			height: 300px;
+			margin: -150px 0 0 -150px;
+		}
+		.overlay__files {
+			margin: 60px auto 15px;
+			width: 150px;
+		}
 	}
 
-	.fa {
+	.overlay__circle {
+		background: #111;
+		background: rgba(black, 0.7);
+		width: 370px;
+		height: 370px;
+		margin: -185px 0 0 -185px;
+		@include border-radius(500px);
+		position: absolute;
+		top: 50%;
+		left: 50%;
+	}
+
+	.overlay__files {
 		display: block;
-		font-size: 2em;
-		margin: 0 0 0.3em;
+		margin: 75px auto 20px;
+	}
+
+	.overlay__logo {
+		position: absolute;
+		left: 50%;
+		bottom: 30px;
+		margin-left: -50px;
+		@include opacity(0.3);
+	}
+
+	.fa {
+		display: inline-block;
+		font-size: 1.1em;
+		margin-right: 8px;
 	}
 }
 
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index 09ac2047c..c8bb24f3a 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -199,9 +199,6 @@
 }
 
 @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 {
@@ -278,8 +275,17 @@
             display: block;
         }
     }
-    .center-file-overlay {
-        font-size: 1.3em;
+    .file-overlay {
+        font-size: em(18px);
+        .overlay__circle {
+            width: 300px;
+            height: 300px;
+            margin: -150px 0 0 -150px;
+        }
+        .overlay__files {
+            margin: 60px auto 15px;
+            width: 150px;
+        }
     }
     .date-separator, .new-separator {
         &.hovered--after {
@@ -639,6 +645,9 @@
                     }
                     &.has-close {
                         .btn-close {
+                            width: 40px;
+                            text-align: center;
+                            right: 0;
                             display: block;
                             @include opacity(0.5);
                         }
@@ -749,6 +758,10 @@
     .post-comments {
         padding: 9px 21px 10px 10px !important;
     }
+
+    .post-image__column .post__image .file-playback-controls.stop, .image-wrapper > a .file-playback-controls.stop {
+        @include opacity(1);
+    }
 }
 @media screen and (max-width: 640px) {
     .access-history__table {
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index c4591d7b6..bc53dc0e4 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -103,6 +103,9 @@
                     text-overflow: ellipsis;
                     margin-bottom: 0;
                 }
+                .input-group-addon {
+                    background: transparent;
+                }
                 .radio {
                     label {
                         font-weight: 600;