Merge branch 'develop' into livechat-fix-take-inquiry (077023b1) · Commits · natalie / Rocket.Chat

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

+13 −14

Original line number	Diff line number	Diff line
		@@ -567,7 +567,7 @@ form.inline {
		font-size: 14px;
		padding: 8px 8px;
		}
		.loading {
		.loading-animation {
		position: relative;
		min-height: 60px;
		}
		@@ -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;
		}
		@@ -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);
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -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}}