1 files changed, 115 insertions, 59 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 92ec48b77..df95e48b8 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -98,6 +98,7 @@ pre code {
 
 code {
 	font-family: Courier, monospace;
+	font-size: 1em;
 	display: block;
 	overflow: auto;
 	border: 1px solid $code_borderc;
@@ -176,6 +177,8 @@ nav #banner #logo-text a {
 }
 nav #banner #logo-text a:hover { text-decoration: none; }
 
+.nav-channel-select { margin-left: 8px; }
+
 header #banner {
 /*  overflow: hidden; */
   text-align: center;
@@ -363,18 +366,44 @@ aside li {
 	font-weight: bold;
 }
 
+#profile-edit-wrapper .field label {
+	margin-top: 20px;
+	width: 175px;
+}
 
-#profile-vcard-break {
-	clear: both;
+#profile-edit-wrapper .field input[type="text"] {
+	margin-top: 20px;
+	width: 220px;
 }
 
 
-#profile-edit-links ul {
-	list-style-type: none;
+#profile-edit-links {
+	max-width: $converse_width;
+	padding-top: 15px;
+	padding-bottom: 15px;
 }
 
-#profile-edit-links li {
-	margin-top: 10px;
+#profile-edit-links .btn {
+	margin: 0 10px 15px 0;
+}
+
+.profile-import {
+	vertical-align: top;
+	text-align: left;
+}
+
+.profile-import b {
+	color: $link_colour;
+}
+
+.profile-import input {
+	color: $font_colour;
+	border: none;
+}
+
+#profile-edit-drop-link {
+	color: #FFF;
+	font-weight: normal;
 }
 
 #profile-like {
