Merge branch '3.6RC'

2 files changed, 28 insertions, 31 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 9f78f06c5..970e4bc89 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -593,7 +593,8 @@ footer {
 	background-color: $comment_item_colour;
 }
 
-#nav-notifications-template {
+#nav-notifications-template,
+#nav-notifications-forums-template {
 	display: none;
 }
 
@@ -692,31 +693,6 @@ nav .acpopup {
 	margin-bottom: 15px;
 }
 
-#group-members {
-	margin-top: 20px;
-	padding: 10px;
-	height: 250px;
-	overflow: auto;
-	border: 1px solid #ddd;
-}
-
-#group-separator {
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-
-#group-all-contacts {
-	padding: 10px;
-	height: 450px;
-	overflow: auto;
-	border: 1px solid #ddd;
-}
-
-#group-edit-desc {
-	margin-top: 15px;
-}
-
-
 #prof-members {
 	margin-top: 20px;
 	padding: 10px;
@@ -829,7 +805,7 @@ div.jGrowl div.jGrowl-notification {
 .dropdown-notification,
 .notification,
 .member-item {
-	line-height: 1.1em;
+	line-height: 1.2em;
 	font-size: 0.75rem;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -837,6 +813,11 @@ div.jGrowl div.jGrowl-notification {
 	white-space: nowrap;
 }
 
+.notification.notification-forum {
+	font-size: 0.9rem;
+	color: $font_colour;
+}
+
 #acl-search::-webkit-input-placeholder {
 	/* non-fontawesome fonts set a fallback for text parts of the placeholder*/
 	font-family: ForkAwesome, sans-serif, arial, freesans;
@@ -1271,9 +1252,8 @@ img.mail-conv-sender-photo {
 }
 
 .menu-img-1 {
-	height: 1.5em;
-	width: 1.5em;
-	margin-right: 5px;
+	height: 1.28571429em;
+	width: 1.28571429em;
 	border-radius: $radius;
 }
 
@@ -1411,6 +1391,9 @@ main.fullscreen .generic-content-wrapper {
 
 main.fullscreen .section-title-wrapper {
 	border-radius: 0px;
+	position: sticky;
+	top: 0;
+	z-index: 1020;
 }
 
 main.fullscreen .section-content-wrapper,
@@ -1424,6 +1407,7 @@ main.fullscreen .section-content-wrapper-np {
 
 .atoken-index-row:hover td,
 .chatroom-index-row:hover td,
+.group-index-row:hover td,
 .wikis-index-row:hover td,
 .locs-index-row:hover td,
 [id^="cloud-index-"]:hover td,
@@ -1627,7 +1611,7 @@ dl.bb-dl > dd > li {
 .form-group.checkbox > div label {
     display: block; overflow: hidden; cursor: pointer;
     border: 1px solid #ccc;
-    border-radius: $radius;
+    border-radius: 12px;
     margin:0px;
 	-webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
 	-o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
@@ -1799,3 +1783,11 @@ dl.bb-dl > dd > li {
 .cover-photo-review {
 	margin-bottom: 10px;
 }
+
+.hover-fx-hide  {
+	opacity: 0;
+}
+
+.hover-fx-show:hover .hover-fx-hide {
+	opacity: 1;
+}
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 41f5eb7ce..c905c92cb 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -89,6 +89,11 @@ $(document).ready(function() {
 		tagClass: 'badge badge-pill badge-warning text-dark'
 	});
 
+	$('a.disabled').click(function(e) {
+		e.preventDefault();
+		e.stopPropagation();
+	});
+
 	var doctitle = document.title;
 	function checkNotify() {
 		var notifyUpdateElem = document.getElementById('notify-update');