flatened out greyblock theme per a request

2 files changed, 68 insertions, 66 deletions

diff --git a/themes/greyblock/templates/default.css b/themes/greyblock/templates/default.css
index 8535af34..1c12a00f 100644
--- a/themes/greyblock/templates/default.css
+++ b/themes/greyblock/templates/default.css
@@ -1,4 +1,3 @@
-<?php
 /*
 
  Copyright (c) 2001 - 2005 Ampache.org
@@ -20,22 +19,13 @@
 
 */
 
-/*!
- @header Style File
- @discussion this is the css that is included on every page of
- 	ampache, mod this to change the look and feel of the site
-*/
-?>
-
-<style type="text/css">
-<!--
 	body	
 		{ 
 		padding-top: 0px;
 		margin-top: 0px;
 		margin-left: 0px;
 		margin-right: 0px;
-		background: #8B8B8B; 
+		background-color: #8B8B8B; 
 		font-family: Verdana; 
 		font-size: 12px; 
 		color: #292929;
@@ -118,21 +108,20 @@
 		}
     .table-header
     {
-        background: url(<?php echo conf('web_path'); ?><?php echo conf('theme_path'); ?>/images/ampache-light-bg.gif) #D4D4D4 repeat-x;
         vertical-align: top;
     }
     .header1 
     { 
 	color: #292929; 
 	font-family: Verdana; 
-	font-size: <?php echo conf('font_size') + 6; ?>px; 
+	font-size: 16px; 
 	font-weight: 900;
     }
     .header2
     {
     	color: #292929;
 	font-family: Verdana;
-	font-size: <?php echo conf('font_size') + 2; ?>px;
+	font-size: 14px;
 	font-weight: 900;
     }
 	.headrow 
@@ -175,7 +164,7 @@
                 border-bottom:4px solid #990033;
                 border-left:4px solid #990033;
                 border-top:4px solid #990033;		
-		font-size: <?php echo conf('font_size')+2; ?>px;
+		font-size: 14px;
 		font-weight: 900;
 		text-align: center;
 		}
@@ -193,7 +182,7 @@
 		border:0px;
 		padding-left:1px;
 		padding-right:1px;
-		font-size: <?php echo conf('font_size') - 1; ?>px;
+		font-size: 11px;
 		cursor: pointer;
 		}
 	.sidebar 
@@ -204,20 +193,77 @@
 		padding-right:0px;
 		padding-top: 0px;
 		padding-left: 0px;
-		background: #D4D4D4;
 		}
 /* These three lines make a menu vertical */
-        #content { float: none; }
-        #sidebar li { float: none; }
-        #sidebar li ul { margin: -1.5em 0 0 9em; }
+#content { 
+	float: none; 
+	background-color: #8B8B8B;
+}
 /**
  * Div Definitions
  * These define how the page is layed out, be careful with these as changes to them
  * can cause drastic layout changes
+ */
+.text-action a,.text-action li { background: #D4D4D4; } 
+
+#sidebar h3 { display: none; } 
+
+#sidebar li:hover { 
+	background-color: #7f7f7f;
+}
+
+.box-left-top { display: none; }
+.box-left-bottom { display: none; }
+.box-left       { display: none; }
+.box-right-top { display: none; }
+.box-right-bottom { display: none; }
+.box-right { display: none; }
+.box-bottom { display: none; }
+.box-top { display: none; }
+.box { background: #D4D4D4; margin: 10px; }
+
+#sidebar li {
+  /* float: left; Uncomment for horizontal */
+  margin: 0;
+  border-right: 1px solid #607080;
+  border-bottom: 1px solid #607080;
+  display: block;
+  background: #D4D4D4;
+  padding: 5px 0px 5px 10px;
+  width: 10.5em;
+}
 
+#sidebar li ul { 
+	left: auto; 
+	margin: 0;
+	display: block;
+	float: left;
+	width: 10em;
+	position: absolute;
+}
+
+#sidebar li:active { 
+	z-index:0;
+}
+
+#sidebar li:hover ul, #sidebar li.sfhover ul { 
+	left: auto;
+}
+
+#navlist ul li { 
+       background-color: #d6d6d6;
+       margin-left:.5em;
+       width: 10em;
+       display: block;
+	
+}
+
+#sidebar li:active { background-color: #FFFFFF; } 
+	#sidebar { background-color: #8b8b8b; } 
 	#maincontainer
 		{
 			margin: 0px;
+			background-color: #8B8B8B;
 		} 	
 	#topbar
 		{
@@ -234,9 +280,3 @@
 		{
 			float: left;
 		}
-/**
- * End Div Definitions
- * This is the end of the main structure def's
- */
--->
-</style>
diff --git a/themes/greyblock/theme.cfg.php b/themes/greyblock/theme.cfg.php
index b1515551..059bec88 100644
--- a/themes/greyblock/theme.cfg.php
+++ b/themes/greyblock/theme.cfg.php
@@ -25,44 +25,6 @@ name = "Greyblock"
 # DEFAULT: N/A
 #maintainer = "Ben Shields <shieldb@ampache.org>"
 
-# Theme Colors
-###################
-[color]
-###################
-# Below is a list of the default colors for this theme, upon
-# applying this theme the users color preferences will be reset
-# to what is listed below... 
-
-# Background Color 1
-bg_color1 = "#8B8B8B"
-
-# Background Color 2
-bg_color2 = "#000000"
-
-# Base Color 1 
-base_color1 = "#C8C8C8"
-
-# Base Color 2 
-base_color2 = "#D4D4D4"
-
-# Font Color 1 
-font_color1 = "#C0C0C0"
-
-# Font Color 2
-font_color2 = "#292929"
-
-# Font Color 3
-font_color3 = "#F2F2F2"
-
-# Row Color 1 
-row_color1 = "#CCCCCC"
-
-# Row Color 2
-row_color2 = "#7A7A7A"
-
-# Row Color 3
-row_color3 = "#A2A2A2"
-
-# Error Color
-error_color = "#990033"
+# Simple Menus
+submenu = "full"