13 files changed, 139 insertions, 580 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 29164c7ad..777bf69eb 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -37,7 +37,7 @@ nav .navbar-header img {
 
 nav .dropdown-menu {
 	max-height: 450px;
-	max-width: 300px;
+	width: 270px;
 	overflow-y: auto;
 	margin-top: 0px;
 }
diff --git a/view/css/conversation.css b/view/css/conversation.css
index d49359f46..39c973c14 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -19,20 +19,30 @@ code {
 	display:none;
 }
 
+#jot-title-wrap,
+#jot-pagetitle-wrap,
+#jot-category-wrap {
+	border-bottom: 1px solid #ccc;
+}
+
+#jot-attachment-wrap {
+	border-top: 1px solid #ccc;
+}
+
 #jot-title-wrap input,
 #jot-pagetitle-wrap input {
-	padding: 8px;
-	margin-bottom: 5px;
+	padding: 10px;
 }
 
 .profile-jot-text {
 	height: 39px;
-	padding: 8px;
+	padding: 10px;
 	width: 100%;
 }
 
 .jot-attachment {
-	padding: 8px;
+	border: 0px;
+	padding: 10px;
 	width: 100%;
 }
 
@@ -42,14 +52,19 @@ code {
 }
 
 #profile-jot-submit-wrapper {
-	margin-top: 10px;
+	border-top: 1px solid #ccc;
+	padding: 10px;
 }
 
 #profile-jot-perms-end {
 	height: 30px;
 }
 
-#profile-jot-end {
+#profile-jot-form {
+	line-height: initial;
+}
+
+#profile-jot-wrapper {
 	margin-bottom: 30px;
 }
 
@@ -194,6 +209,7 @@ a.wall-item-name-link {
 	padding: 8px;
 	height: 150px;
 	overflow: auto;
+	resize: vertical;
 }
 
 .qcomment {
diff --git a/view/css/default.css b/view/css/default.css
index bffecbb81..db0628cb3 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -17,24 +17,12 @@ main {
 aside {
 	display: table-cell;
 	vertical-align: top;
-	padding: 80px 7px 0px 7px;
+	padding: 71px 7px 0px 7px;
 }
 
 section {
 	width: 100%;
 	display: table-cell;
 	vertical-align: top;
-	padding: 80px 7px 200px 7px;
-}
-
-@media screen and (max-width: 767px) {
-
-	section {
-		padding: 65px 7px 200px 7px;
-	}
-
-	aside#region_1 {
-		padding: 65px 7px 0px 7px;
-	}
-
+	padding: 71px 7px 200px 7px;
 }
diff --git a/view/css/mod_cloud.css b/view/css/mod_cloud.css
index 76ac82690..ed07ceb6f 100644
--- a/view/css/mod_cloud.css
+++ b/view/css/mod_cloud.css
@@ -38,6 +38,6 @@
 }
 
 #files-upload {
-	padding: 4px;
+	padding: 7px 10px;
 	width: 100%;
 }
diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css
index d5c9b3d4f..a33430e48 100644
--- a/view/css/mod_connections.css
+++ b/view/css/mod_connections.css
@@ -1,151 +1,35 @@
-.search-input {
-	padding: 4px 12px;
-	margin: 3px;
+#contacts-search-form {
+	display: none;
 }
 
