Commits

Artem Shoobovych  committed e75ce14 Merge

Merge branch 'upgrade' of bitbucket.org:shybovycha/gis.nikolaev.ua into upgrade

  • Participants
  • Parent commits 0a4a0c1, 5c35a57
  • Branches frontend-design-changes, upgrade

Comments (0)

Files changed (1)

File app/views/map/_actions.html.slim

 			/= image_tag 'controls/change_positions.png', :title => 'down', :action => 'swap-down'
 			= image_tag 'controls/remove_waypoint_hover.png', :title => 'remove', :action => 'remove'
 
+	/! <style>
+		#circleG{
+		width:149.33333333333334px;
+		}
+
+		.circleG{
+		background-color:#e0e0e0;
+		float:left;
+		height:32px;
+		margin-left:17px;
+		width:32px;
+		-webkit-animation-name:bounce_circleG;
+		-webkit-border-radius:21px;
+		-webkit-animation-duration:2.8499999999999996s;
+		-webkit-animation-iteration-count:infinite;
+		-webkit-animation-direction:linear;
+		-moz-animation-name:bounce_circleG;
+		-moz-border-radius:21px;
+		-moz-animation-duration:2.8499999999999996s;
+		-moz-animation-iteration-count:infinite;
+		-moz-animation-direction:linear;
+		opacity:0.3;
+		-o-animation-name:bounce_circleG;
+		border-radius:21px;
+		-o-animation-duration:2.8499999999999996s;
+		-o-animation-iteration-count:infinite;
+		-o-animation-direction:linear;
+		-ms-animation-name:bounce_circleG;
+		-ms-animation-duration:2.8499999999999996s;
+		-ms-animation-iteration-count:infinite;
+		-ms-animation-direction:linear;
+		opacity:0.3}
+
+		#circleG_1{
+		-webkit-animation-delay:0.5700000000000001s;
+		-moz-animation-delay:0.5700000000000001s;
+		-o-animation-delay:0.5700000000000001s;
+		-ms-animation-delay:0.5700000000000001s;
+		}
+
+		#circleG_2{
+		-webkit-animation-delay:1.33s;
+		-moz-animation-delay:1.33s;
+		-o-animation-delay:1.33s;
+		-ms-animation-delay:1.33s;
+		}
+
+		#circleG_3{
+		-webkit-animation-delay:1.71s;
+		-moz-animation-delay:1.71s;
+		-o-animation-delay:1.71s;
+		-ms-animation-delay:1.71s;
+		}
+
+		@-webkit-keyframes bounce_circleG{
+		0%{
+		opacity:0.3}
+
+		50%{
+		opacity:1;
+		background-color:#4b49e9}
+
+		100%{
+		opacity:0.3}
+
+		}
+
+		@-moz-keyframes bounce_circleG{
+		0%{
+		opacity:0.3}
+
+		50%{
+		opacity:1;
+		background-color:#4b49e9}
+
+		100%{
+		opacity:0.3}
+
+		}
+
+		@-o-keyframes bounce_circleG{
+		0%{
+		opacity:0.3}
+
+		50%{
+		opacity:1;
+		background-color:#4b49e9}
+
+		100%{
+		opacity:0.3}
+
+		}
+
+		@-ms-keyframes bounce_circleG{
+		0%{
+		opacity:0.3}
+
+		50%{
+		opacity:1;
+		background-color:#4b49e9}
+
+		100%{
+		opacity:0.3}
+
+		}
+
+		</style>
+		<div id="circleG">
+		<div id="circleG_1" class="circleG">
+		</div>
+		<div id="circleG_2" class="circleG">
+		</div>
+		<div id="circleG_3" class="circleG">
+		</div>
+		</div>
+
+	/!	<style>
+		#outer-barG{
+		height:37px;
+		width:128px;
+		border:1px solid #4b49e9;
+		overflow:hidden;
+		background-color:#e0e0e0}
+
+		.bar-lineG{
+		background-color:#4b49e9;
+		float:left;
+		width:18px;
+		height:120px;
+		margin-right:24px;
+		margin-top:-28px;
+		-moz-transform:rotate(45deg);
+		-webkit-transform:rotate(45deg);
+		-o-transform:rotate(45deg);
+		-ms-transform:rotate(45deg);
+		}
+
+		.bar-animationG{
+		margin-left:168px;
+		width:168px;
+		-webkit-animation-name:bar-animationG;
+		-webkit-animation-duration:1.9500000000000002s;
+		-webkit-animation-iteration-count:infinite;
+		-webkit-animation-direction:linear;
+		-moz-animation-name:bar-animationG;
+		-moz-animation-duration:1.9500000000000002s;
+		-moz-animation-iteration-count:infinite;
+		-moz-animation-direction:linear;
+		-o-animation-name:bar-animationG;
+		-o-animation-duration:1.9500000000000002s;
+		-o-animation-iteration-count:infinite;
+		-o-animation-direction:linear;
+		-ms-animation-name:bar-animationG;
+		-ms-animation-duration:1.9500000000000002s;
+		-ms-animation-iteration-count:infinite;
+		-ms-animation-direction:linear;
+		}
+
+		#front-barG{
+		}
+
+		@-webkit-keyframes bar-animationG{
+		0%{
+		margin-left:155px;
+		margin-top:19px}
+
+		100%{
+		margin-left:-128px;
+		margin-top:-37px}
+
+		}
+
+		@-moz-keyframes bar-animationG{
+		0%{
+		margin-left:155px;
+		margin-top:19px}
+
+		100%{
+		margin-left:-128px;
+		margin-top:-37px}
+
+		}
+
+		@-o-keyframes bar-animationG{
+		0%{
+		margin-left:155px;
+		margin-top:19px}
+
+		100%{
+		margin-left:-128px;
+		margin-top:-37px}
+
+		}
+
+		@-ms-keyframes bar-animationG{
+		0%{
+		margin-left:155px;
+		margin-top:19px}
+
+		100%{
+		margin-left:-128px;
+		margin-top:-37px}
+
+		}
+
+		</style>
+		<div id="outer-barG">
+		<div id="front-barG" class="bar-animationG">
+		<div id="barG_1" class="bar-lineG">
+		</div>
+		<div id="barG_2" class="bar-lineG">
+		</div>
+		<div id="barG_3" class="bar-lineG">
+		</div>
+		</div>
+		</div>
+
 #tabsObjects class="{ title: '#{ t('panel.objects') }' } extruder"
 	.checklist
 		.item