@@ -387,36 +416,29 @@ aside li {
 
 
 .fn {
-	padding: 0px 0px 5px 0px;
-	font-size: 120%;
 	font-weight: bold;
+	font-size: 16px;
 	color: #444444;
 }
 
 .vcard {
-	padding: 8px;
+	margin-bottom: 10px;
+	padding: 10px;
+	background-color: $comment_item_colour;
+	border-bottom: 1px solid $widget_brdrcolour;
+	-moz-border-radius: $radiuspx;
+	-webkit-border-radius: $radiuspx;
+	border-radius: $radiuspx;
 }
 
 .vcard .title {
-	margin-bottom: 5px;
-}
+	margin-bottom: 10px;
 
-.vcard dl {
-	clear: both;
-	word-wrap:break-word;
 }
 
-.vcard-profile-edit-icon {
-	font-size: 1.2em;
-}
-.vcard-profile-edit-icon:hover {
-	text-decoration: none;
-}
-
-.vcard .dropdown-menu {
-	position: absolute;
-	left: 200px;
-	top: 18px;
+.vcard dl  {
+	margin-top: 10px;
+	margin-bottom: 0px;
 }
 
 #profile-extra-links {
@@ -431,21 +453,23 @@ aside li {
 
 
 #profile-extra-links li {
-	margin-top: 5px;
+	margin-top: 10px;
 }
 
 
 .profile-edit-side-link {
-	opacity: 0.3;
+	padding: 3px 0px;
+	opacity: 0;
 	filter:alpha(opacity=30);
 	float: right;
-	margin-top: -3px;
 }
-.profile-edit-side-link:hover {
-	opacity: 1.0;
+
+.vcard:hover .profile-edit-side-link {
+	opacity: 1;
 	filter:alpha(opacity=100);
 }
 
+
 .view-contact-wrapper {
 	margin-top: 20px;
 	float: left;
@@ -471,9 +495,9 @@ aside li {
 
 
 #profile-photo-wrapper img {
-	padding: 12px;
-	width: 201px;
-	height: 201px;
+	padding: 10px;
+	width: 197px;
+	height: 197px;
 }
 
 #profile-in-dir-yes-label,
@@ -636,11 +660,33 @@ aside li {
 }
 
 .photo-top-photo, .photo-album-photo {
-    padding: 10px;
+ /*   padding: 10px;
     max-width: 300px;
     border: 1px solid #888888;
+*/
+  position: absolute;
+  display: block;
+/*  max-width: 100%;
+  max-height: 100%; */
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  margin: auto;
+}
+
+.photo-top-image-wrapper, .photo-album-image-wrapper {
+	width: 240px;
 }
 
+.photo-top-photo-link, .photo-album-photo-link {
+  display: block;
+  width: 100%;
+  position: relative;
+  height: 0;
+  padding: 75% 0 0 0;
+  overflow: hidden;
+}
 
 .photo-album-image-wrapper .caption {
  	background-color: $acpopup_bgcolour;
@@ -754,19 +800,26 @@ aside li {
 }
 
 #contact-block {
-	margin-top: 25px;
-	padding: 8px;
+	width: 100%;
+	float: left;
+	background-color: $comment_item_colour;
+	border-bottom: 1px solid $widget_brdrcolour;
+	-moz-border-radius: $radiuspx;
+	-webkit-border-radius: $radiuspx;
+	border-radius: $radiuspx;
+	padding: 10px;
+	margin-bottom:10px;
 }
 
 #contact-block-numcontacts {
 	font-weight: bold;
-	margin-bottom:8px;
+	margin-bottom:10px;
 }
 
 .contact-block-div {
 	float: left;
-	width: 50px;
-	height: 50px;
+	width: 49px;
+	height: 49px;
 }
 .contact-block-textdiv {
 	float: left;
@@ -781,8 +834,8 @@ aside li {
 	float: left;
 }
 .contact-block-img {
-	width:48px;
-	height:48px;
+	width:47px;
+	height:47px;
 }
 
 #tag-remove {
@@ -863,19 +916,6 @@ aside li {
 	font-family: FontAwesome;
 }
 
-.location-label, .gender-label, .marital-label, .homepage-label {
-	float: left;
-	display: block;
-	width: 70px;
-
-}
-
-.adr, .x-gender, .marital-text, .homepage-url {
-	float: left;
-	display: block;
-	width: 130px;
-}
-
 .profile-clear {
 	clear: both;
 }
@@ -1699,7 +1739,7 @@ header {
 }
 
 .contact-block-content {
-	margin-top: 8px;
+	margin-top: 10px;
 }
 .contact-block-img.archived {
 	opacity: 0.3;
@@ -2067,7 +2107,7 @@ img.mail-list-sender-photo {
 
 .comment-edit-text-empty {
 	color: gray;
-	font-size: 11px;
+	font-size: 12px;
 }
 
 .comment-edit-text-full {
@@ -2095,6 +2135,7 @@ img.mail-list-sender-photo {
 /* widgets */
 
 .widget {
+	background-color: $comment_item_colour;
 	border-bottom: 1px solid $widget_brdrcolour;
 	-moz-border-radius: $radiuspx;
 	-webkit-border-radius: $radiuspx;
@@ -2143,6 +2184,10 @@ img.mail-list-sender-photo {
 	background-color: $abookself_bgcolour;
 }
 
+.abook-pending-contact, .abook-permschange {
+	background: $abook_changebg;
+}
+
 .online-now {
 	color: red;
 	cursor: pointer;
@@ -2220,7 +2265,19 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 
 /* bootstrap overrides */
 blockquote {
-	font-size: $body_font_size;
+	font-size: 1em;
+}
+
+h1, h2 {
+	font-size: 1.15rem;
+}
+
+h3, h4 {
+		font-size: $font_size;
+}
+
+h5, h6 {
+		font-size: $body_font_size;	
 }
 
 .dropdown-menu {
@@ -2357,7 +2414,7 @@ blockquote {
 }
 
 .btn-xs {
-	font-size: 12px;
+	font-size: 0.75rem;
 }
 
 .btn-default {
@@ -2385,7 +2442,6 @@ blockquote {
 	background-image: linear-gradient(to bottom, $advperm_gradientcol 0px, $advperm_bgcolour 100%);
 }
 
-
 @media screen and (max-width: 767px) {
 	aside#region_1 {
 		background: rgba(0, 0, 0, .1);