-.field_abook_help {
-	color: #000;
-}
-.abook-them {
-	margin-left: 375px;
-	margin-bottom: 15px;
-}
-.abook-me {
-	margin-left: 36px;
-	margin-bottom: 15px;
-}
-.acheckbox {
-	margin-bottom: 5px !important;
-}
-
-.abook-pending-contact {
-	background: orange;
-	font-weight: bold;
-	margin: 10px;
-	padding: 20px 5px 10px;
+.section-subtitle-wrapper .btn-xs {
+	margin-top: -2px;
 }
 
-#contact-slider {
-	width: 600px !important;
+.contact-search {
+	height: 22px;
+	border-top-right-radius: 0px;
+	border-bottom-right-radius: 0px;
 }
 
-.abook-edit-them, .abook-edit-me {
-	float: left;
-	width: 100px !important;
-}
-.field_abook_help {
-	float: left;
+.directory-photo-img.archived {
+	opacity: 0.3;
+	filter:alpha(opacity=30);
 }
 
-#contacts-main {
-	margin-top: 20px;
-	margin-bottom: 20px;
+.contact-photo-wrapper {
+	display: table-cell;
+	table-layout: fixed;
+	vertical-align: top;
 }
 
-
-
-#contact-edit-wrapper {
-	margin-top: 10px;
+.contact-info {
+	display: table-cell;
+	table-layout: fixed;
+	vertical-align: top;
+	padding-left: 10px;
 }
 
-#contact-edit-banner-name {
-	font-size: 1.4em;
+.contact-info-label {
 	font-weight: bold;
 }
-
-#contact-edit-poll-wrapper {
-	margin-top: 15px;
-}
-
-#contact-edit-poll-text {
-	margin-top: 15px;
-	margin-bottom: 5px;
-}
-
-#contact-edit-update-now {
-	margin-top: 15px;
-}
-
-#contact-edit-links{
-	clear: both;
-}
-
-#contact-edit-links ul {
-	list-style: none;
-	list-style-type: none;
-	margin-left: 0px;
-	padding-left: 0px;
-}
-
-#contact-edit-links li {
-	margin-top: 5px;
-}
-
-#contact-edit-drop-link {
-	float: right;
-	margin-right: 20px;
-}
-
-#contact-edit-nav-end {
-	clear: both;
-}
-
-#contact-edit-wrapper {
-	width: 100%;
-}
-
-#contact-edit-end {
-	clear: both;
-	margin-top: 15px;
-}
-
-#contact-profile-selector {
-	width: 175px;
-	margin-left: 175px;
-}
-
-.contact-edit-submit {
-	margin-top: 20px;
-}
-
-.contact-entry-wrapper {
-	float: left;
-	width: auto;
-	height: auto;
-	padding: 10px;
-	margin: 8px 10px 0 0;
-	border-top: 1px solid #eee;
-	border-left: 2px solid #eee;
-}
-
-#contacts-search {
-	font-size: 1em;
-	width: 300px;
-}
-
-#contacts-search-end {
-	margin-bottom: 10px;
-}
-
-.contact-entry-photo-end {
-	clear: both;
-}
-
-.contact-entry-name {
-	float: left;
-	margin-left: 0px;
-	margin-right: 10px;
-	margin-bottom: 10px;
-	width: 147px;
-	height: auto;
-	overflow: hidden;
-	white-space: nowrap;
-}
-
-.contact-entry-name-end {
-	clear:both;
-}
-
-.contact-entry-end {
-	clear: both;
-}
diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css
index 843d1274c..c1874edac 100644
--- a/view/css/mod_mail.css
+++ b/view/css/mod_mail.css
@@ -26,7 +26,7 @@
 }
 
 #prvmail-text {
