Merge branch 'develop' into favicon-sizes

packages/rocketchat-theme/assets/stylesheets/base.less

@@ -567,7 +567,7 @@ form.inline {
 		font-size: 14px;
 		padding: 8px 8px;
 	}
-	.loading {
+	.loading-animation {
 		position: relative;
 		min-height: 60px;
 	}
@@ -1097,7 +1097,7 @@ label.required:after {
 			}
 			> div {
 				width: 40px;
-    			display: inline-block;
+				display: inline-block;
 			}
 		}
 		&.no-icon {
@@ -1482,7 +1482,6 @@ label.required:after {
 	}
 }
 
-
 .spotlight {
 	position: fixed;
 	top: 0;
@@ -2188,12 +2187,6 @@ label.required:after {
 	}
 }
 
-.message-popup-items {
-	.loading {
-		display: none;
-	}
-}
-
 .message-popup-position {
 	position: relative;
 }
@@ -3535,7 +3528,7 @@ body:not(.is-cordova) {
 	max-width: 520px;
 	padding: 20px;
 	margin: 20px auto;
-	box-shadow: 0 1px 1px 0 rgba(0,0,0,0.2),0 2px 10px 0 rgba(0,0,0,0.16);
+	box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.2), 0 2px 10px 0 rgba(0, 0, 0, 0.16);
 	border-radius: 4px;
 	position: relative;
 	z-index: 1;
@@ -3572,7 +3565,7 @@ body:not(.is-cordova) {
 	.register,
 	.forgot-password,
 	.back-to-login {
- 		margin-top: 12px;
+		margin-top: 12px;
 	}
 	.input-text {
 		margin: 0 0 14px 0;
@@ -3987,7 +3980,6 @@ body:not(.is-cordova) {
 // 		margin: 0 51px 0 270px;
 // 	}
 // }
-
 .is-cordova {
 	.flex-tab {
 		.control {
@@ -4478,5 +4470,12 @@ a + br.only-after-a {
 	}
 }
 
-#swipebox-slider .slide .swipebox-inline-container, #swipebox-slider .slide .swipebox-video-container, #swipebox-slider .slide img {padding: 40px;}
-#swipebox-overlay {background: rgba(13, 13, 13, 0.5);}
+#swipebox-slider .slide .swipebox-inline-container,
+#swipebox-slider .slide .swipebox-video-container,
+#swipebox-slider .slide img {
+	padding: 40px;
+}
+
+#swipebox-overlay {
+	background: rgba(13, 13, 13, 0.5);
+}

packages/rocketchat-ui-message/message/popup/messagePopup.html

@@ -8,7 +8,6 @@
 					</div>
 				{{/if}}
 				<div class="message-popup-items">
-					{{> loading}}
 					{{#each data}}
 						<div class="popup-item" data-id="{{_id}}">
 							{{> Template.dynamic template=../template}}