Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	mod/editpost.php
	util/messages.po
	view/nl/messages.po
	view/nl/strings.php

5 files changed, 41 insertions, 26 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 716298845..a44cf331c 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -28,12 +28,17 @@ aside#region_1 {
 	width: $aside_widthpx;
 	min-width: $aside_widthpx;
 	max-width: $aside_widthpx;
+	padding: 80px 7px 0px 7px;
 }
 
 main {
 	max-width: $main_widthpx;
 }
 
+section {
+	padding: 80px 7px 200px 7px;
+}
+
 h1, .h1, h2, .h2 {
 	font-size: 1.667em;
 }
@@ -264,12 +269,20 @@ footer {
 }
 
 /*TODO: we should use one class for all this. */
-/*
-.group-selected, .fileas-selected, .categories-selected, .search-selected, .active {
-	color: #444 !important;
-	text-decoration: none !important;
+
+.group-selected,
+.fileas-selected,
+.categories-selected,
+.search-selected,
+.active,
+.group-selected:hover,
+.fileas-selected:hover,
+.categories-selected:hover,
+.search-selected:hover,
+.active:hover {
+	color: $font_colour;
 }
-*/
+
 
 .fileas-all {
 	text-decoration: none !important;
@@ -347,7 +360,8 @@ footer {
 	word-wrap: break-word;
 }
 
-.vcard dl  {
+.vcard dl,
+.vcard .title {
 	margin-top: 10px;
 	margin-bottom: 0px;
 }
@@ -406,13 +420,14 @@ footer {
 
 
 #profile-photo-wrapper img {
-	padding: 10px;
-	width: 197px;
-	height: 197px;
+	width: 100%;
+	max-width: 300px;
+	height: auto;
 }
 
 #profile-photo-wrapper {
-	margin-top: 10px;
+	margin-top: -10px;
+	margin-bottom: 10px;
 }
 
 
@@ -571,7 +586,7 @@ footer {
 }
 
 .photo {
-    border: 1px solid #AAAAAA;
+    border: 1px solid #ccc;
 }
 
 .photo-top-photo, .photo-album-photo {
@@ -704,8 +719,8 @@ a.rateme, div.rateme {
 
 .contact-block-div {
 	float: left;
-	width: 49px;
-	height: 49px;
+	width: 50px;
+	height: 50px;
 }
 .contact-block-textdiv {
 	float: left;
@@ -720,8 +735,8 @@ a.rateme, div.rateme {
 	float: left;
 }
 .contact-block-img {
-	width:47px;
-	height:47px;
+	width:48px;
+	height:48px;
 }
 
 #tag-remove {
@@ -1587,8 +1602,8 @@ img.mail-list-sender-photo {
 }
 
 .jothidden > input {
-	border: 1px solid $bgcolour;
-	background-color: $bgcolour;
+	border: 1px solid transparent;
+	background-color: transparent;
 }
 .jothidden > input:hover,
 .jothidden > input:focus {
@@ -2109,9 +2124,15 @@ nav .badge.mail-update:hover {
 }
 
 @media screen and (max-width: 767px) {
+
+	section {
+		padding: 65px 7px 200px 7px;
+	}
+
 	aside#region_1 {
 		background: rgba(0, 0, 0, .1);
 		border-right: 1px solid $nav_bd;
+		padding: 65px 7px 0px 7px;
 	}
 
 	main {
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 68190778c..302efc365 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -7,7 +7,7 @@ $(document).ready(function() {
 	if( $('#css3-calc').width() == 10) {
 		$(window).resize(function() {
 			if($(window).width() < 767) {
-				$('main').css('width', $(window).width() + 231 );
+				$('main').css('width', $(window).width() + 285 );
 			} else {
 				$('main').css('width', '100%' );
 			}
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 6e68d38d5..96dba59e5 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -154,7 +154,7 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
 
 	$x = file_get_contents('view/theme/redbasic/css/style.css');
 
-	$aside_width = 231;
+	$aside_width = 285;
 
 	// left aside and right aside are is 231px + converse width
 	if($converse_center) {
diff --git a/view/theme/redbasic/schema/focus.css b/view/theme/redbasic/schema/focus.css
index 3d64b8a7d..ea983ffc8 100644
--- a/view/theme/redbasic/schema/focus.css
+++ b/view/theme/redbasic/schema/focus.css
@@ -16,10 +16,6 @@
 	background-color: #fff;
 }
 
-#redbasic_converse_center_container {
-	display: none;
-}
-
 .wall-item-conv {
 	padding-top: 10px;
 	padding-left: 10px;
diff --git a/view/theme/redbasic/schema/focus.php b/view/theme/redbasic/schema/focus.php
index 4186c9f64..1f1963764 100644
--- a/view/theme/redbasic/schema/focus.php
+++ b/view/theme/redbasic/schema/focus.php
@@ -46,7 +46,7 @@ if (! $radius)
 if (! $shadow)
 	$shadow = "0";
 if (! $converse_width)
-	$converse_width = "656";
+	$converse_width = "790";
 if(! $top_photo)
 	$top_photo = '48px';
 if(! $comment_indent)
@@ -61,5 +61,3 @@ else {
 	$nav_float_min_opacity = (float) $nav_min_opacity;
 	$nav_percent_min_opacity = (int) 100 * $nav_min_opacity;
 }
-
-$converse_center = "1";