More schemas in new format

4 files changed, 114 insertions, 119 deletions

diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index 78aa27d38..02ee4707e 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -1,13 +1,5 @@
-.vcard {
-	border-bottom: 1px solid #333;
-}
-
-#contact-block {
-	border-bottom: 1px solid #333;
-}
-
-.widget {
-	border-bottom: 1px solid #333;
+.vcard, #contact-block, .widget {
+	border-bottom: 1px solid #fff;
 }
 
 .abook-pending-contact, .abook-permschange {
@@ -136,7 +128,6 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 	background-image: none;
 }
 
-
 nav .dropdown-menu .divider{
 	background-color: #222;
 }
@@ -150,3 +141,113 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 nav .dropdown-menu {
 	background-color: #000;
 }
+
+#nav-search-text {
+	background-color: #999;
+}
+
+.autocomplete .selected {
+	background: #999;
+}
+
+.nav-tabs{
+	border-bottom:1px solid #333;
+}
+
+.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{
+	border:1px solid #333;
+}
+
+.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus { 
+	color: #fff;
+	background-color: #111; 
+}
+
+.nav-tabs.nav-justified > li > a {
+	color: #ccc;
+}
+
+.nav-tabs > li > a:hover, .nav-tabs > li > a:focus {
+    text-decoration: underline;
+    background-color: #222;
+	color: #ccc;
+}
+
+aside .nav > li > a:hover, aside .nav > li > a:focus {
+	text-decoration: underline;
+	background-color: #222;
+}
+
+a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { 
+	font-weight: bold;
+}
+
+.group-selected, .fileas-selected, .categories-selected, .search-selected, .active {
+	color: #fff !important;
+	text-decoration: underline !important;
+}
+
+.generic-content-wrapper-styled {
+	background-color: rgba(28,28,28,0.8);
+}
+
+.autocomplete {
+	background: #222;
+}
+
+blockquote {
+	background-color: #1e1e1e;
+	border-left: 3px solid #666;
+	color: #ccc;
+}
+
+code {
+	border: 1px solid #090909;
+	background: #000;
+	color: #fff;
+}
+
+pre {
+	background: #000;
+	color: #fff;
+	border:1px solid #090909;
+}
+
+.notif-item a {
+	color: #ccc;
+}
+
+.notif-item a:hover {
+	color: #fff;
+}
+
+.dropdown-menu {
+	background-color: #222; 
+}
+
+.dropdown-menu >li > a {
+	color: #ccc; 
+}
+
+.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
+    	color: #ddd; 
+    	background-color: #333; 
+	background-image: none;
+}
+
+.open .dropdown-toggle.btn-default {
+    color: #ccc; 
+    background-color: #222; 
+    border-color: #222; 
+}
+
+.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 #333;
+  }
+}
+
diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php
index b3addcfff..92e703325 100644
--- a/view/theme/redbasic/schema/dark.php
+++ b/view/theme/redbasic/schema/dark.php
@@ -16,42 +16,16 @@
 		$nav_icon_colour = "#999";
 	if (! $nav_active_icon_colour)
 		$nav_active_icon_colour = "#fff";
-	if (! $navtabs_borderc)
-		$navtabs_borderc = "#333";
-	if (! $navtabs_fontcolour)
-		$navtabs_fontcolour = "#fff";
-	if (! $navtabs_bgcolour)
-		$navtabs_bgcolour = "#111";
-	if (! $navtabs_linkcolour)
-		$navtabs_linkcolour = "color: #ccc;";
-	if (! $navtabs_linkchover)
-		$navtabs_linkchover = "color: #fff;";
-	if (! $navtabs_bgchover)
-		$navtabs_bgchover = "#222";
-	if (! $navtabs_decohover)
-		$navtabs_decohover = "underline";
-	if (! $navaside_bghover)
-		$navaside_bghover = "#222";
 	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 = "#999";
-	if (! $search_background)
-		$search_background = "#999";
 	if (! $bgcolour)
 		$bgcolour = "#111";
 	if (! $item_colour)
 		$item_colour = "rgba(28,28,28,0.8)";
 	if (! $comment_item_colour)
 		$comment_item_colour = "rgba(18,18,18,0.4)";
