Merge branch '5.0RC'5.0

1 files changed, 22 insertions, 16 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 3bee84378..545e610b5 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -22,18 +22,21 @@ body {
 	margin: 0px;
 }
 
-aside {
-	width: $aside_widthpx;
-	min-width: $aside_widthpx;
-	max-width: $aside_widthpx;
+aside#region_1 {
+	border-right: 1px solid transparent;
+	width: $left_aside_widthpx;
+	min-width: $left_aside_widthpx;
+	max-width: $left_aside_widthpx;
 }
 
-aside #region_1 {
-	border-right: 1px solid transparent;
+aside#region_3 {
+	width: $right_aside_widthpx;
+	min-width: $left_aside_widthpx;
+	max-width: $right_aside_widthpx;
 }
 
-aside #left_aside_wrapper,
-aside #right_aside_wrapper {
+aside#left_aside_wrapper,
+aside#right_aside_wrapper {
 	margin-bottom: 10px;
 }
 
@@ -796,8 +799,6 @@ div.jGrowl div.jGrowl-notification {
 }
 
 .contactname {
-	font-weight: bold;
-	color: $font_colour;
 	display: block;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -1516,8 +1517,8 @@ blockquote {
 	}
 
 	main {
-		left: -$aside_widthpx;
-		width: calc( 100% + $aside_widthpx );
+		left: -$left_aside_widthpx;
+		width: calc( 100% + $left_aside_widthpx );
 	}
 
 	main.region_1-on {
@@ -1605,6 +1606,10 @@ dl.bb-dl > dd > li {
 	font-size: 100%;
 }
 
+.bootstrap-tagsinput input {
+	height: 2.5rem;
+}
+
 /* Abusing theme-green is less work than makeing a new new one */
 .theme-green .back-bar .selected-bar {
 	background-color: #000000;
@@ -1624,13 +1629,14 @@ dl.bb-dl > dd > li {
 }
 
 .form-group.checkbox > div label {
-    display: block; overflow: hidden; cursor: pointer;
-    border: 1px solid #ccc;
-    border-radius: 12px;
-    margin:0px;
+	display: block; overflow: hidden; cursor: pointer;
+	border: 1px solid #ccc;
+	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;
 	transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+	font-weight: normal;
 }
 
 .form-group.checkbox:hover label {