Merge pull request #10 from redmatrix/master

updating from original codebase

2 files changed, 32 insertions, 288 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index d76992b2f..5fcf901fb 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -57,26 +57,11 @@ abbr {
 }
 
 /* icons */
-.tool-icons {
+.tool-icons,
+.cat-icons {
 	color: $toolicon_colour;
 }
 
-.icon {
-  background-color: transparent ;
-  background-repeat: no-repeat;
-  display: block;
-  overflow: hidden;
-  text-indent: -9999px;
-}
-
-.icon.text {
-  text-indent: 0px;
-}
-
-.connect-icon {
-	margin-right: 5px;
-}
-
 a,
 .fakelink {
   color: $link_colour;
@@ -129,7 +114,7 @@ pre code {
 
 code {
 	font-size: 1em;
-	padding: 1em;
+	padding: 1em 1.5em;
 	border: 1px solid #ccc;
 	background: #ccc;
 	color: #000;
@@ -141,27 +126,12 @@ pre {
 	border:1px solid #ccc;
 }
 
-.ccollapse-wrapper {
-	border: 1px solid #CCC;
-	padding: 5px;
-}
-
 .heart {
 	color: #FF0000;
 	font-size: 100%;
 	margin-right: 5px;
 }
 
-.subdued {
-	opacity: 0.3;
-	filter:alpha(opacity=30);
-}
-
-.subdued:hover {
-	opacity: 1.0;
-	filter:alpha(opacity=100);
-}
-
 nav,
 header {
 	opacity: $nav_float_min_opacity;
@@ -264,11 +234,6 @@ footer {
 	margin: 15px 0px;
 }
 
-.fakebutton {
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-
 /*TODO: we should use one class for all this. */
 
 .group-selected,
@@ -284,24 +249,6 @@ footer {
 	color: $font_colour;
 }
 
-
-.fileas-all {
-	text-decoration: none !important;
-}
-
-.fileas-all:hover {
-	text-decoration: underline !important;
-}
-
-#sysmsg {
-	margin-bottom: 10px;
-}
-
-#login-main {
-	max-width: 300px;
-	margin-top: 50px;
-}
-
 #cropimage-wrapper, #cropimage-preview-wrapper {
 	float: left;
 	padding: 30px;
@@ -312,10 +259,6 @@ footer {
 	clear: both;
 }
 
-#page-profile .title {
-	font-weight: bold;
-}
-
 #profile-edit-links {
 	padding-top: 15px;
 	padding-bottom: 15px;
@@ -367,22 +310,6 @@ footer {
 	margin-bottom: 0px;
 }
 
-#profile-extra-links {
-	clear: both;
-	margin-top: 10px;
-}
-
-#profile-extra-links ul {
-	list-style-type: none;
-	padding: 0px;
-}
-
-
-#profile-extra-links li {
-	margin-top: 10px;
-}
-
-
 .profile-edit-side-link {
 	padding: 3px 0px;
 	opacity: 0;
@@ -395,31 +322,10 @@ footer {
 	filter:alpha(opacity=100);
 }
 
-
-.view-contact-wrapper {
-	margin-top: 20px;
-	float: left;
-	margin-left: 20px;
-	width: 180px;
-}
-
-.contact-wrapper {
-	float: left;
-	width: 150px;
-	height: 150px;
-	overflow: auto;
-}
-
 #view-contact-end {
 	clear: both;
 }
 
-
-#viewconnections {
-	margin-top: 15px;
-}
-
-
 #profile-photo-wrapper img {
 	width: 100%;
 	height: 100%;
@@ -436,13 +342,6 @@ footer {
 	border-radius: $radiuspx;
 }
 
-
-#profile-in-dir-yes-label,
-#profile-in-dir-no-label,
-#profile-in-netdir-yes-label,
-#profile-in-netdir-no-label,
-#hide-wall-yes-label,
-#hide-wall-no-label,
 #hide-friends-yes-label,
 #hide-friends-no-label {
 	margin-left: 125px;
@@ -450,34 +349,11 @@ footer {
 	width: 50px;
 }
 
-
-#profile-publish-yes-reg,
-#profile-publish-no-reg {
-	float: left;
-	margin-bottom: 10px;
-}
-
-#profile-publish-yes-label-reg,
-#profile-publish-no-label-reg {
-	margin-left: 350px;
-	float: left;
-	width: 50px;
-}
-
-#profile-publish-break-reg,
-#profile-publish-end-reg {
-	clear: both;
-}
-
-
 #fsuggest-desc, #fsuggest-submit-wrapper {
 	margin-top: 15px;
 	margin-bottom: 15px;
 }
 
-.thread-end-wrapper {
-    margin-left: 50px;
-}
 .profile-listing-photo-wrapper {
 	float: left;
 }
@@ -509,10 +385,6 @@ footer {
 
 }
 
