Merge from upstream

6 files changed, 61 insertions, 44 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 0c004ee05..21d6781f5 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -1,17 +1,5 @@
 /* override some bootstrap settings */
 
-h1, h2 {
-   font-size: 1.583em;
-}
-
-h3, h4 {
-   font-size: 1.334em;
-}
-
-h5, h6 {
-   font-size: 0.75rem;
-}
-
 /* nav overrides */
 
 nav .badge {
@@ -74,8 +62,3 @@ nav .navbar-collapse .navbar-right {
 code {
 	white-space: normal;
 }
-
-
-blockquote {
-	font-size: 1em;
-}
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 80b5de250..7b0d87030 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -111,10 +111,6 @@
    font-size: 1.319em;
 }
 
-.wall-item-title {
-   font-size: $font_size;
-}
-
 .wall-item-title h3, .wall-item-content h3,  .wall-item-content h4 {
    font-size: 1.112em;
 }
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 2cb2d917d..1d43fe983 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -23,6 +23,19 @@ body {
 	margin: 0px;
 	height: 100%;
 }
+
+h1, .h1, h2, .h2 {
+	font-size: 1.667em;
+}
+
+h3, .h3, h4, .h4 {
+	font-size: 1.334em;
+}
+
+h5, .h5, h6, .h6 {
+	font-size: 0.75rem;
+}
+
 .jslider {
 	font-family: arial,freesans,sans-serif;
 }
@@ -60,6 +73,15 @@ a:hover, .fakelink:hover { color: $link_colour; text-decoration: underline; }
 	cursor: pointer;
 }
 
+a.btn-default {
+	color: #333;
+
+}
+
+a.btn-success {
+	color: #fff;
+font-weight: normal;
+}
 
 input[type="text"],
 input[type="password"],
@@ -115,13 +137,7 @@ pre {
 	border:1px solid $pre_borderc;
 }
 
-blockquote {
-	background-color: $blockquote_bgcolour;
-	border-left: 4px solid $blockquote_bordercolour;
-	padding: 0.4em;
-	color: $blockquote_colour;
-	margin-left: 20px;
-}
+
 
 .ccollapse-wrapper {
 	border: 1px solid #CCC;
@@ -1972,6 +1988,10 @@ img.mail-list-sender-photo {
 
 /* conversation */
 
+.wall-item-title {
+   font-size: $font_size;
+}
+
 .hide-comments-outer,
 .thread-wrapper .wall-item-comment-wrapper,
 .wall-item-content-wrapper.comment {
@@ -2248,6 +2268,18 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 }
 
 /* bootstrap overrides */
+
+
+blockquote {
+	font-size: $font_size;
+	font-style: italic;
+	background-color: $blockquote_bgcolour;
+	border-left: 3px solid $blockquote_bordercolour;
+	padding: 0.4em;
+	color: $blockquote_colour;
+	margin: 0px 0px 0px 20px;
+}
+
 .badge {
 	border-radius: $radiuspx;
 }
@@ -2392,16 +2424,16 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 .btn-default {
     	background-color: $editbuttons_bgcolour;
     	border-color: $editbuttons_bordercolour;
-		color: $editbuttons_colour;
+	color: $editbuttons_colour;
     	text-shadow: none;
     	box-shadow: none;
 }
 
 .btn-default:hover, .btn-default:focus, .btn-default:active .btn-default.active {
-    	background-color: $editbuttons_bghover;
-		border-color: $editbuttons_bordercolourhover;
-		color: $input_colourhover;
-		text-decoration: $input_decohover;
+	background-color: $editbuttons_bghover;
+	border-color: $editbuttons_bordercolourhover;
+	color: $input_colourhover;
+	text-decoration: $input_decohover;
 }
 
 .btn-default.btn-sm:hover, .btn-default.btn-sm:focus, .btn-default.btn-sm:active .btn-default.btn-sm.active {
@@ -2428,7 +2460,7 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 	margin-bottom: 10px;
 }
 
-.section-title-wrapper h3 {
+.section-title-wrapper h2 {
 	margin-top: 0px;
 	margin-bottom: 0px;
 }
@@ -2441,6 +2473,7 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 	margin-right: 10px;
 }
 
+
 @media screen and (max-width: 767px) {
 	aside#region_1 {
 		background: rgba(0, 0, 0, .1);
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index d6d77e961..edf77cb0b 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -142,11 +142,11 @@ if(! $a->install) {
 	if (! $widget_brdrcolour)
 		$widget_brdrcolour = "rgba(238,238,238,0.8)";
 	if (! $blockquote_colour)
-		$blockquote_colour = "#000";
+		$blockquote_colour = "#4d4d4d";
 	if (! $blockquote_bgcolour)
-		$blockquote_bgcolour = "#f4f8f9";
+		$blockquote_bgcolour = "";
 	if (! $blockquote_bordercolour)
-		$blockquote_bordercolour = "#dae4ee";
+		$blockquote_bordercolour = "#ccc";
 	if (! $code_borderc)
 		$code_borderc = "#444";
 	if (! $code_bgcolour)
diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index 27f156c68..0f8b809ac 100755
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -1,16 +1,17 @@
 <div id="side-bar-photos-albums" class="widget">
-	<h3><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$title}}</a></h3>
-	{{if $albums}}
+	<h3>{{$title}}</h3>
 	<ul class="nav nav-pills nav-stacked">
+	{{if $upload}}
+		<li><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></li>
+	{{/if}}
+		<li><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >Recent Photos</a></li>
+	{{if $albums}}
 		{{foreach $albums as $al}}
 		{{if $al.text}}
-		<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}<span class="badge pull-right">{{$al.total}}</span></a></li>
+		<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge pull-right">{{$al.total}}</span>{{$al.text}}</a></li>
 		{{/if}}
 		{{/foreach}}
 
 	{{/if}}
-	{{if $upload}}
-		<li><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></li>
-	{{/if}}
 	</ul>
 </div>
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index b4094512c..6b0f555b6 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -1,5 +1,9 @@
 <div class="section-title-wrapper">
-	<h3>{{$title}}</h3>
+	{{if $can_post}}
+	<a class="btn btn-xs btn-success pull-right" href="{{$upload.1}}"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</a>
+	{{/if}}
+	<h2>{{$title}}</h2>
+	<div class="clear"></div>
 </div>
 <div id="photo-album-contents">
 	{{foreach $photos as $photo}}