Merge remote-tracking branch 'upstream/master'

Conflicts:
	mod/page.php

11 files changed, 1358 insertions, 2 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
new file mode 100644
index 000000000..73c06fd4b
--- /dev/null
+++ b/view/css/bootstrap-red.css
@@ -0,0 +1,67 @@
+/* override some bootstrap settings */
+*,
+*:before,
+*:after {
+  -webkit-box-sizing: content-box;
+     -moz-box-sizing: content-box;
+          box-sizing: content-box;
+}
+
+html {
+font-size: 100%;
+}
+
+.panel-body .form-control{
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+} 
+.profile-jot-text{
+  -webkit-box-sizing: content-box;
+     -moz-box-sizing: content-box;
+          box-sizing: content-box;
+} 
+
+
+h1,
+.h1 {
+  font-size: 24px;
+}
+
+h2,
+.h2 {
+  font-size: 18px;
+}
+
+h3,
+.h3 {
+  font-size: 16px;
+}
+
+h4,
+.h4 {
+  font-size: 14px;
+}
+
+h5,
+.h5 {
+  font-size: 12px;
+}
+
+h6,
+.h6 {
+  font-size: 10px;
+}
+textarea {
+line-height: initial;
+}
+
+.radio, .checkbox{
+padding-left: 0px;
+margin-left: 0px;
+}
+
+.checkbox input[type="checkbox"], inline input[type="checkbox"]{
+float:none;
+margin-left:0px;
+}
diff --git a/view/css/conversation.css b/view/css/conversation.css
new file mode 100644
index 000000000..5bf6a3607
--- /dev/null
+++ b/view/css/conversation.css
@@ -0,0 +1,431 @@
+/* jot */
+
+#profile-jot-wrapper {
+	margin-top: 25px;
+}
+
+#jot-title,
+#jot-category,
+#jot-pagetitle {
+	border: 0px;
+	margin: 0px;
+	padding: 8px;
+	height: 1.8em;
+	width: 530px;
+	margin-bottom: 5px;
+}
+
+.jothidden {
+	display:none;
+}
+
+#profile-jot-text {
+	height: 1.8em;
+	padding: 8px;
+	margin-right: 0px;
+	width: 90%;
+}
+
+#profile-jot-text-loading {
+	float: left;
+	margin: 14px 0px 0px 12px;
+}
+
+#profile-jot-submit-wrapper {
+	margin-top: 10px;
+	width: 90%;
+}
+
+#profile-jot-submit {
+	height: 22px;
+	width: 70px;
+	float: right;
+}
+
+#profile-upload-wrapper,
+#wall-image-upload-div,
+#wall-image-upload,
+#wall-file-upload-div,
+#wall-file-upload,
+#profile-link,
+#profile-video,
+#profile-audio,
+#profile-location,
+#profile-nolocation,
+#profile-expires, 
+#profile-expires, 
+#jot-perms-icon,
+.hover, .focus {
+	cursor: pointer;
+}
+
+#profile-upload-wrapper,
+#profile-attach-wrapper,
+#profile-link-wrapper,
+#profile-video-wrapper,
+#profile-audio-wrapper,
+#profile-location-wrapper,
+#profile-nolocation-wrapper,
+#profile-expire-wrapper,
+#profile-encrypt-wrapper {
+	float: left;
+	margin-left: 15px;
+}
+
+#profile-jot-perms {
+	float: right;
+	padding: 6px;
+}
+
+#jot-perms-icon {
+	float: left;
+}
+
+#jot-preview-link {
+	float: left;
+	margin-left: 45px;
+	margin-top: 0px;
+}
+
+#profile-jot-perms-end {
+	height: 30px;
+}
+
+#profile-jot-end {
+	margin-bottom: 30px;
+}
+
+#profile-rotator {
+	float: left;
+	margin: 8px 0px 0px 20px;
+}
+
+/* this is referenced in js/acl.js - not sure if it is still needed. */
+.profile-jot-net {
+	float: left;
+	margin-right: 10px;
+	margin-top: 5px;
+	margin-bottom: 5px;
+}
+
+/* conversation */
+
+.thread-wrapper .toplevel_item {
+	width: 92%;
+}
+
+/* conv_item */
+
+.hide-comments-outer {
+	margin-left: 10px;
+}
+
+.wall-item-content-wrapper {
+	margin-top: 10px;
+	position: relative;
+}
+
+.wall-item-info {
+	display: block;
+	float: left;
+	width:110px;
+	margin-right:10px;
+}
+
+.comment .wall-item-info {
+	width: 70px;
+}
+
+.wallwall .wwto {
+	left: 50px;
+	margin: 0;
+	position: absolute;
+	width: 30px
+}
+
+.wallwall .wwto img {
+	width: 30px !important;
+	height: 30px !important;
+}
+
+.wallwall .wall-item-photo-end {
+	clear: both;
+}
+
+.wall-item-photo-wrapper {
+	margin-top: 0px;
+	margin-left: 10px;
+	margin-bottom: 10px;
+	width: 100px;
+}
+
+.wall-item-photo-menu-button {
+	left:10px;
+	display: block;
+	position: absolute;
+	margin: 0px;
+	padding: 0px;
+	width: 16px;
+	height: 16px;
+	overflow: hidden;
+	text-indent: 40px;
+	display: none;
+}
+
+.wall-item-photo-menu {
+	left:10px;
+	width: auto;
+	position: absolute;
+	display: none;
+	z-index: 10000;
+}
+
+.wall-item-photo-menu ul {
+	margin:0px;
+	padding: 0px;
+}
+
+.wall-item-photo-menu li a {
+	display: block;
+	padding: 2px;
+}
+
+.wall-item-arrowphoto-wrapper {
+	position: absolute;
+	z-index: 99;
+}
+
+.wall-item-wrapper {
+	margin-left:10px;
+}
+
+
+.wall-item-arrowphoto-wrapper {
+	left: 75px;
+}
+
+.wall-item-lock {
+	position: absolute;
+	left: 105px;
+	top: 1px;
+}
+
+.comment .wall-item-lock {
+	left: 65px;
+}
+
+.wall-item-lock {
+
+}
+
+.lockview {
+	cursor: pointer;
+}
+
+.wall-item-location {
+	overflow: hidden;
+	/* add ellipsis on text overflow               */
+	/* this work on safari, opera, ie, chrome.     */
+	/* firefox users have to wait support or we    */
+	/* can use a jquery plugin http://bit.ly/zJskg */
+	text-overflow: ellipsis;
+	-o-text-overflow: ellipsis;
+	width: 100%;
+}
+
+.wall-item-author {
+	margin-top: 10px;
+}
+
+
+.wall-item-ago .icon-ok {
+	cursor: pointer;
+}
+
+.wall-item-content {
+	margin-left: 10px;
+	overflow: auto;
+}
+
+.wall-item-content img {
+    max-width: 95% !important;
+}
+
+.wall-item-title {
+	float: left;
+	font-weight: bold;
+}
+
+.wall-item-title-end {
+	clear: both;
+}
+
+.wall-item-body {
+	margin-top: 10px;
+}
+
+.wall-item-body.divmore {
+        padding-bottom: 15px;
+}
+
+.body-tag, .filesavetags, .categorytags {
+	opacity: 0.5;
+	filter:alpha(opacity=50);
+}
+
+.body-tag:hover, .filesavetags:hover, .categorytags:hover {
+	opacity: 1.0 !important;
+	filter:alpha(opacity=100) !important;
+}
+
+.body-tag {
+	margin-top: 15px;
+}
+
+.wall-item-tools {
+	clear: both;
+	padding: 5px 10px;
+}
+
+.item-tool {
+	float: left;
+	margin-right: 8px;
+	cursor: pointer;
+}
+
+.like-rotator {
+	float: left;
+	margin: 8px;
+	color: $toolicon_colour;
+}
+
+.wall-item-delete-wrapper {
+	float: right;
+}
+
+.wall-item-delete-end {
+	clear: both;
+}
+
+.item-select {
+	opacity: 0.1;
+	filter:alpha(opacity=10);
+	float: right;
+	margin-right: 10px;
+
+}
+
+.item-select:hover,
+.checkeditem {
+	opacity: 1;
+	filter:alpha(opacity=100);
+}
+
+.wall-item-like.comment,
+.wall-item-dislike.comment {
+	margin-left: 50px;
+}
+
+.wall-item-like,
+.wall-item-dislike {
+	margin-top: 5px;
+}
+
+.wall-item-wrapper-end {
+	clear: both;
+}
+
+/* comment_item */
+
+.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-photo {
+	width: 40px;
+}
+
+.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-text-empty {
+	height: 1.5em;
+}
+
+.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-submit-wrapper > .comment-edit-submit {
+	margin-left: 50px;
+}
+
+.comment-edit-photo {
+	margin-top: 10px;
+	margin-left: 10px;
+	margin-bottom: 10px;
+	width: 100px;
+	float: left;
+}
+
+[class^="comment-edit-bb"] {
+	display: none;
+	margin: 0px 0 -5px 0px;
+	padding: 0px;
+	width: 75%;
+}
+
+[class^="comment-edit-bb"] > li {
+	display: inline-block;
+	margin: 10px 10px 0 0;
+	visibility: none;
+}
+
+[class^="comment-edit-bb-end"] {
+	clear: both;
+}
+
+.comment-edit-text-empty, .comment-edit-text-full {
+	float: left;
+	margin-top: 10px;
+	padding: 3px 1px 1px 3px;
+	padding: 8px;
+}
+
+.comment-edit-text-empty {
+	height: 1.0em;
+	width: 270px; 
+	overflow: auto;
+	margin-bottom: 10px;
+}
+
+.comment-edit-text-full {
+	height: 150px;
+	width: 80%;
+	overflow: auto;
+}
+
+.qcomment {
+	border: 1px solid #EEE;
+	padding: 3px;
+	margin-top: 15px;
+	margin-left: 25px;
+	width: 125px;
+	overflow-y: auto;
+}
+
+.qcomment option {
+	width: 125px;
+	overflow-x: hidden;
+}
+
+.qcomment {
+	opacity: 0.3;
+	filter:alpha(opacity=30);
+}
+
+.qcomment:hover {
+	opacity: 1.0;
+	filter:alpha(opacity=100);
+}
+
+.comment-edit-text-end {
+	clear: both;
+}
+
+.comment-edit-submit {
+	margin: 10px 0px 10px 110px;
+}
+
+.comment-preview-icon {
+	margin-left: 15px;
+}
diff --git a/view/css/default.css b/view/css/default.css
index deb39fbe2..27df38dee 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -30,5 +30,3 @@ section {
 	right: 15px;
 	padding-bottom: 350px;
 }