-.directory-details {
-	font-size: 0.7em;
-}
-
 .app-name {
 	overflow: none;
 }
@@ -544,27 +416,17 @@ footer {
 	padding: 4px;
 }
 
-.pager_first a,
-.pager_last a,
-.pager_prev a,
-.pager_next a,
-.pager_n a {
-}
-
 .pager_current {
-  border: 1px solid transparent;
-  background: transparent;
-  padding: 4px;
-}
-
-#block-message, #ignore-message, #archive-message, #lost-contact-message {
-	color: #FF0000;
+	border: 1px solid transparent;
+	background: transparent;
+	padding: 4px;
 }
 
-.photo, .contact-block-img {
-    border-radius: $radiuspx;
-    -moz-border-radius: $radiuspx;
-    box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
+.photo,
+.contact-block-img {
+	border-radius: $radiuspx;
+	-moz-border-radius: $radiuspx;
+	box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
 }
 
 #side-bar-photos-albums {
@@ -575,10 +437,11 @@ footer {
 	list-style: none;
 }
 
-.profile-match-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo {
-    border-radius: $radiuspx;
-    -moz-border-radius: $radiuspx;
-    box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
+.profile-match-photo img,
+.directory-photo-img {
+	border-radius: $radiuspx;
+	-moz-border-radius: $radiuspx;
+	box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
 }
 
 .profile-match-photo img {
@@ -586,57 +449,10 @@ footer {
 	height: $top_photo !important;
 }
 
-#sidebar-page-list .label {
-    margin-left: 5px;
-}
-
-.photo-top-photo, .photo-album-photo {
- /*   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-photo-link, .photo-album-photo-link {
-  display: block;
-  width: 100%;
-  position: relative;
-  height: 0;
-  padding: 75% 0 0 0;
-  overflow: hidden;
-}
-
 #photo-view-wrapper {
 	background-color: $item_colour;
 }
 
-#side-follow-wrapper {
-	margin-top: 20px;
-}
-
-#side-peoplefind-url::-webkit-input-placeholder, #side-advanced-peoplefind-url::-webkit-input-placeholder {
-	font-family: FontAwesome;
-}
-
-#side-peoplefind-url::-moz-placeholder, #side-advanced-peoplefind-url::-moz-placeholder {
-	font-family: FontAwesome;
-}
-
-
-#side-match-link {
-	margin-top: 10px;
-}
-
-
 .pmenu.horizontal {
 	padding: 0 0 0 0;
 	border-bottom: none;
@@ -655,11 +471,6 @@ footer {
 	padding-right: 15px;
 }
 
-#settings-default-perms-menu {
-	margin-top: 15px;
-	margin-bottom: 15px;
-}
-
 .group-delete-wrapper {
 	float: right;
 }
@@ -692,9 +503,9 @@ a.rateme, div.rateme {
 }
 
 #pause {
-  position: fixed;
-  bottom: 5px;
-  right: 5px;
+	position: fixed;
+	bottom: 5px;
+	right: 5px;
 }
 
 #vcard-end {
@@ -810,11 +621,6 @@ nav .acpopup {
 	width: 290px;
 }
 
-.profile-clear {
-	clear: both;
-}
-
-
 .clear {
 	clear: both;
 }
@@ -831,24 +637,11 @@ nav .acpopup {
 	margin-bottom: 20px;
 }
 
-/* end from default */
-	
-
 #network-new-link {
 	margin-top: 15px;
 	margin-bottom: 15px;
 }
 
-
-.tool-wrapper {
-  float: left;
-  margin-left: 15px;
-}
-
-.tool-link {
-  cursor: pointer;
-}
-
 #cboxOverlay {
 	z-index: 1050;
 }
@@ -865,29 +658,10 @@ nav .acpopup {
 	z-index: 1052;
 }
 
-.settings-block {
-	border: 1px solid #AAA;
-	margin: 10px;
-	padding: 10px;
-}
-
 .app-title {
 	margin: 10px;
 }
 
-#identity-manage-desc {
-	margin-top:15px;
-	margin-bottom: 15px;
-}
-
-#identity-manage-choose {
-	margin-bottom: 15px;
-}
-
-#identity-submit {
-	margin-top: 20px;
-}
-
 .profile-match-photo {
 	float: left;
 }
@@ -999,26 +773,10 @@ nav .acpopup {
 	margin-top: 15px;
 }
 
-
 .required {
 	color: #ff0000;
 }
 
