2 files changed, 37 insertions, 33 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 15bf85e4a..a5e5dffdb 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -623,16 +623,6 @@ footer {
 }
 
 
-.pmenu {
-	border-bottom: 1px solid #eec;
-	padding: 8px;
-	margin-top: 5px;
-	-moz-border-radius: $radiuspx;
-	-webkit-border-radius: $radiuspx;
-	border-radius: $radiuspx;
-
-}
-
 .pmenu.horizontal {
 	padding: 0 0 0 0;
 	border-bottom: none;
@@ -1112,8 +1102,6 @@ nav .acpopup {
 
 .required {
 	color: #ff0000;
-	font-size: 1.8rem;
-	margin-left: 5px;
 }
 
 
@@ -1521,7 +1509,7 @@ margin-right: 50px;
 }
 
 a .drop-icons {
-	color: $toolicon_colour;;
+	color: $toolicon_colour;
 	font-size: 1.2em;
 	text-decoration: none;
 }
@@ -1530,6 +1518,10 @@ a .drop-icons:hover {
 	color: #FF0000;
 }
 
+.lockview {
+	cursor: pointer;
+}
+
 .permission-inherited {
 	float: left;
 	margin-right: 10px;
@@ -1552,18 +1544,6 @@ a .drop-icons:hover {
 	font-size: 1.8em;
 }
 
-.design-tools ul {
-	list-style-type: none;
-}
-
-.design-icons {
-	margin-right: 10px;
-}
-
-.design-icons:hover { 
-text-decoration: none; 
-}
-
 #menulist {
 	list-style-type: none;
 }
@@ -1608,11 +1588,14 @@ img.mail-list-sender-photo {
 	font-weight: bold;
 }
 
-.jothidden >input, .jothidden >input {
-	border: 1px solid #fff;
+.jothidden > input {
+	border: 1px solid $bgcolour;
+	background-color: $bgcolour;
 }
-.jothidden >input:hover, .jothidden >input:focus {
+.jothidden > input:hover,
+.jothidden > input:focus {
 	border: 1px solid #cccccc;
+	background-color: #fff;
 }
 
 #profile-jot-text {
@@ -1745,7 +1728,8 @@ img.mail-list-sender-photo {
 	font-size: 0.833em;
 }
 
-.wall-item-content {
+.wall-item-content,
+.page-body {
 	font-size: $font_size;
 	clear: both;
 }
@@ -1877,6 +1861,10 @@ nav .dropdown-menu {
 	color: $nav_active_icon_colour;
 }
 
+.page-title {
+	margin: 7px 0px;
+}
+
 .section-title-wrapper {
 	padding: 7px 10px;
 	background-color: $item_colour;
@@ -1948,6 +1936,14 @@ nav .dropdown-menu {
 	background-color: $item_colour;
 }
 
+[id^="webpage-list-item-"]:hover td,
+[id^="block-list-item-"]:hover td,
+[id^="layout-list-item-"]:hover td,
+[id^="menu-list-item-"]:hover td,
+[id^="mitem-list-item-"]:hover td {
+	background-color: $item_colour;
+}
+
 nav ul li .undefined, 
 nav ul li .notify-seen,
 nav ul li .notify-unseen
@@ -2211,6 +2207,12 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
 	border: 3px solid red !important;
 }
 
+.bb_rm-logo {
+	height: 1.3em;
+	width: auto;
+	margin-top:-3px;
+}
+
 .bootstrap-tagsinput .tag:before {
 	/* Copied from icon-asterisk, is there a better way to do it? */
 	font-family: FontAwesome;
@@ -2222,8 +2224,8 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
 
 /* Modified original CSS to match input in Redbasic */
 .jothidden .bootstrap-tagsinput {
-	border-color:#fff;
-	background-color: #fff;
+	border-color: $bgcolour;
+	background-color: $bgcolour;
 	box-shadow: none;
 	display: inline-block;
 	border-radius: $radiuspx;
@@ -2237,7 +2239,8 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
 }
 
 .jothidden .bootstrap-tagsinput:hover, .jothidden .bootstrap-tagsinput:focus {
-	border: 1px solid #cccccc;
+	border: 1px solid #ccc;
+	background-color: #fff;
 }
 
 /* Abusing theme-green is less work than makeing a new new one */
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 2d17e6d08..2133331c6 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -311,8 +311,9 @@ echo str_replace(array_keys($options), array_values($options), $x);
 if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) {
 	echo file_get_contents('view/theme/redbasic/css/narrow_navbar.css');
 } 
+
 if($converse_center && file_exists('view/theme/redbasic/css/converse_center.css')) {
-	echo str_replace(array_keys($options), array_values($options), $x);
+	echo file_get_contents('view/theme/redbasic/css/converse_center.css');
 }
 
 if($schemecss) {