-
-
diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css
new file mode 100644
index 000000000..c460fec28
--- /dev/null
+++ b/view/css/mod_connections.css
@@ -0,0 +1,137 @@
+
+.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;
+}
+
+#contact-slider {
+	width: 600px !important;
+}
+
+.abook-edit-them, .abook-edit-me {
+	float: left;
+	width: 100px !important;
+}
+.field_abook_help {
+	float: left;
+}
+
+#contacts-main {
+	margin-top: 20px;
+	margin-bottom: 20px;
+}
+
+
+
+#contact-edit-wrapper {
+	margin-top: 10px;
+}
+
+#contact-edit-banner-name {
+	font-size: 1.4em;
+	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: 120px;
+	height: 120px;
+	padding: 10px;
+}
+
+#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;
+	width: 120px;
+	overflow: hidden;
+}
+
+.contact-entry-end {
+	clear: both;
+}
diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css
new file mode 100644
index 000000000..c460fec28
--- /dev/null
+++ b/view/css/mod_connedit.css
@@ -0,0 +1,137 @@
+
+.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;
+}
+
+#contact-slider {
+	width: 600px !important;
+}
+
+.abook-edit-them, .abook-edit-me {
+	float: left;
+	width: 100px !important;
+}
+.field_abook_help {
+	float: left;
+}
+
+#contacts-main {
+	margin-top: 20px;
+	margin-bottom: 20px;
+}
+
+
+
+#contact-edit-wrapper {
+	margin-top: 10px;
+}
+
+#contact-edit-banner-name {
+	font-size: 1.4em;
+	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: 120px;
+	height: 120px;
+	padding: 10px;
+}
+
+#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;
+	width: 120px;
+	overflow: hidden;
+}
+
+.contact-entry-end {
+	clear: both;
+}
diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css
new file mode 100644
index 000000000..578777054
--- /dev/null
+++ b/view/css/mod_directory.css
@@ -0,0 +1,39 @@
+
+.directory-end {
+	clear: both;
+}
+.directory-name {
+	text-align: center;
+}
+.directory-photo {
+	margin-left: 25px;
+}
+.directory-details {
+	text-align: center;
+	margin-left: 5px;
+	margin-right: 5px;
+}
+.directory-item {
+	float: left;
+	width: 225px;
+	height: 260px;
+	overflow: hidden;
+	margin: 2px;
+}
+
+#directory-search-wrapper {
+	margin-top: 20px;
+	margin-right: 20px;
+	margin-bottom: 50px;
+}
+
+#directory-search-end {
+}
+
+.directory-photo-img {
+	border: none;
+}
+
+div.dirtagblock.widget {
+  overflow: hidden;
+}
diff --git a/view/css/mod_message.css b/view/css/mod_message.css
new file mode 100644
index 000000000..c278f4d53
--- /dev/null
+++ b/view/css/mod_message.css
@@ -0,0 +1,100 @@
+/* message */
+
+#mail-list-wrapper {
+	border-top: 1px solid #ccc;
+	padding: 5px 5px 5px 5px;
+}
+
+span.mail-list {
+	float: left;
+	width: 20%;
+}
+
+img.mail-list-sender-photo {
+	height: 24px;
+	width: 24px;
+	float: left;
+	margin-right: 30px;
+}
+
+.mail-list-remove {
+	width: 5% !important;
+}
+
+/* message/new */
+
+#prvmail-to-label,
+#prvmail-subject-label,
+#prvmail-expires-label,
+#prvmail-message-label {
+	margin-bottom: 10px;
+	margin-top: 20px;
+}
+
+#prvmail-submit {
+	float: left;
+	margin-top: 10px;
+	margin-right: 30px;
+}
+
+#prvmail-upload-wrapper,
+#prvmail-attach-wrapper,
+#prvmail-link-wrapper,
+#prvmail-expire-wrapper,
+#prvmail-encrypt-wrapper,
+#prvmail-rotator-wrapper {
+	float: left;
+	margin-top: 10px;
+	margin-right: 10px;
+	width: 24px;
+	cursor: pointer;
+}
+
+#prvmail-end {
+	clear: both;
+}
+
+/* message/id */
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+.mail-conv-recall-wrapper {
+	float: right;
+	margin-right: 10px;
+	margin-top: 15px;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-break {
+	clear: both;
+}
diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css
new file mode 100644
index 000000000..58a9bea38
--- /dev/null
+++ b/view/css/mod_photos.css
@@ -0,0 +1,167 @@
+
+
+.photo-top-photo, .photo-album-photo {
+    padding: 10px;
+    max-width: 300px;
+}
+
+
+.photos-end {
+	clear: both;
+	margin-bottom: 25px;
+}
+
+#photo-prev-link, #photo-next-link {
+	padding: 10px;
+	float: left;
+}
+
+#photo-photo {
+	float: left;
+}
+
+#photo-photo-end {
+	clear: both;
+}
+
+.photo-album-image-wrapper {
+	float: left;
+	margin-top: 15px;
+	margin-right: 15px;
+	margin-left: 15px;
+}
+.photo-album-image-wrapper .caption {
+	display: none; 
+ 	width: 100%;
+ 	bottom: 0px; 
+ 	padding: 0.5em 0.5em 0px 0.5em;
+ 	margin: 0px;
+}
+.photo-album-image-wrapper a:hover .caption {
+	display:block;
+}
+
+#photo-album-end {
+	clear: both;
+	margin-bottom: 25px;
+}
+
+.photo-top-image-wrapper {
+	float: left;
+	margin-top: 15px;
+	margin-right: 15px;
+	margin-left: 15px;
+	margin-bottom: 15px;
+}
+.photo-top-album-name {
+ 	width: 100%;
+ 	min-height: 2em;
+ 	bottom: 0px; 
+ 	padding: 0px 3px;
+ 	padding-top: 0.5em;
+}
+#photo-top-end {
+	clear: both;
+}
+
+#photo-top-links {
+	margin-bottom: 30px;
+	margin-left: 30px;
+}
+
+#photos-upload-newalbum-div {
+	float: left;
+	width: 175px;
+}
+
+#photos-upload-noshare {
+	margin-bottom: 10px;
+}
+#photos-upload-existing-album-text {
+	float: left;
+	width: 175px;
+}
+#photos-upload-newalbum {
+	float: left;
+}
+#photos-upload-album-select {
+	float: left;
+}
+
+#photos-upload-spacer {
+	margin-top: 25px;
+}
+#photos-upload-new-end, #photos-upload-exist-end {
+	clear: both;
+}
+#photos-upload-exist-end {
+	margin-bottom: 15px;
+}
+#photos-upload-submit {
+	margin-top: 15px;
+}
+
+
+#photos-upload-select-files-text {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, #photo-edit-rotate-label {
+	float: left;
+	width: 150px;
+}
+
+#photo-edit-perms-end {
+	margin-bottom: 15px;
+}
+
+#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname, #photo-edit-rotate {
+	float: left;
+	margin-bottom: 25px;
+}
+#photo-edit-link-wrap {
+	margin-bottom: 15px;
+}
+#photo-like-div {
+	margin-bottom: 25px;
+}
+
+#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end {
+	clear: both;
+}
+
+#photo-edit-rotate-end {
+	margin-bottom: 15px;
+}
+
+#photo-edit-delete-button {
+	margin-left: 200px;
+}
+#photo-edit-end {
+	margin-bottom: 35px;
+}
+#photo-caption {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+#in-this-photo-text {
+	margin-left: 30px;
+}
+
+#in-this-photo {
+	margin-left: 60px;
+	margin-top: 10px;
+	margin-bottom: 20px;
+}
+
+#photo-album-edit-submit, #photo-album-edit-drop {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+#photo-album-edit-drop {
+	margin-left: 200px;
+}
+
diff --git a/view/css/mod_profiles.css b/view/css/mod_profiles.css
new file mode 100644
index 000000000..6d935ee4d
--- /dev/null
+++ b/view/css/mod_profiles.css
@@ -0,0 +1,146 @@
+#profile-edit-default-desc {
+	color: #FF0000;
+	border: 1px solid #FF8888;
+	background-color: #FFEEEE;
+	padding: 7px;
+}
+
+#profile-edit-clone-link-wrapper {
+	float: left;
+	margin-left: 50px;
+	margin-bottom: 20px;
+	width: 300px;
+}
+
+
+#profile-edit-links-end {
+	clear: both;
+	margin-bottom: 15px;
+}
+
+.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-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-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-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;
+}
diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css
index 0532268f1..601cb2e0e 100644
--- a/view/css/mod_settings.css
+++ b/view/css/mod_settings.css
@@ -13,3 +13,14 @@
 	margin-top: 15px;
 	margin-bottom: 45px;
 }