-#item-delete-selected {
-	margin-top: 30px;
-}
-
-#item-delete-selected-end {
-	clear: both;
-}
-#item-delete-selected-icon, #item-delete-selected-desc {
-	float: left;
-	margin-right: 5px;
-}
-#item-delete-selected-desc:hover {
-	text-decoration: underline;
-}
-
 .notif-image {
 	height: 80px;
 	width: 80px;
@@ -1030,18 +788,6 @@ nav .acpopup {
 }
 
 /**
- * Plugins settings
- */
-
-.settings-block > h3,
-.settings-heading {
-	border-bottom: 1px solid #babdb6;
-}
- 
-
-
-
-/**
  * OAuth
  */
 .oauthapp {
@@ -1145,7 +891,7 @@ div.jGrowl div.jGrowl-notification {
 }
 
 .jslider .jslider-scale ins {
-    color: #333;
+	color: #333;
 	font-size: $body_font_size;
 	width: 100px;
 	text-align: center;
@@ -1352,11 +1098,6 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
     font-size : 1.8em !important;
   }
 
-
-div.page-list-item {
-margin: 20px;
-}
-
 div#write-pages {
 display: block;
 background: silver;
@@ -1635,10 +1376,7 @@ img.mail-conv-sender-photo {
 
 .divgrow-showmore {
 	display: block;
-	width: 100%;
 	border-top: 1px dashed #ccc;
-	border-bottom-right-radius: $radiuspx;
-	border-bottom-left-radius: $radiuspx;
 	text-align: center;
 	font-size: $body_font_size;
 	color: $link_colour;
@@ -1649,6 +1387,9 @@ img.mail-conv-sender-photo {
 	border-top: 1px dashed #adadad;
 }
 
+.directory-item .divgrow-showmore {
+	background-color: $comment_item_colour;
+}
 
 /* widgets */
 
@@ -1887,9 +1628,8 @@ blockquote {
 	font-size: $font_size;
 	font-style: italic;
 	border-left: 3px solid #ccc;
-	padding: 0.4em;
-	color: #4d4d4d;
-	margin: 0px 0px 0px 20px;
+	padding: 1em 0px 1em 1.5em;
+	margin: 0px;
 }
 
 .badge {
diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css
index 0eb3dab1f..820e84baa 100644
--- a/view/theme/redbasic/schema/bluegrid.css
+++ b/view/theme/redbasic/schema/bluegrid.css
@@ -284,8 +284,12 @@ input {
 	border-radius: 0px;	
 }
 
+.home-welcome {
+	color: #FFF;
+	margin-bottom: 30px;
+} 
+
 #login-main {
-    max-width: 100%;
     margin-top: 0;
 }
 
@@ -341,7 +345,7 @@ input {
     background-color: #FFF;
 }
 
-.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit, form#chat-form > input, div#adminpage > form > div.submit > input, input.sources-submit, input.contact-edit-submit, input#dbtn-submit, input#newchannel-submit-button, input#contacts-search-submit {
+.btn-primary, input#event-submit, input#rmagic-submit-button, input#lostpass-submit-button, input#side-follow-submit, .profile-edit-submit-wrapper > input.profile-edit-submit-button, input#profile-photo-submit, form#chat-form > input, div#adminpage > form > div.submit > input, input.sources-submit, input.contact-edit-submit, input#dbtn-submit, input#newchannel-submit-button, input#contacts-search-submit, input#register-submit-button {
     background-color: #FFF;
     color: #43488A;
 	border-radius: 0px;
@@ -350,7 +354,7 @@ input {
     transition: all .3s ease-in-out;
 }
 
-.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus, form#chat-form > input:hover, form#chat-form > input:focus, div#adminpage > form > div.submit > input:hover, div#adminpage > form > div.submit > input:focus, input.sources-submit:hover, input.sources-submit:focus, input.contact-edit-submit:focus, input.contact-edit-submit:hover, input#dbtn-submit:hover, input#dbtn-submit:focus, input#newchannel-submit-button:hover, input#newchannel-submit-button:focus, input#contacts-search-submit:hover, input#contacts-search-submit:focus {
+.btn-primary:hover, .btn-primary:focus, input#event-submit:hover, input#event-submit:focus, input#rmagic-submit-button:hover, input#rmagic-submit-button:focus, input#lostpass-submit-button:hover, input#lostpass-submit-button:focus, input#side-follow-submit:hover, input#side-follow-submit:focus, .profile-edit-submit-wrapper > input.profile-edit-submit-button:hover, .profile-edit-submit-wrapper > input.profile-edit-submit-button:focus, input#profile-photo-submit:hover, input#profile-photo-submit:focus, form#chat-form > input:hover, form#chat-form > input:focus, div#adminpage > form > div.submit > input:hover, div#adminpage > form > div.submit > input:focus, input.sources-submit:hover, input.sources-submit:focus, input.contact-edit-submit:focus, input.contact-edit-submit:hover, input#dbtn-submit:hover, input#dbtn-submit:focus, input#newchannel-submit-button:hover, input#newchannel-submit-button:focus, input#contacts-search-submit:hover, input#contacts-search-submit:focus, input#register-submit-button:hover, input#register-submit-button:focus {
     border-color: #FFF;
     background-color: #43488A;
     color: #FFF;