Registrations currently disabled due to spam. Contact me externally if you need an account

Commit 5930a48e authored by Gabriel Engel's avatar Gabriel Engel Committed by GitHub
Browse files

Merge pull request #5229 from RocketChat/rename-loading-animation 

rename default loading animation
parents b33113ae 7f4f3bb6

packages/rocketchat-channel-settings/client/stylesheets/channel-settings.less

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
			}

		}

		.setting-block {

			.loading {

			.loading-animation {

				top: 30px;

			}

			&:hover {

packages/rocketchat-livechat/app/client/stylesheets/loading.less

+39 −31
Original line number Diff line number Diff line 
@import "_variables.less";



.loading {

.loading-animation {

	color: @secondary-font-color;

	font-size: 1.3rem;

	margin-left: 32px;
@@ -8,37 +8,45 @@ 
	margin-bottom: 5px;

}



.loading > div {

.loading-animation > div {

	width: 3px;

	height: 3px;

  background-color: @secondary-font-color;



	border-radius: 100%;

	display: inline-block;

  -webkit-animation: sk-bouncedelay 1.4s infinite ease-in-out both;

  animation: sk-bouncedelay 1.4s infinite ease-in-out both;

	background-color: @secondary-font-color;

	-webkit-animation: loading-bouncedelay 1.4s infinite ease-in-out both;

	animation: loading-bouncedelay 1.4s infinite ease-in-out both;

}



.loading .bounce1 {

.loading-animation .bounce1 {

	-webkit-animation-delay: -0.32s;

	animation-delay: -0.32s;

}



.loading .bounce2 {

.loading-animation .bounce2 {

	-webkit-animation-delay: -0.16s;

	animation-delay: -0.16s;

}



@-webkit-keyframes sk-bouncedelay {

  0%, 80%, 100% { -webkit-transform: scale(0) }

  40% { -webkit-transform: scale(1.0) }

@-webkit-keyframes loading-bouncedelay {

	0%,

	80%,

	100% {

		-webkit-transform: scale(0)

	}

	40% {

		-webkit-transform: scale(1.0)

	}

}



@keyframes sk-bouncedelay {

  0%, 80%, 100% { 

@keyframes loading-bouncedelay {

	0%,

	80%,

	100% {

		-webkit-transform: scale(0);

		transform: scale(0);

  } 40% { 

	}

	40% {

		-webkit-transform: scale(1.0);

		transform: scale(1.0);

	}

packages/rocketchat-livechat/app/client/views/loading.html

+1 −1
Original line number Diff line number Diff line 
<template name="loading">

	<div class="loading">

	<div class="loading-animation">

		{{_ "Connecting to an Agent"}}

		<div class="bounce1"></div>

		<div class="bounce2"></div>

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

+0 −3
Original line number Diff line number Diff line
@@ -8,9 +8,6 @@ Template.mentionsFlexTab.helpers 
	message: ->

		return _.extend(this, { customClass: 'mentions' })



	notReadySubscription: ->

		return 'notready' unless Template.instance().subscriptionsReady()



	hasMore: ->

		return Template.instance().hasMore.get()

packages/rocketchat-mentions-flextab/client/views/stylesheets/mentionsFlexTab.less

+0 −23
Original line number Diff line number Diff line 
.mentioned-messages-list {

	&.notready {

		background-image: url(images/logo/loading.gif);

		background-repeat: no-repeat;

		background-position: 50% 50%;

		height: 100px;



		.message {

			display: none;

		}

	}



	li.empty {

		text-align: center;

		margin-top: 60px;

	}



	.message-cog-container {

		.message-action {

			display: none !important;
@@ -23,11 +7,4 @@ 
			}

		}

	}



	.load-more {

		text-transform: lowercase;

		text-align: center;

		line-height: 40px;

		font-style: italic;

	}

}