-  height: 20.0em;
+	height: 15.0em;
 }
 
 .mail-conv-outside-wrapper {
diff --git a/view/css/mod_manage.css b/view/css/mod_manage.css
index fbe4a672a..077b6b838 100644
--- a/view/css/mod_manage.css
+++ b/view/css/mod_manage.css
@@ -1,57 +1,34 @@
-#channels-selected {
-	color: #666666;
-	font-size: 0.8em;
+.make-default-link,
+.make-default-link:hover {
+	color: inherit;
+	text-decoration: none;
 }
 
-#channels-desc {
-	color: #666666;
-	font-size: 1.2em;
-	margin-top: 15px;
-	margin-bottom: 20px;
-}
-
-.channels-break {
-	margin-bottom: 15px;
-}
-
-.channel-selection-default {
-	font-size: 0.8em;
-	margin-bottom: 10px;
+.new-notification {
+	color: #c60032;
 }
 
-.channel-selection {
-	width: 12em;
-	height: 16em;
-	float: left;
-	text-align: center;
+.channel-photo-wrapper {
+	display: table-cell;
+	table-layout: fixed;
+	vertical-align: top;
 }
 
-.channel-selection img {
-	display: block;
-	margin-left: auto;
-	margin-right: auto;
+.channel-photo-wrapper img {
+	border-radius: 4px;
 }
 
-.channel-selection-name-link {
-	font-size: 1.2em;
-	margin-top: 10px;
+.channel-notifications-wrapper {
+	display: table-cell;
+	table-layout: fixed;
+	vertical-align: top;
+	padding-left: 10px;
 }
 
-.channel-selection-name-link .channel-name {
-	padding-top: 10px;
-	word-wrap: break-word;
-	overflow: hidden;
+.selected-channel {
+	color: green;
 }
 
-.channels-notifications-wrapper {
-	clear: both;
-	padding-top: 10px;
-}
-
-.selected-channel img {
-	border: 2px solid #ff0000;
+#all-channels-end {
+	margin-bottom: 20px;
 }
-
-.channels-end {
-	clear: both;
-}
\ No newline at end of file
diff --git a/view/css/mod_new_channel.css b/view/css/mod_new_channel.css
index 397601635..fcdb3e84e 100644
--- a/view/css/mod_new_channel.css
+++ b/view/css/mod_new_channel.css
@@ -1,172 +1,3 @@
-
-h2 {
-	margin-left: 15%;
-	margin-top: 5%; 
+.descriptive-paragraph {
+	margin-top: 10px;
 }
-
-#newchannel-form {
-	font-size: 1.4em;	
-	margin-left: 15%;
-	margin-top: 20px;
-	width: 50%;
-}
-
-#newchannel-form .descriptive-paragraph {
-	color: #888;
-	margin-left: 20px;
-	margin-bottom: 25px;
-}
-
-.newchannel-label {
-	float: left;
-	width: 275px;
-}
-
-.newchannel-role-morehelp {
-	float: left;
-	width: 32px;
-}
-.newchannel-input {
-	float: left;
-	width: 275px;
-	padding: 5px;
-}
-
-.newchannel-feedback {
-	float: left;
-	margin-left: 5px;
-}
-
-.newchannel-field-end {
-	clear: both;
-	margin-bottom: 20px;
-}
-
-/**
-* Stylish Select 0.4.9 - $ plugin to replace a select drop down box with a stylable unordered list
-* http://github.com/scottdarby/Stylish-Select/
-* 
-* Copyright (c) 2009 Scott Darby
-* 
-* Requires: jQuery 1.3 or newer
-* 
-* Dual licensed under the MIT and GPL licenses.
-*/
-
-/**
-* Hide lists on page load
----------------------------------------------------------*/
-
-.stylish-select .SSContainerDivWrapper {
-	left:-9999px;
-}
-
-/*
-* Red example
----------------------------------------------------------*/
-.stylish-select .SSContainerDivWrapper {
-	margin:0;
-	padding:0;
-	width:290px;
-	position:absolute;
-	top:22px;
-	left:0;
-	z-index:9999;
-	font-size: 60%;
-	line-height: 1.1;
-}
-
-.stylish-select a {
-	font-weight: normal !important;
-}
-
-.stylish-select ul.newList {
-	margin:0;
-	padding:0;
-	list-style:none;
-	color:#000;
-	background:#fff;
-	border:1px solid #ccc;
-	overflow:auto;
-}
-
-.stylish-select ul.newList * {
-	margin:0;
-	padding:0;
-}
-
-
-.stylish-select ul.newList a {
-	color: #000;
-	text-decoration:none;
-	display:block;
-	padding:3px 8px;
-}
-
-.stylish-select .newListSelected {
-	width:285px;
-	color:#000;
-	height:19px;
-	padding:3px 0 0 6px;
-	float:left;
-	background:url(select-bg.png) no-repeat;
-}
-
-.stylish-select ul.newList li a:focus {
-	-moz-outline-style: none;
-}
-
-.stylish-select .selectedTxt {
-	width:258px;
-	overflow:hidden;
-	height:18px;
-	font-size: 90%;
-	padding:0 23px 0 0;
-}
-
-.stylish-select .hiLite {
-	background:#650101!important;
-	color:#fff!important;
-}
-
-.stylish-select .newListHover {
-	background:#ccc!important;
-	color:#000!important;
-	cursor:default;
-}
-
-.stylish-select .newListDisabled {
-	opacity: 0.6;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
-	filter: alpha(opacity=60);
-}
-
-.stylish-select .newListItemDisabled {
-	opacity: 0.6;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
-	filter: alpha(opacity=60);
-}
-
-.stylish-select .newListOptionDisabled {
-	opacity: 0.6;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
-	filter: alpha(opacity=60);
-}
-
-.stylish-select .newListSelHover,
-.stylish-select .newListSelFocus {
-	background-position:0 -22px;
-	cursor:default;
-}
-
-.stylish-select .newListOptionTitle {
-	font-weight:bold;
-}
-
-.stylish-select .newListOptionTitle ul {
-	margin:3px 0 0;
-}
-
-.stylish-select .newListOptionTitle li {
-	font-weight:normal;
-}
\ No newline at end of file
diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css
index ae250bc1c..72dd7ffe7 100644
--- a/view/css/mod_photos.css
+++ b/view/css/mod_photos.css
@@ -25,7 +25,7 @@
 }
 
 #photos-upload-choose {
-	padding: 4px;
+	padding: 7px 10px;
 	width: 100%;
 }
 
diff --git a/view/css/mod_profiles.css b/view/css/mod_profiles.css
index 35ef73cec..4d83e6419 100644
--- a/view/css/mod_profiles.css
+++ b/view/css/mod_profiles.css
@@ -1,150 +1,31 @@
-#profile-edit-default-desc {
-    background: none repeat scroll 0 0 orange;
-    font-weight: bold;
-    margin: 10px;
-    padding: 20px 5px 10px;
+#profile-upload-form {
+	display: none;
 }
 
-#profile-edit-clone-link-wrapper {
-	float: left;
-	margin-left: 50px;
-	margin-bottom: 20px;
-	width: 300px;
+#profile-upload-choose {
+    padding: 7px 10px;
+    width: 100%;
 }
 
