Merge branch '3.0RC'3.0

3 files changed, 119 insertions, 21 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 6f4b12468..b0a109c92 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -105,6 +105,7 @@ a,
   color: $link_colour;
 }
 
+
 a:hover,
 a:focus,
 .fakelink:hover,
@@ -112,7 +113,8 @@ a:focus,
   color: $link_colour;
 }
 
-.fakelink {
+.fakelink,
+.cursor-pointer {
 	cursor: pointer;
 }
 
@@ -304,6 +306,49 @@ nav {
 
 /* spinner end */
 
+/* jumping dots */
+.jumping-dots span {
+	position: relative;
+	bottom: 0px;
+	transition-timing-function: ease-in-out;
+	-webkit-animation: jump 1s infinite;
+	animation: jump 1s infinite;
+}
+
+.jumping-dots .dot-1 {
+	-webkit-animation-delay: 200ms;
+	animation-delay: 200ms;
+}
+
+.jumping-dots .dot-2 {
+	-webkit-animation-delay: 400ms;
+	animation-delay: 400ms;
+}
+
+.jumping-dots .dot-3 {
+	-webkit-animation-delay: 600ms;
+	animation-delay: 600ms;
+}
+
+@-webkit-keyframes jump {
+	0% {
+		bottom: 0px;
+	}
+	20% {
+		bottom: 3px;
+	}
+	40% {
+		bottom: 0px;
+	}
+}
+
+@keyframes jump {
+	0%   {bottom: 0px;}
+	20%  {bottom: 3px;}
+	40%  {bottom: 0px;}
+}
+/* jumping dots end */
+
 /* footer */
 
 footer {
@@ -973,6 +1018,11 @@ a .drop-icons:hover {
 	color: #FF0000;
 }
 
+.perm-inherited {
+	color: #FF0000;
+}
+
+
 #menulist {
 	list-style-type: none;
 }
@@ -1479,7 +1529,7 @@ blockquote {
 	color: $nav_active_icon_colour;
 }
 
-@media screen and (max-width: 767px) {
+@media screen and (max-width: 992px) {
 
 	aside#region_1 {
 		border-right: 1px solid $nav_bd;
@@ -1499,6 +1549,11 @@ blockquote {
 		flex-basis: 25%;
 	}
 
+	#navbar-collapse-2 .navbar-app i {
+		font-size: 1rem;
+		margin-right: 0.5rem;
+	}
+
 }
 
 .shareable_element_text {
@@ -1646,6 +1701,17 @@ dl.bb-dl > dd > li {
     background-color: #0275d8;
 }
 
+
+.form-group.checkbox > div > input:disabled + label .onoffswitch-switch {
+    background-color: red;
+	border-radius: 3px;
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+
+}
+
+
+
 .help-searchlist {
 	list-style-type: none;
 }
@@ -1702,3 +1768,40 @@ dl.bb-dl > dd > li {
 #permcat-index {
 	margin: 10px;
 }
+
+.cloud-container {
+	float: left;
+	width: 100px;
+	height: 110px;
+	margin: 5px;
+}
+
+.cloud-icon-container {
+	width: 64px;
+	height: 64px;
+	border: 1px solid #eee;
+	border-radius: $radius;
+}
+
+.cloud-icon i {
+	font-size: 42px;
+	color: #888;
+	margin-top: 8px;
+	margin-left: 6px;
+}
+
+.cloud-icon img {
+	max-width: 64px;
+	max-height: 64px;
+	border-radius: $radius;
+}
+
+.cloud-title {
+	width: 98px;
+	height: 36px;
+	overflow: hidden;
+}
+
+.caption-visible {
+	max-height: 75%;
+}
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 3fee0f282..41f5eb7ce 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -2,14 +2,13 @@
  * redbasic theme specific JavaScript
  */
 
-var notifications_parent;
 $(document).ready(function() {
 
 	// CSS3 calc() fallback (for unsupported browsers)
 	$('body').append('<div id="css3-calc" style="width: 10px; width: calc(10px + 10px); display: none;"></div>');
 	if( $('#css3-calc').width() == 10) {
 		$(window).resize(function() {
-			if($(window).width() < 767) {
+			if($(window).width() < 992) {
 				$('main').css('width', $(window).width() + $('aside').outerWidth() );
 			} else {
 				$('main').css('width', '100%' );
@@ -18,7 +17,7 @@ $(document).ready(function() {
 	}
 	$('#css3-calc').remove(); // Remove the test element
 
-	if($(window).width() >= 767) {
+	if($(window).width() >= 992) {
 		$('#left_aside_wrapper').stick_in_parent({
 			offset_top: parseInt($('aside').css('padding-top')),
 			parent: 'main',
@@ -26,7 +25,7 @@ $(document).ready(function() {
 		});
 	}
 
-	if($(window).width() >= 1200) {
+	if($(window).width() >= 992) {
 		$('#right_aside_wrapper').stick_in_parent({
 			offset_top: parseInt($('aside').css('padding-top')),
 			parent: 'main',
@@ -78,20 +77,9 @@ $(document).ready(function() {
 		}
 	});
 
-	$('#notifications-btn').click(function() {
-		if($('#navbar-collapse-2').hasClass('show')){
-			$('#navbar-collapse-2').removeClass('show');
-		}
-	});
-
-	notifications_parent = $('#notifications_wrapper')[0].parentElement.id;
-	$('#notifications-btn').click(function() {
-		if($('#notifications_wrapper').hasClass('fs'))
-			$('#notifications_wrapper').prependTo('#' + notifications_parent);
-		else
-			$('#notifications_wrapper').prependTo('section');
-
-		$('#notifications_wrapper').toggleClass('fs');
+	$('.notifications-btn').click(function(e) {
+		e.preventDefault();
+		e.stopPropagation();
 		if($('#navbar-collapse-2').hasClass('show')){
 			$('#navbar-collapse-2').removeClass('show');
 		}
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index a921f42af..0a142a07f 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -140,7 +140,7 @@ option {
 }
 
 .nav-link.active {
-	color:#000 !important;
+	color:#fff !important;
 }
 
 a.btn, aside a {
@@ -305,6 +305,13 @@ a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link {
 	background-color: #222;
 }
 
+.text-dark {
+	color: #aaa !important;
+}
+a.text-dark:focus, a.text-dark:hover {
+	color: #ddd !important;
+}
+
 .group-selected, .fileas-selected, .categories-selected, .search-selected, a.active {
 	color: #fff !important;
 	text-decoration: underline !important;