some cleanup after scheme transition

2 files changed, 19 insertions, 196 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 8edb06a3e..8f70d469a 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -70,7 +70,7 @@ abbr {
 }
 
 a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { 
-	font-weight: $link_font_weight;
+	font-weight: normal;
 	color: $link_colour; 
 	text-decoration: none; 
 }
@@ -130,19 +130,17 @@ pre code {
 code {
 	font-size: 1em;
 	padding: 5px;
-	border: 1px solid $code_borderc;
-	background: $code_bgcolour;
-	color: $code_txtcolour;
+	border: 1px solid #ccc;
+	background: #ccc;
+	color: #000;
 }
 
 pre {
-	background: $pre_bgcolour;
-	color: $pre_txtcolour;
-	border:1px solid $pre_borderc;
+	background: #F5F5F5;
+	color: #333;
+	border:1px solid #ccc;
 }
 
-
-
 .ccollapse-wrapper {
 	border: 1px solid #CCC;
 	padding: 5px;
@@ -255,7 +253,7 @@ footer {
 }
 
 .preview {
-	background: url('../img/$preview_backgroundimg');
+	background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif');
 }
 
 #theme-preview {
@@ -268,10 +266,12 @@ footer {
 }
 
 /*TODO: we should use one class for all this. */
+/*
 .group-selected, .fileas-selected, .categories-selected, .search-selected, .active {
-	color: $selected_active_colour !important;
-	text-decoration: $selected_active_deco !important;
+	color: #444 !important;
+	text-decoration: none !important;
 }
+*/
 
 .fileas-all {
 	text-decoration: none !important;
@@ -777,7 +777,7 @@ a.rateme, div.rateme {
 	padding: 0px 5px 0px 5px;
 	border-radius: $radiuspx;
 	border-color: $nav_bd;
-	background-color: $search_background;
+	background-color: #eee;
     	transition: background-color 300ms ease 0s;
 }
 
@@ -1250,7 +1250,6 @@ div.jGrowl div.jGrowl-notification {
 
 .autocomplete {
 	color: $font_colour;
-	background: $dropdown_bgcolour;
 	cursor: pointer;
 	text-align: left;
 	max-height: 350px;
@@ -1260,7 +1259,7 @@ div.jGrowl div.jGrowl-notification {
 }
 
 .autocomplete .selected {
-	background: $search_background;
+	background: #eee;
 }
 
 .autocomplete div {
@@ -1312,12 +1311,12 @@ header {
 }
 
 .notif-item a {
-	color: $notif_itemcolour;
+	color: #000;
 }
 
 .notif-item a:hover {
 	text-decoration: underline;
-	color: $notif_itemhovercolour;
+	color: #000;
 }
 
 .notif-image {
@@ -1650,7 +1649,7 @@ img.mail-list-sender-photo {
 }
 
 .generic-content-wrapper-styled {
-	background-color: $genericcontent_bgcolour;
+	background-color: $comment_item_colour;
 	padding: 10px;
 	border-radius: $radiuspx;
 }
@@ -1964,10 +1963,9 @@ nav ul li .notify-unseen
 blockquote {
 	font-size: $font_size;
 	font-style: italic;
-	background-color: $blockquote_bgcolour;
-	border-left: 3px solid $blockquote_bordercolour;
+	border-left: 3px solid #ccc;
 	padding: 0.4em;
-	color: $blockquote_colour;
+	color: #4d4d4d;
 	margin: 0px 0px 0px 20px;
 }
 
@@ -1996,35 +1994,12 @@ nav .badge.mail-update:hover {
 .dropdown-menu {
 	font-size: $body_font_size;
 	border-radius: $radiuspx;
-	background-color: $dropdown_bgcolour; 
-}
-
-.dropdown-menu >li > a {
-	color: $dropdown_textcolour; 
-}
-
-
-.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
-    	color: $dropdown_txtcolhover; 
-    	background-color: $dropdown_bgcolhover; 
-	$dropdown_bgimghover
-}
-
-aside .nav > li > a:hover, aside .nav > li > a:focus {
-	text-decoration: $navtabs_decohover;
-	background-color: $navaside_bghover;
 }
 
 .dropdown-menu img {
 	border-radius: $radiuspx;
 }
 
-.open .dropdown-toggle.btn-default {
-    color: $dropdown_togglecol; 
-    background-color: $dropdown_togglebgcol; 
-    border-color: $dropdown_bordercol; 
-}
-
 .navbar-inverse {
 	background-image: -webkit-linear-gradient(top, $nav_gradient_top 0%, $nav_gradient_bottom 100%);
 	background-image:         linear-gradient(to bottom, $nav_gradient_top 0%, $nav_gradient_bottom 100%);
@@ -2093,41 +2068,6 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
 	box-shadow: none;
 }
 
-.nav-tabs{
-	border-bottom:1px solid $navtabs_borderc;
-}
-
-.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{
-	color: $navtabs_fontcolour;
-	background-color: $navtabs_bgcolour; 
-}
-
-.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{
-	border:1px solid $navtabs_borderc;
-}
-
-.nav-tabs.nav-justified > li > a {
-	$navtabs_linkcolour
-}
-
-.nav-tabs > li > a:hover, .nav-tabs > li > a:focus {
-    	text-decoration: $navtabs_decohover;
-    	background-color: $navtabs_bgchover;
-	border-color: transparent;
-	$navtabs_linkchover
-}
-
-@media (min-width: 768px) {
-  .nav-tabs.nav-justified > li > a {
-    border-bottom: 1px solid $navtabs_borderc;
-  }
-  .nav-tabs.nav-justified > .active > a,
-  .nav-tabs.nav-justified > .active > a:hover,
-  .nav-tabs.nav-justified > .active > a:focus {
-    border-bottom-color: transparent;
-  }
-}
-
 .btn {
 	font-size: $body_font_size;
 }
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 2133331c6..06dbee139 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -96,30 +96,10 @@ if(! $a->install) {
 		$nav_icon_colour = "#999";
 	if (! $nav_active_icon_colour)
 		$nav_active_icon_colour = "#fff";
-	if (! $navtabs_borderc)
-		$navtabs_borderc = "rgba(204,204,204,0.8)";
-	if (! $navtabs_fontcolour)
-		$navtabs_fontcolour = "#555";
-	if (! $navtabs_bgcolour)
-		$navtabs_bgcolour = "rgba(254,254,254,0.4)";
-	if (! $navtabs_linkcolour)
-		$navtabs_linkcolour = "";
-	if (! $navtabs_linkchover)
-		$navtabs_linkchover = "";
-	if (! $navtabs_decohover)
-		$navtabs_decohover = "none";
-	if (! $navtabs_bgchover)
-		$navtabs_bgchover = "rgba(238,238,238,0.8)";
 	if (! $link_colour)
 		$link_colour = "#337AB7";
-	if (! $navaside_bghover)
-		$navaside_bghover = "#eee";
-	if (! $link_font_weight)
-		$link_font_weight = "normal";
 	if (! $banner_colour)
 		$banner_colour = "#fff";
-	if (! $search_background)
-		$search_background = "#eee";
 	if (! $bgcolour)
 		$bgcolour = "#fdfdfd";
 	if (! $background_image)
@@ -128,8 +108,6 @@ if(! $a->install) {
 		$item_colour = "rgba(238,238,238,0.8)";
 	if (! $comment_item_colour)
 		$comment_item_colour = "rgba(254,254,254,0.4)";
-	if (! $genericcontent_bgcolour)
-		$genericcontent_bgcolour = $comment_item_colour;
 	if (! $comment_border_colour)
 		$comment_border_colour = "rgba(238,238,238,0.8)";
 	if (! $toolicon_colour)
@@ -144,65 +122,10 @@ if(! $a->install) {
 		$body_font_size = "0.75rem";
 	if (! $font_colour)
 		$font_colour = "#4d4d4d";
-	if (! $selected_active_colour)
-		$selected_active_colour = "#444";
-	if (! $selected_active_deco)
-		$selected_active_deco = "none";
-	if (! $blockquote_colour)
-		$blockquote_colour = "#4d4d4d";
-	if (! $blockquote_bgcolour)
-		$blockquote_bgcolour = "";
-	if (! $blockquote_bordercolour)
-		$blockquote_bordercolour = "#ccc";
-	if (! $code_borderc)
-		$code_borderc = "#ccc";
-	if (! $code_bgcolour)
-		$code_bgcolour = "#ccc";
-	if (! $code_txtcolour)
-		$code_txtcolour = "#000";
-	if (! $pre_borderc)
-		$pre_borderc = "#ccc";
-	if (! $pre_bgcolour)
-		$pre_bgcolour = "#F5F5F5";
-	if (! $pre_txtcolour)
-		$pre_txtcolour = "#333";
-	if (! $notif_itemcolour)
-		$notif_itemcolour = "#000";
-	if (! $notif_itemhovercolour)
-		$notif_itemhovercolour = "#000";
-	if (! $dropdown_bgcolour)
-		$dropdown_bgcolour = "#FFF";
-	if (! $dropdown_textcolour)
-		$dropdown_textcolour = "#333";
-	if (! $dropdown_txtcolhover)
-		$dropdown_txtcolhover = "#262626";
-	if (! $dropdown_bgcolhover)
-		$dropdown_bgcolhover = "#F5F5F5";
-	if (! $dropdown_bgimghover)
-		$dropdown_bgimghover = "";
-	if (! $dropdown_togglecol)
-		$dropdown_togglecol = "#333";
-	if (! $dropdown_togglebgcol)
-		$dropdown_togglebgcol = "#EBEBEB";
-	if (! $dropdown_bordercol)
-		$dropdown_bordercol = "#ADADAD";
-	if (! $preview_backgroundimg)
-		$preview_backgroundimg = "gray_and_white_diagonal_stripes_background_seamless.gif";
-	if (! $acpopup_bgcolour)
-		$acpopup_bgcolour = "#fff";
-	if (! $acpopup_bordercolour)
-		$acpopup_bordercolour = "#ccc";
-	if (! $acpopup_tgbl_bgcolour)
-		$acpopup_tgbl_bgcolour = "#ddddff";
-	if (! $acpopup_hovercolour)
-		$acpopup_hovercolour = "#000";
-
 	if (! $radius)
 		$radius = "4";
 	if (! $shadow)
 		$shadow = "0";
-	if(! $active_colour)
-		$active_colour = "#fff";
 	if (! $converse_width)
 		$converse_width = "1024";
 	if(! $top_photo)
@@ -211,7 +134,6 @@ if(! $a->install) {
 		$comment_indent = '0px';
 	if(! $reply_photo)
 		$reply_photo = '32px';
-
 	if($nav_min_opacity === false || $nav_min_opacity === '') {
 		$nav_float_min_opacity = 1.0;
 		$nav_percent_min_opacity = 100;
@@ -241,21 +163,10 @@ $options = array (
 '$nav_bd' => $nav_bd,
 '$nav_icon_colour' => $nav_icon_colour,
 '$nav_active_icon_colour' => $nav_active_icon_colour,
-'$navtabs_borderc' => $navtabs_borderc,
-'$navtabs_fontcolour' => $navtabs_fontcolour,
-'$navtabs_bgcolour' => $navtabs_bgcolour,
-'$navtabs_linkcolour' => $navtabs_linkcolour,
-'$navtabs_linkchover' => $navtabs_linkchover,
-'$navtabs_bgchover' => $navtabs_bgchover,
-'$navtabs_decohover' => $navtabs_decohover,
-'$navaside_bghover' => $navaside_bghover,
 '$link_colour' => $link_colour,
-'$link_font_weight' => $link_font_weight,
 '$banner_colour' => $banner_colour,
-'$search_background' => $search_background,
 '$bgcolour' => $bgcolour,
 '$background_image' => $background_image,
-'$genericcontent_bgcolour' => $genericcontent_bgcolour,
 '$item_colour' => $item_colour,
 '$comment_item_colour' => $comment_item_colour,
 '$comment_border_colour' => $comment_border_colour,
@@ -263,37 +174,9 @@ $options = array (
 '$toolicon_activecolour' => $toolicon_activecolour,
 '$font_size' => $font_size,
 '$font_colour' => $font_colour,
-'$selected_active_colour' => $selected_active_colour,
-'$selected_active_deco' => $selected_active_deco,
 '$body_font_size' => $body_font_size,
-'$blockquote_colour' => $blockquote_colour,
-'$blockquote_bgcolour' => $blockquote_bgcolour,
-'$blockquote_bordercolour' => $blockquote_bordercolour,
-'$blockquote_bgcolourhover' => $blockquote_bgcolourhover,
-'$code_borderc' => $code_borderc,
-'$code_bgcolour' => $code_bgcolour,
-'$code_txtcolour' => $code_txtcolour,
-'$pre_borderc' => $pre_borderc,
-'$pre_bgcolour' => $pre_bgcolour,
-'$pre_txtcolour' => $pre_txtcolour,
-'$notif_itemcolour' => $notif_itemcolour,
-'$notif_itemhovercolour' => $notif_itemhovercolour,
-'$dropdown_bgcolour' => $dropdown_bgcolour,
-'$dropdown_textcolour' => $dropdown_textcolour,
-'$dropdown_txtcolhover' => $dropdown_txtcolhover,
-'$dropdown_bgcolhover' => $dropdown_bgcolhover,
-'$dropdown_bgimghover' => $dropdown_bgimghover,
-'$dropdown_togglecol' => $dropdown_togglecol,
-'$dropdown_togglebgcol' => $dropdown_togglebgcol,
-'$dropdown_bordercol' => $dropdown_bordercol,
-'$preview_backgroundimg' => $preview_backgroundimg,
-'$acpopup_bgcolour' => $acpopup_bgcolour,
-'$acpopup_bordercolour' => $acpopup_bordercolour,
-'$acpopup_tgbl_bgcolour' => $acpopup_tgbl_bgcolour,
-'$acpopup_hovercolour' => $acpopup_hovercolour,
 '$radius' => $radius,
 '$shadow' => $shadow,
-'$active_colour' => $active_colour,
 '$converse_width' => $converse_width,
 '$nav_float_min_opacity' => $nav_float_min_opacity,
 '$nav_percent_min_opacity' => $nav_percent_min_opacity,