-
-#profile-listing-desc, #profile-stuff-link, #profile-listing-new-link-wrapper {
-	margin: 15px 10px 15px 0;
-}
-
-#profile-edit-links-end {
-	clear: both;
-	margin-bottom: 15px;
+.profile-listing-table {
+	display: table;
+	width: 100%;
 }
 
-.profile-listing-photo {
-	border: none;
-}
-
-.profile-edit-submit-wrapper {
-	margin-top: 20px;
-	margin-bottom: 20px;
-}
-
-#profile-photo-link-select-wrapper {
-	margin-top: 2em;
-}
-
-#profile-photo-submit-wrapper {
-	margin-top: 10px;
-}
-
-#profile-edit-with-label, #profile-edit-howlong-label {
-
-	width: 175px;
-	margin-left: 50px;
-	margin-bottom: 20px;
+.profile-listing-row {
+	display: table-row;
 }
 
-#profile-edit-profile-name-label,
-#profile-edit-name-label,
-#profile-edit-pdesc-label,
-#profile-edit-gender-label,
-#profile-edit-dob-label,
-#profile-edit-address-label,
-#profile-edit-locality-label,
-#profile-edit-region-label,
-#profile-edit-postal-code-label,
-#profile-edit-country-name-label,
-#profile-edit-marital-label,
-#profile-edit-sexual-label,
-#profile-edit-politic-label,
-#profile-edit-religion-label,
-#profile-edit-pubkeywords-label,
-#profile-edit-prvkeywords-label,
-#profile-edit-homepage-label,
-#profile-edit-hometown-label {
-	float: left;
-	width: 175px;
+.profile-listing-cell {
+	display: table-cell;
 }
 
-#profile-edit-profile-name,
-#profile-edit-name,
-#profile-edit-pdesc,
-#gender-select,
-#profile-edit-dob,
-#profile-edit-address,
-#profile-edit-locality,
-#profile-edit-region,
-#profile-edit-postal-code,
-#profile-edit-country-name,
-#marital-select,
-#sexual-select,
-#profile-edit-politic,
-#profile-edit-religion,
-#profile-edit-pubkeywords,
-#profile-edit-prvkeywords,
-#profile-in-dir-yes,
-#profile-in-dir-no,
-#profile-in-netdir-yes,
-#profile-in-netdir-no,
-#hide-wall-yes,
-#hide-wall-no,
-#hide-friends-yes,
-#hide-friends-no {
-	float: left;
-	margin-bottom: 20px;
+.profile-listing-edit-link {
+	margin: 10px;
 }
 
-
-#profile-edit-pdesc-desc,
-#profile-edit-pubkeywords-desc,
-#profile-edit-prvkeywords-desc {
-	float: left;
-	margin-left: 20px;
-}
-
-
-#profile-edit-homepage, #profile-edit-hometown {
-	float: left;
-	margin-bottom: 35px;
-}
-
-#profile-edit-profile-name-end,
-#profile-edit-name-end,
-#profile-edit-pdesc-end,
-#profile-edit-gender-end,
-#profile-edit-dob-end,
-#profile-edit-address-end,
-#profile-edit-locality-end,
-#profile-edit-region-end,
-#profile-edit-postal-code-end,
-#profile-edit-country-name-end,
-#profile-edit-marital-end,
-#profile-edit-sexual-end,
-#profile-edit-politic-end,
-#profile-edit-religion-end,
-#profile-edit-pubkeywords-end,
-#profile-edit-prvkeywords-end,
-#profile-edit-homepage-end,
-#profile-edit-hometown-end,
-#profile-in-dir-break,
-#profile-in-dir-end,
-#profile-in-netdir-break,
-#profile-in-netdir-end,
-#hide-wall-break,
-#hide-wall-end,
-#hide-friends-break,
-#hide-friends-end {
-	clear: both;
-}
-
-
-#gender-select, #marital-select, #sexual-select {
-	width: 220px;
-}
-
-#profile-edit-profile-name-wrapper .required {
-	color: #FF0000;
-	float: left;
+.profile-listing-photo {
+	width: 48px;
+	height: 48px;
+	margin: 10px 0px;
 }
