fix loading colors

packages/rocketchat-channel-settings/client/views/channelSettings.html

@@ -50,7 +50,7 @@
 												</div>
 												{{#if $value.canEdit room}}
 													{{#if $value.processing.get}}
-														{{> loading dark=true}}
+														{{> loading}}
 													{{/if}}
 												{{/if}}
 											{{/if}}

packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.html

@@ -17,7 +17,7 @@
 		</ul>
 		{{#if hasMore}}
 			<div class="load-more">
-				{{> loading dark=true}}
+				{{> loading}}
 			</div>
 		{{/if}}
 	</div>

packages/rocketchat-message-pin/client/views/pinnedMessages.html

@@ -17,7 +17,7 @@
 		</ul>
 		{{#if hasMore}}
 			<div class="load-more">
-				{{> loading dark=true}}
+				{{> loading}}
 			</div>
 		{{/if}}
 	</div>

packages/rocketchat-message-snippet/client/tabBar/views/snippetedMessages.html

@@ -17,7 +17,7 @@
 		</ul>
 		{{#if hasMore}}
 			<div class="load-more">
-				{{> loading dark=true}}
+				{{> loading}}
 			</div>
 		{{/if}}
 	</div>

packages/rocketchat-message-star/client/views/starredMessages.html

@@ -17,7 +17,7 @@
 		</ul>
 		{{#if hasMore}}
 			<div class="load-more">
-				{{> loading dark=true}}
+				{{> loading}}
 			</div>
 		{{/if}}
 	</div>

packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less

@@ -974,6 +974,13 @@ label.required::after {
 	color: @error-contrast;
 }
 
-.loading-animation.dark > div {
-	background-color: @transparent-darkest;
+/** ----------------------------------------------------------------------------
+ * Loading
+ */
+
+.main-content,
+.flex-tab {
+	.loading-animation > div {
+		background-color: @primary-font-color;
+	}
 }

packages/rocketchat-ui-flextab/flex-tab/tabs/messageSearch.html

@@ -28,7 +28,7 @@
 				</ul>
 				{{#if hasMore}}
 					<div class="load-more">
-						{{> loading dark=true}}
+						{{> loading}}
 					</div>
 				{{/if}}
 			{{/if}}

packages/rocketchat-ui-flextab/flex-tab/tabs/uploadedFilesList.html

@@ -22,7 +22,7 @@
 			</ul>
 			{{#if hasMore}}
 				<div class="load-more">
-					{{> loading dark=true}}
+					{{> loading}}
 				</div>
 			{{/if}}
 			{{#if Template.subscriptionsReady}}

packages/rocketchat-ui-master/master/loading.html

 <template name="loading">
-	<div class="loading-animation {{#if dark}}dark{{/if}}">
+	<div class="loading-animation">
 		<div class="bounce1"></div>
 		<div class="bounce2"></div>
 		<div class="bounce3"></div>

packages/rocketchat-ui-master/server/inject.js

 /* globals Inject */
 
-Inject.rawBody('page-loading', `
+Inject.rawHead('page-loading', `
 <style>
 .loading-animation {
 	top: 0;
@@ -19,7 +19,7 @@ Inject.rawBody('page-loading', `
 	margin: 2px;
 	border-radius: 100%;
 	display: inline-block;
-	background-color: rgba(255,255,255,0.8);
+	background-color: rgba(255,255,255,0.6);
 	-webkit-animation: loading-bouncedelay 1.4s infinite ease-in-out both;
 	animation: loading-bouncedelay 1.4s infinite ease-in-out both;
 }
@@ -63,15 +63,15 @@ if (process.env.DISABLE_ANIMATION) {
 	`);
 }
 
-RocketChat.settings.get('theme-color-primary-background-color', function(key, value = '#04436a') {
+RocketChat.settings.get('theme-color-primary-background-color', (key, value = '#04436a') => {
 	Inject.rawHead(key, `<style>body { background-color: ${value};}</style>` +
 						`<meta name="msapplication-TileColor" content="${value}" />` +
 						`<meta name="theme-color" content="${value}" />`);
 });
 
-RocketChat.settings.get('Accounts_ForgetUserSessionOnWindowClose', function(key, value) {
+RocketChat.settings.get('Accounts_ForgetUserSessionOnWindowClose', (key, value) => {
 	if (value) {
-		Inject.rawModHtml(key, function(html) {
+		Inject.rawModHtml(key, (html) => {
 			const script = `
 				<script>
 					if (Meteor._localStorage._data === undefined && window.sessionStorage) {
@@ -82,46 +82,46 @@ RocketChat.settings.get('Accounts_ForgetUserSessionOnWindowClose', function(key,
 			return html.replace(/<\/body>/, script + '\n</body>');
 		});
 	} else {
-		Inject.rawModHtml(key, function(html) {
+		Inject.rawModHtml(key, (html) => {
 			return html;
 		});
 	}
 });
 
-RocketChat.settings.get('Site_Name', function(key, value = 'Rocket.Chat') {
+RocketChat.settings.get('Site_Name', (key, value = 'Rocket.Chat') => {
 	Inject.rawHead(key,
 		`<title>${value}</title>` +
 		`<meta name="application-name" content="${value}">` +
 		`<meta name="apple-mobile-web-app-title" content="${value}">`);
 });
 
-RocketChat.settings.get('Meta_language', function(key, value = '') {
+RocketChat.settings.get('Meta_language', (key, value = '') => {
 	Inject.rawHead(key,
 		`<meta http-equiv="content-language" content="${value}">` +
 		`<meta name="language" content="${value}">`);
 });
 
-RocketChat.settings.get('Meta_robots', function(key, value = '') {
+RocketChat.settings.get('Meta_robots', (key, value = '') => {
 	Inject.rawHead(key, `<meta name="robots" content="${value}">`);
 });
 
-RocketChat.settings.get('Meta_msvalidate01', function(key, value = '') {
+RocketChat.settings.get('Meta_msvalidate01', (key, value = '') => {
 	Inject.rawHead(key, `<meta name="msvalidate.01" content="${value}">`);
 });
 
-RocketChat.settings.get('Meta_google-site-verification', function(key, value = '') {
+RocketChat.settings.get('Meta_google-site-verification', (key, value = '') => {
 	Inject.rawHead(key, `<meta name="google-site-verification" content="${value}" />`);
 });
 
-RocketChat.settings.get('Meta_fb_app_id', function(key, value = '') {
+RocketChat.settings.get('Meta_fb_app_id', (key, value = '') => {
 	Inject.rawHead(key, `<meta property="fb:app_id" content="${value}">`);
 });
 
-RocketChat.settings.get('Meta_custom', function(key, value = '') {
+RocketChat.settings.get('Meta_custom', (key, value = '') => {
 	Inject.rawHead(key, value);
 });
 
-Meteor.defer(function() {
+Meteor.defer(() => {
 	let baseUrl;
 	if (__meteor_runtime_config__.ROOT_URL_PATH_PREFIX && __meteor_runtime_config__.ROOT_URL_PATH_PREFIX.trim() !== '') {
 		baseUrl = __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;

packages/rocketchat-ui/views/app/room.html

@@ -83,7 +83,7 @@
 						{{#if canPreview}}
 							{{#if hasMore}}
 								<li class="load-more">
-									{{> loading dark=true}}
+									{{> loading}}
 								</li>
 							{{else}}
 								<li class="start">
@@ -96,7 +96,7 @@
 						{{/each}}
 						{{#if hasMoreNext}}
 							<li class="load-more">
-								{{> loading dark=true}}
+								{{> loading}}
 							</li>
 						{{/if}}
 					</ul>