-	if (! $genericcontent_bgcolour)
-		$genericcontent_bgcolour = "rgba(28,28,28,0.8)";
 	if (! $comment_border_colour)
 		$comment_border_colour = "rgba(28,28,28,0.8)";
 	if (! $toolicon_colour)
@@ -60,55 +34,5 @@
 		$toolicon_activecolour = '#fff';
 	if (! $font_colour)
 		$font_colour = "#ccc";
-	if (! $blockquote_colour)
-		$blockquote_colour = "#ccc";
-	if (! $blockquote_bgcolour)
-		$blockquote_bgcolour = "#1e1e1e";
-	if (! $blockquote_bordercolour)
-		$blockquote_bordercolour = "#666";
-	if (! $code_borderc)
-		$code_borderc = "#090909";
-	if (! $code_bgcolour)
-		$code_bgcolour = "#000";
-	if (! $code_txtcolour)
-		$code_txtcolour = "#fff";
-	if (! $pre_borderc)
-		$pre_borderc = "#090909";
-	if (! $pre_bgcolour)
-		$pre_bgcolour = "#000";
-	if (! $pre_txtcolour)
-		$pre_txtcolour = "#fff";
-	if (! $item_bordercolour)
-		$item_bordercolour = "#333";
-	if (! $notif_itemcolour)
-		$notif_itemcolour = "#ccc";
-	if (! $notif_itemhovercolour)
-		$notif_itemhovercolour = "#fff";
-	if (! $acpopup_bgcolour)
-		$acpopup_bgcolour = "#222";
-	if (! $acpopup_bordercolour)
-		$acpopup_bordercolour = "#333";
-	if (! $acpopup_tgbl_bgcolour)
-		$acpopup_tgbl_bgcolour = "#333";
-	if (! $acpopup_hovercolour)
-		$acpopup_hovercolour = "#fff";
-	if (! $editbuttons_bghover)
-		$editbuttons_bghover = "#222";
-	if (! $dropdown_bgcolour)
-		$dropdown_bgcolour = "#222";
-	if (! $dropdown_textcolour)
-		$dropdown_textcolour = "#ccc";
-	if (! $dropdown_txtcolhover)
-		$dropdown_txtcolhover = "#ddd";
-	if (! $dropdown_bgcolhover)
-		$dropdown_bgcolhover = "#333";
-	if (! $dropdown_bgimghover)
-		$dropdown_bgimghover = "background-image: none;";
-	if (! $dropdown_togglecol)
-		$dropdown_togglecol = "#ccc";
-	if (! $dropdown_togglebgcol)
-		$dropdown_togglebgcol = "#222";
-	if (! $dropdown_bordercol)
-		$dropdown_bordercol = "#222";
-	if (! $preview_backgroundimg)
-		$preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif";
+
+
diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css
index 2fdc46413..c00f3c260 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.css
+++ b/view/theme/redbasic/schema/simple_black_on_white.css
@@ -142,25 +142,10 @@ nav .dropdown-menu {
 	background-color: #fff;
 }
 
-.rconnect {
-	color: #000;
-}
-
 a.rateme, div.rateme {
-	color: #000;
 	border: 1px solid #fff;
 }
 
-a.rconnect, a.rateme, div.rateme {
-	color: #000;
-}
-
-.navbar-inverse .navbar-nav > .open > a,
-.navbar-inverse .navbar-nav > .open > a:hover,
-.navbar-inverse .navbar-nav > .open > a:focus {
-	color: #000;
-}
-
 #nav-search-text {
 	background-color: #F5F5F5;
 }
diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css
index c9c95263c..3504265b9 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.css
+++ b/view/theme/redbasic/schema/simple_white_on_black.css
@@ -142,25 +142,10 @@ nav .dropdown-menu {
 	background-color: #000;
 }
 
-.rconnect {
-	color: #fff;
-}
-
 a.rateme, div.rateme {
-	color: #fff;
 	border: 1px solid #000;
 }
 
-a.rconnect, a.rateme, div.rateme {
-	color: #fff;
-}
-
-.navbar-inverse .navbar-nav > .open > a,
-.navbar-inverse .navbar-nav > .open > a:hover,
-.navbar-inverse .navbar-nav > .open > a:focus {
-	color: #fff;
-}
-
 #nav-search-text {
 	background-color: #000;
 }