+
+
+
+#settings-notifications label {
+	margin-left: 20px;
+}
+#settings-notify-desc, #settings-activity-desc {
+	font-weight: bold;
+	margin-bottom: 15px;
+}
+
diff --git a/view/css/widgets.css b/view/css/widgets.css
new file mode 100644
index 000000000..a34508961
--- /dev/null
+++ b/view/css/widgets.css
@@ -0,0 +1,123 @@
+.widget {
+	padding: 8px;
+	margin-top: 5px;
+}
+
+/* suggest */
+
+.suggest-widget-more {
+	margin-top: 10px;
+}
+
+/* follow */
+
+#side-follow-url {
+	margin-top: 5px;
+}
+
+#side-follow-submit {
+	margin-top: 15px;
+}
+
+/* notes */ 
+
+#note-text {
+	width: 190px;
+	max-width: 190px;
+	height: 150px;
+}
+
+#note-save {
+	margin-top: 10px;
+}
+
+/* saved searches */
+
+.saved-search-li {
+	margin-top: 3px;
+}
+
+.saved-search-li i {
+	opacity: 0;
+}
+
+.saved-search-li:hover i {
+	opacity: 1;
+}
+
+.savedsearchterm {
+	margin-left: 10px;
+}
+
+/* fileas */
+
+.fileas-ul li {
+	margin-top: 10px;
+}
+
+.fileas-link {
+	margin-left: 24px;
+}
+
+.fileas-all {
+	margin-left: 0px;
+}
+
+/* posted date */
+
+#datebrowse-sidebar select {
+	width: 190px;
+	max-width: 190px;
+	height: 150px;
+}
+
+/* categories */
+
+.categories-ul li {
+	margin-top: 10px;
+}
+
+.categories-link {
+	margin-left: 24px;
+}
+
+.categories-all {
+	margin-left: 0px;
+}
+
+/* group */
+
+#group-sidebar {
+	margin-bottom: 10px;
+}
+
+#sidebar-group-list .icon, #sidebar-group-list .iconspacer {
+	display: inline-block;
+	height: 12px;
+	width: 12px;
+}
+
+#sidebar-group-list li {
+	margin-top: 3px;
+}
+
+.groupsideedit {
+	margin-right: 10px;
+}
+
+.group-edit-icon {
+	opacity: 0;
+}
+
+/* affinity - slider */
+
+#main-slider {
+	position: relative; 
+	left: 5px; 
+	width: 90%;
+}
+
+.slider {
+	margin-top: 10px;
+	margin-bottom: 45px;
+}