diff --git a/view/css/mod_register.css b/view/css/mod_register.css
deleted file mode 100644
index 618b7ce95..000000000
--- a/view/css/mod_register.css
+++ /dev/null
@@ -1,44 +0,0 @@
-
-h2 {
-	margin: 20px 0 20px 5%;
-}
-
-.generic-content-wrapper-styled {
-	margin-left: auto;
-	margin-right: auto;
-	max-width: 820px;
-	font-size: 1.1em;
-}
-
-
-#register-desc, #register-invite-desc, #register-text, #register-sites {
-	font-weight: bold;
-	margin-bottom: 15px;
-	padding: 8px;
-	border: 1px solid #ccc;
-}
-
-@media (min-width: 560px) {
-.register-label, .register-input {
-	float: left;
-	width: 50%;
-}
-}
-
-@media (max-width: 559px) {
-.register-label, .register-input {
-	float: left;
-	max-width: 400px;
-}
-}
-
-.register-feedback {
-	float: left;
-	margin-left: 45px;
-}
-
-.register-field-end {
-	clear: both;
-	margin-bottom: 20px;
-}
-
diff --git a/view/css/redable.css b/view/css/redable.css
index b8e31eab0..d72051279 100644
--- a/view/css/redable.css
+++ b/view/css/redable.css
@@ -1,9 +1,5 @@
-header #banner {
-	position: fixed;
-	top: 0;
-	width: 250px;
-	margin-left: auto;
-	margin-right: auto;
+nav, header, .pageheader {
+	display: none;
 }
 
 main {
@@ -17,13 +13,23 @@ main {
 @media screen and (max-width: 801px) {
 	main {
 		left: -14rem !important;
-    		right: -14rem !important;    
-    		width: calc(100% + 14rem + 14rem) !important;
+    	right: -14rem !important;    
+    	width: calc(100% + 14rem) !important;
+}
+
+@media screen and (min-width: 802px) {
+section#region_2 * {
+	font-size: 1.05rem;
+}
 }
 
 #profile-photo-wrapper {
 	display:none;
 }
+
+section#region_2 * {
+	font-size: 1.15rem;
+}
 }
 
 aside#region_1 {
@@ -32,7 +38,7 @@ aside#region_1 {
 	max-width: 14rem;
 	display: table-cell;
 	vertical-align: top;
-	padding: 65px 7px 0px 7px;
+	padding: 7px 7px 0px 7px;
 	}
 	
 aside#region_1 * {
@@ -48,7 +54,7 @@ section#region_2wrap {
 	width: 100%;
 	display: table-cell;
 	vertical-align: top;
-	padding: 65px 10px 200px 10px;
+	padding: 17px 10px 200px 10px;
 }
 
 section#region_2 {
@@ -60,10 +66,13 @@ section#region_2 {
 
 section#region_2 * {
 	text-align: justify;
-	font-size: 1.15rem;
 	line-height: 1.55;
 }
 
+ul.nojustify li, .nojustify {
+	text-align: initial;
+}
+
 section#region_2 p + p {
 	margin-top: 1.5em; 
 }
@@ -74,7 +83,7 @@ aside#region_3 {
 	max-width: 14rem;
 	display: table-cell;
 	vertical-align: top;
-	padding: 65px 7px 0px 7px;
+	padding: 7px 7px 0px 7px;
 }
 
 aside#region_3 * {
diff --git a/view/css/widgets.css b/view/css/widgets.css
index f1c1436c7..38809896c 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -23,17 +23,6 @@
 	margin-top: 10px;
 }
 
-/* follow */
-
-#side-follow-url {
-	margin-top: 5px;
-	width: 100%;
-}
-
-#side-follow-submit {
-	margin-top: 15px;
-}
-
 /* notes */ 
 
 #note-text {
@@ -133,3 +122,31 @@ li:hover .group-edit-icon {
 #event-upload-choose {
 	width: 100%;
 }
+
+/* cover photo */
+
+#cover-photo {
+	position: relative;
+	width: 100%;
+	height: auto;
+	cursor: pointer;
+}
+
+#cover-photo-caption {
+	position: absolute;
+	bottom: 0px;
+	left: 0px;
+	width: 100%;
+	padding: 15px;
+	color: #fff;
+	font-weight: bold;
+	text-shadow: 1px 1px 3px rgba(0,0,0,.7);
+}
+
+.cover-photo-title {
+	font-size: 30px;
+}
+
+.cover-photo-subtitle {
+	font-size: 20px;
+}