move loading animation css to css bundle

vickychu · Mar 6, 2018 · 2fd19cb · 2fd19cb
1 parent e356d7f
commit 2fd19cb
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 51 deletions.
diff --git a/packages/rocketchat-theme/client/imports/general/base.css b/packages/rocketchat-theme/client/imports/general/base.css
@@ -207,3 +207,52 @@ button {
 .hidden {
 	display: none;
 }
+
+.loading-animation {
+	position: absolute;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+
+	display: flex;
+
+	text-align: center;
+	align-items: center;
+	justify-content: center;
+}
+
+.loading-animation > .bounce {
+	display: inline-block;
+
+	width: 10px;
+	height: 10px;
+	margin: 2px;
+
+	animation: loading-bouncedelay 1.4s infinite ease-in-out both;
+
+	border-radius: 100%;
+	background-color: rgba(255, 255, 255, 0.6);
+}
+
+.loading-animation .bounce1 {
+	-webkit-animation-delay: -0.32s;
+	animation-delay: -0.32s;
+}
+
+.loading-animation .bounce2 {
+	-webkit-animation-delay: -0.16s;
+	animation-delay: -0.16s;
+}
+
+@keyframes loading-bouncedelay {
+	0%,
+	80%,
+	100% {
+		transform: scale(0);
+	}
+
+	40% {
+		transform: scale(1);
+	}
+}
diff --git a/packages/rocketchat-ui-master/package.js b/packages/rocketchat-ui-master/package.js
@@ -28,5 +28,4 @@ Package.onUse(function(api) {
 
 	api.addFiles('server/inject.js', 'server');
 	api.addAssets('public/icons.svg', 'server');
-	api.addAssets('public/loading.css', 'server');
 });
diff --git a/packages/rocketchat-ui-master/public/loading.css b/packages/rocketchat-ui-master/public/loading.css
diff --git a/packages/rocketchat-ui-master/server/inject.js b/packages/rocketchat-ui-master/server/inject.js
@@ -29,8 +29,6 @@ RocketChat.models.Settings.find({_id:/theme-color-rc/i}, {fields: { value: 1}}).
 
 Inject.rawHead('dynamic', `<script>(${ require('./dynamic-css.js').default.toString().replace(/\/\/.*?\n/g, '') })()</script>`);
 
-Inject.rawHead('page-loading', `<style>${ Assets.getText('public/loading.css') }</style>`);
-
 Inject.rawBody('icons', Assets.getText('public/icons.svg'));
 
 Inject.rawBody('page-loading-div', `