2 files changed, 82 insertions, 16 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 3e457c621..de6f8dac1 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -7,6 +7,7 @@
 
 
 /* generals */
+
 html {
 	font-size: $font_size;
 }
@@ -228,6 +229,81 @@ nav {
 
 /* contextual help end */
 
+/* spinner */
+
+.spinner-wrapper {
+	display: none;
+}
+
+.spinner.s {
+	height: 1rem;
+	width: 1rem;
+}
+
+.spinner.m {
+	height: 2rem;
+	width: 2rem;
+}
+
+.spinner.l {
+	height: 3rem;
+	width: 3rem;
+}
+
+.spinner.s,
+.spinner.m,
+.spinner.l {
+	margin: 0 auto;
+	position: relative;
+	-webkit-animation: rotation 1s infinite linear;
+	-moz-animation: rotation 1s infinite linear;
+	-o-animation: rotation 1s infinite linear;
+	animation: rotation 1s infinite linear;
+	border-left: .2rem solid rgba(77, 77, 77, .15);
+	border-right: .2rem solid rgba(77, 77, 77, .15);
+	border-bottom: .2rem solid rgba(77, 77, 77, .15);
+	border-top: .2rem solid rgba(77, 77, 77, .5);
+	border-radius: 100%;
+}
+
+@-webkit-keyframes rotation {
+	from {
+		-webkit-transform: rotate(0deg);
+	}
+	to {
+		-webkit-transform: rotate(359deg);
+	}
+}
+
+@-moz-keyframes rotation {
+	from {
+		-moz-transform: rotate(0deg);
+	}
+	to {
+		-moz-transform: rotate(359deg);
+	}
+}
+
+@-o-keyframes rotation {
+	from {
+		-o-transform: rotate(0deg);
+	}
+	to {
+		-o-transform: rotate(359deg);
+	}
+}
+
+@keyframes rotation {
+	from {
+		transform: rotate(0deg);
+	}
+	to {
+		transform: rotate(359deg);
+	}
+}
+
+/* spinner end */
+
 /* footer */
 
 footer {
@@ -478,8 +554,8 @@ footer {
 
 #nav-search-spinner {
 	float: right;
-	margin-top: -0.85rem;
-	margin-right: 1.6rem;
+	margin-top: -1.4rem;
+	margin-right: 1rem;
 }
 
 
@@ -721,11 +797,6 @@ div.jGrowl div.jGrowl-notification {
 	display: block;
 }
 
-#page-spinner {
-	color: #777;
-	margin: 24px;
-}
-
 #acl-search::-webkit-input-placeholder {
 	/* non-fontawesome fonts set a fallback for text parts of the placeholder*/
 	font-family: FontAwesome, sans-serif, arial, freesans;
@@ -973,10 +1044,6 @@ img.mail-conv-sender-photo {
 	display: none;
 }
 
-#profile-rotator {
-	color: #777;
-}
-
 .jot-icons.jot-lock-warn {
 	color: darkorange;
 }
@@ -1194,7 +1261,8 @@ img.mail-conv-sender-photo {
 .generic-content-wrapper {
 	border: 1px solid #ccc;
 	box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2);
-	border-radius:  $radius;
+	border-radius: $radius;
+	margin-bottom: 1.5rem;
 }
 
 .section-title-wrapper {
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 5a586b9f9..b36e35ccc 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -16,12 +16,10 @@ $(document).ready(function() {
 	}
 	$('#css3-calc').remove(); // Remove the test element
 
-
-
 	if($(window).width() > 767) {
 		$('#left_aside_wrapper').stick_in_parent({
-			offset_top: $('nav').outerHeight(true) + 10,
-			parent: '#region_1',
+			offset_top: parseInt($('#region_1').css('padding-top')),
+			parent: 'main',
 			spacer: '#left_aside_spacer'
 		});
 	}