Merge branch 'master' of https://github.com/redmatrix/redmatrix

2 files changed, 237 insertions, 123 deletions

diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css
index 761fe795b..90fafd76e 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.css
+++ b/view/theme/redbasic/schema/simple_white_on_black.css
@@ -1,20 +1,12 @@
-.vcard {
-	border-bottom: 1px solid #000;
-}
-
-#contact-block {
-	border-bottom: 1px solid #000;
-}
-
-.widget {
-	border-bottom: 1px solid #000;
+.vcard, #contact-block, .widget {
+	border-bottom: 1px solid #fff;
+	background-color: rgba(0,0,0,0.4);
 }
 
 .abook-pending-contact, .abook-permschange {
 	background: #000;
 }
 
-
 #cboxContent a {
 	color: #000;
 }
@@ -150,3 +142,237 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 nav .dropdown-menu {
 	background-color: #000;
 }
+
+.rconnect {
+	color: #fff;
+	background-color: #000;
+}
+
+a.rateme, div.rateme {
+	color: #fff;
+	background-color: #000;
+	border: 1px solid #000;
+}
+
+a.rconnect, a.rateme, div.rateme {
+  color: #fff;
+}
+
+.navbar-inverse {
+	background-image: -webkit-linear-gradient(top, #000 0%, #000 100%);
+	background-image:         linear-gradient(to bottom, #000 0%, #000 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#000, endColorstr=#000, GradientType=0);
+	background-color: #000;
+	border-color: #000;
+}
+
+.navbar-inverse .navbar-collapse, .navbar-inverse .navbar-toggle {
+	border-color: #000;
+}
+
+.navbar-inverse .navbar-nav > .active > a {
+	background-image: -webkit-linear-gradient(top, #000 0%, #000 100%);
+	background-image: linear-gradient(to bottom, #000 0%, #000 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#000, endColorstr=#000, GradientType=0);
+}
+
+.navbar-inverse .navbar-nav > .open > a,
+.navbar-inverse .navbar-nav > .open > a:hover,
+.navbar-inverse .navbar-nav > .open > a:focus {
+	background-color: #000;
+	color: #fff;
+}
+
+.navbar-inverse .navbar-toggle:hover,
+.navbar-inverse .navbar-toggle:focus {
+	background-color: #000;
+}
+
+#nav-search-text {
+	border-color: #000;
+	background-color: #000;
+}
+
+.autocomplete .selected {
+	background: #000;
+}
+
+#nav-search-text-ac .autocomplete {
+	border: 1px solid #000;
+}
+
+#usermenu-caret, .navbar-inverse .navbar-nav > li > a {
+	color: #eee;
+}
+
+.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus, .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus, .navbar-inverse .navbar-toggle .icon-bar, #nav-search-spinner, #avatar:hover + #usermenu-caret, #expand-aside, #expand-tabs {
+	color: #fff;
+}
+
+.nav-tabs{
+	border-bottom:1px solid #fff;
+}
+
+.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{
+	border:1px solid #fff;
+}
+
+.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus { 
+	color: #fff;
+	background-color: #000; 
+}
+
+.nav-tabs.nav-justified > li > a {
+	color: #fff;
+}
+
+.nav-tabs > li > a:hover, .nav-tabs > li > a:focus {
+    text-decoration: underline;
+    background-color: #000;
+	color: #fff;
+}
+
+aside .nav > li > a:hover, aside .nav > li > a:focus {
+	text-decoration: underline;
+	background-color: #030303;
+}
+
+a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { 
+	font-weight: bold;
+	color: #fff; 
+}
+
+a:hover, .fakelink:hover, .profile-import b, .field.checkbox:hover label {
+	color: #fff; 
+}
+
+.divgrow-showmore {
+	color: #fff;
+}
+
+.field.checkbox:hover > div label {
+	border-color: #fff;
+}
+
+.group-selected, .fileas-selected, .categories-selected, .search-selected, .active {
+	color: #fff !important;
+	text-decoration: underline !important;
+}
+
+header #banner {
+  color: #000;
+}
+
+body {
+	background-color: #000;
+	color: #fff;
+}
+
+.jothidden > input {
+	border: 1px solid #000;
+	background-color: #000;
+}
+
+.jothidden .bootstrap-tagsinput {
+	border-color: #000;
+	background-color: #000;
+}
+
+.generic-content-wrapper-styled {
+	background-color: rgba(0,0,0,0.8);
+}
+
+.wall-item-content-wrapper.comment, .hide-comments-outer {
+	background-color: rgba(0,0,0,0.4);
+	border-color: rgba(0,0,0,0.8);
+}
+
+#photo-view-wrapper, .wall-item-content-wrapper, .wall-item-comment-wrapper, .section-title-wrapper, .section-subtitle-wrapper, .section-content-tools-wrapper, [id^="cloud-index-"]:hover td, .cloud-index-active, [id^="webpage-list-item-"]:hover td, [id^="block-list-item-"]:hover td,
+[id^="layout-list-item-"]:hover td, [id^="menu-list-item-"]:hover td, [id^="mitem-list-item-"]:hover td, .onoffswitch-inner:after {
+	background-color: rgba(0,0,0,0.8);
+}
+
+.onoffswitch-inner:before {
+    background-color: rgba(0,0,0,0.8);
+	color: #fff;
+}
+
+.section-content-tools-wrapper, .section-content-wrapper, .section-content-wrapper-np {
+	background-color: rgba(0,0,0,0.4);
+}
+
+.tool-icons, .admin-icons, a .drop-icons, .jot-icons, .item-tool, .like-rotator, .comment-icon, .widget h3 {
+	color: #eee;
+}
+
+.profile-import input {
+	color: #fff;
+}
+
+.autocomplete {
+	color: #fff;
+	background: #000;
+}
+
+blockquote {
+	background-color: #000;
+	border-left: 3px solid #fff;
+	color: #eee;
+}
+
+code {
+	border: 1px solid #eee;
+	background: #000;
+	color: #eee;
+}
+
+pre {
+	background: #000;
+	color: #eee;
+	border:1px solid #fff;
+}
+
+.notif-item a {
+	color: #fff;
+}
+
+.notif-item a:hover {
+	color: #fff;
+}
+
+.dropdown-menu {
+	background-color: #000; 
+}
+
+.dropdown-menu >li > a {
+	color: #fff; 
+}
+
+.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
+    color: #fff; 
+    background-color: #030303; 
+	background-image: none;
+}
+
+.open .dropdown-toggle.btn-default {
+    color: #fff; 
+    background-color: #000; 
+    border-color: #000; 
+}
+
+.preview {
+	background: url('../img/gray_and_black_diagonal_stripes_background_seamless.gif');
+}
+
+
+@media (min-width: 768px) {
+  .nav-tabs.nav-justified > li > a {
+    border-bottom: 1px solid #fff;
+  }
+}
+
+@media screen and (max-width: 767px) {
+	aside#region_1 {
+		border-right: 1px solid #000;
+	}
+	}
diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black.php
deleted file mode 100644
index f940b7c64..000000000
--- a/view/theme/redbasic/schema/simple_white_on_black.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-	
-	if (! $nav_bg)
-		$nav_bg = "#000";
-	if (! $nav_gradient_top)
-		$nav_gradient_top = "#000";
-	if (! $nav_gradient_bottom)
-		$nav_gradient_bottom = "#000";
-	if (! $nav_active_gradient_top)
-		$nav_active_gradient_top = "#000";
-	if (! $nav_active_gradient_bottom)
-		$nav_active_gradient_bottom = "#000";
-	if (! $nav_bd)
-		$nav_bd = "#000";
-	if (! $nav_icon_colour)
-		$nav_icon_colour = "#eee";
-	if (! $nav_active_icon_colour)
-		$nav_active_icon_colour = "#fff";
-	if (! $navtabs_borderc)
-		$navtabs_borderc = "#fff";
-	if (! $navtabs_fontcolour)
-		$navtabs_fontcolour = "#fff";
-	if (! $navtabs_bgcolour)
-		$navtabs_bgcolour = "#000";
-	if (! $navtabs_linkcolour)
-		$navtabs_linkcolour = "color: #fff;";
-	if (! $navtabs_linkchover)
-		$navtabs_linkchover = "color: #fff;";
-	if (! $navtabs_bgchover)
-		$navtabs_bgchover = "#000";
-	if (! $navtabs_decohover)
-		$navtabs_decohover = "underline";
-	if (! $navaside_bghover)
-		$navaside_bghover = "#030303";
-	if (! $link_colour)
-		$link_colour = "#fff";
-	if (! $link_font_weight)
-		$link_font_weight = "bold";
-	if (! $selected_active_colour)
-		$selected_active_colour = "#fff";
-	if (! $selected_active_deco)
-		$selected_active_deco = "underline";
-	if (! $banner_colour)
-		$banner_colour = "#000";
-	if (! $search_background)
-		$search_background = "#000";
-	if (! $bgcolour)
-		$bgcolour = "#000";
-	if (! $genericcontent_bgcolour)
-		$genericcontent_bgcolour ='rgba(0,0,0,0.8)';
-	if (! $item_colour)
-		$item_colour = "rgba(0,0,0,0.8)";
-	if (! $comment_item_colour)
-		$comment_item_colour = "rgba(0,0,0,0.4)";
-	if (! $comment_border_colour)
-		$comment_border_colour = "rgba(0,0,0,0.8)";
-	if (! $toolicon_colour)
-		$toolicon_colour = '#eee';
-	if (! $toolicon_activecolour)
-		$toolicon_activecolour = '#fff';
-	if (! $font_colour)
-		$font_colour = "#fff";
-	if (! $blockquote_colour)
-		$blockquote_colour = "#eee";
-	if (! $blockquote_bgcolour)
-		$blockquote_bgcolour = "#000";
-	if (! $blockquote_bordercolour)
-		$blockquote_bordercolour = "#fff";
-	if (! $code_borderc)
-		$code_borderc = "#eee";
-	if (! $code_bgcolour)
-		$code_bgcolour = "#000";
-	if (! $code_txtcolour)
-		$code_txtcolour = "#eee";
-	if (! $pre_borderc)
-		$pre_borderc = "#fff";
-	if (! $pre_bgcolour)
-		$pre_bgcolour = "#000";
-	if (! $pre_txtcolour)
-		$pre_txtcolour = "#eee";
-	if (! $item_bordercolour)
-		$item_bordercolour = "#fff";
-	if (! $notif_itemcolour)
-		$notif_itemcolour = "#fff";
-	if (! $notif_itemhovercolour)
-		$notif_itemhovercolour = "#fff";
-	if (! $acpopup_bgcolour)
-		$acpopup_bgcolour = "#000";
-	if (! $acpopup_bordercolour)
-		$acpopup_bordercolour = "#fff";
-	if (! $acpopup_tgbl_bgcolour)
-		$acpopup_tgbl_bgcolour = "#000";
-	if (! $acpopup_hovercolour)
-		$acpopup_hovercolour = "#fff";
-	if (! $dropdown_bgcolour)
-		$dropdown_bgcolour = "#000";
-	if (! $dropdown_textcolour)
-		$dropdown_textcolour = "#fff";
-	if (! $dropdown_txtcolhover)
-		$dropdown_txtcolhover = "#fff";
-	if (! $dropdown_bgcolhover)
-		$dropdown_bgcolhover = "#030303";
-	if (! $dropdown_bgimghover)
-		$dropdown_bgimghover = "background-image: none;";
-	if (! $dropdown_togglecol)
-		$dropdown_togglecol = "#fff";
-	if (! $dropdown_togglebgcol)
-		$dropdown_togglebgcol = "#000";
-	if (! $dropdown_bordercol)
-		$dropdown_bordercol = "#000";
-	if (! $preview_backgroundimg)
-		$preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif";