Merging in conflict

6 files changed, 22 insertions, 21 deletions

diff --git a/view/css/conversation.css b/view/css/conversation.css
index 6fbc86df6..ae4e48315 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -82,7 +82,7 @@
 .wall-item-info {
 	display: block;
 	float: left;
-	margin-right: 20px;
+	margin-right: 10px;
 }
 
 .wallwall .wwto {
@@ -272,7 +272,7 @@
 }
 
 .comment-edit-photo {
-	margin: 10px 20px 10px 10px;
+	margin: 10px;
 	float: left;
 }
 
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index edee90fe6..f1bfbd711 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -285,13 +285,16 @@ footer {
 
 #login-extra-links {
 	clear: both;
+	width: 300px;
 }
 
-#register-link,
-#lost-password-link {
+#register-link {
 	float: left;
 	margin-left: 100px;
 }
+#lost-password-link {
+	float: right;
+}
 
 #login-standard-end {
 	clear: both;
@@ -694,18 +697,18 @@ footer {
 
 .rconnect {
 	display: block;
-	color: #FFFFFF;
+	color: $nav_active_icon_colour;
 	margin-top: 15px;
 	background-color: $nav_bg;
 	-webkit-border-radius: $radiuspx ;
 	-moz-border-radius: $radiuspx;
 	border-radius: $radiuspx;
+	border: 1px solid $nav_bd;
 	padding: 5px;
 	font-weight: bold;
 	clear: both;
 }
 
-
 #pause {
   position: fixed;
   bottom: 5px;
@@ -828,15 +831,17 @@ footer {
 
 .location-label, .gender-label, .marital-label, .homepage-label {
 	float: left;
-	text-align: right;
 	display: block;
-	width: 65px;
+	width: 70px;
+
 }
 
 .adr, .x-gender, .marital-text, .homepage-url {
 	float: left;
 	display: block;
-	margin-left: 8px;
+	width: 130px;
+	height: 18px;
+	overflow: hidden;
 }
 
 .profile-clear {
@@ -1496,7 +1501,7 @@ div.jGrowl div.jGrowl-notification {
 }
 
 a.rconnect {
-  color: #ffffff;
+  color: $nav_active_icon_colour;
   text-decoration: none;
   outline: none;
 }
@@ -2234,18 +2239,10 @@ blockquote {
 		margin-left: 24px;
 	}
 
-	.wall-item-info {
-		margin-right: 10px;
-	}
-
 	.hide-comments-outer {
 		margin-left: 24px;
 	}
 
-	.comment-edit-photo {
-		margin: 10px;
-	}
-
 	.wall-item-photo {
 		width: 48px !important;
 		height: 48px !important;
diff --git a/view/theme/redbasic/schema/BS-Default.php b/view/theme/redbasic/schema/BS-Default.php
index f93e879e3..ce464fe2c 100644
--- a/view/theme/redbasic/schema/BS-Default.php
+++ b/view/theme/redbasic/schema/BS-Default.php
@@ -18,3 +18,5 @@
 		$nav_active_icon_colour = "#555";
 	if (! $radius)
 		$radius = "4";
+	if (! $banner_colour)
+		$banner_colour = "#777";
diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index e40504c8f..7a3d42e01 100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -9,7 +9,7 @@
 
 <div class="contact-name" id="directory-name-{{$entry.id}}"  ><span onclick="dirdetails('{{$entry.hash}}');" class="fakelink" >{{$entry.name}}</span></div>
 {{if $entry.connect}}
-<div class="directory-connect"><a href="{{$entry.connect}}">{{$entry.conn_label}}</a></div>
+<div class="directory-connect btn btn-default"><a href="{{$entry.connect}}">{{$entry.conn_label}}</a></div>
 {{/if}}
 <div class="contact-details">{{$entry.details}}</div>
 </div>
diff --git a/view/tpl/direntry_large.tpl b/view/tpl/direntry_large.tpl
index f00448175..487839f7a 100755
--- a/view/tpl/direntry_large.tpl
+++ b/view/tpl/direntry_large.tpl
@@ -15,7 +15,7 @@
 
 <div class="contact-name" id="directory-name-{{$id}}"  >{{$name}}{{if $online}} <i class="icon-asterisk online-now" title="{{$online}}"></i>{{/if}}</div>
 {{if $connect}}
-<div class="directory-connect"><a href="{{$connect}}">{{$conn_label}}</a></div>
+<div class="directory-connect btn btn-default"><a href="{{$connect}}">{{$conn_label}}</a></div>
 {{/if}}
 
 <div class="contact-webbie">{{$address}}</div>
diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl
index 3ca118590..a1952d408 100755
--- a/view/tpl/login.tpl
+++ b/view/tpl/login.tpl
@@ -11,12 +11,14 @@
         <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
 	</div>
 
+	<div class="clear"></div>
+
 	{{include file="field_checkbox.tpl" field=$remember}}
 	
 	<div id="login-standard-end"></div>
 
 	<div id="login-submit-wrapper" >
-		<input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
+		<input type="submit" name="submit" id="login-submit-button" class="btn btn-default" value="{{$login}}" />
 	</div>
 	
 	{{foreach $hiddens as $k=>$v}}