From 8da264608e0e95c253e6c1b69dbd5b039b3834c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 17 Nov 2006 08:49:30 +0000
Subject: [PATCH] Check before commit!

---
 grid/css/theme_left.css.php  |  7 ++++---
 grid/css/theme_right.css.php |  6 +++---
 grid/layout.inc.php          | 25 ++++++++++++++-----------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/grid/css/theme_left.css.php b/grid/css/theme_left.css.php
index fcc1cfd49..8521e5dae 100644
--- a/grid/css/theme_left.css.php
+++ b/grid/css/theme_left.css.php
@@ -12,7 +12,7 @@ html {
 ';
 ?>
 
-/** Navi general v.2.0 for pma2.7+ windkiel 20060917 **/
+/** Navi general v.2.9 for pma2.8+ windkiel 20060917 **/
 * { <?php /*jw general reset and corrected later, if needed (f.e. hr) */ ?>
 	margin:	0;
 	padding:	0
@@ -83,8 +83,9 @@ div#databaseList {
 
 
 div#leftframelinks a img.icon {
-	padding:	.2em;
-	border:	1px solid <?php echo $GLOBALS['cfg']['NaviColor']; //top links ?>;
+	padding:	.1em;
+	border:	0 <?php /*1px solid */ 
+	//echo $GLOBALS['cfg']['NaviColor']; //top links ?>;
 }
 
 div#leftframelinks a:hover {
diff --git a/grid/css/theme_right.css.php b/grid/css/theme_right.css.php
index 2552f08c1..04804814c 100644
--- a/grid/css/theme_right.css.php
+++ b/grid/css/theme_right.css.php
@@ -1,4 +1,4 @@
-<?php /*jw <-- diff from original/theme_right.css.php 20060922 */
+<?php /*jw <-- diff from original/theme_right.css.php 20061018 Let's again obey TextareaRows (bug #1465906).*/
 	// 2do: replace ../ with $oneUp
 	// unplanned execution path
 if (!defined('PMA_MINIMUM_COMMON')) {
@@ -104,7 +104,6 @@ form {
 
 textarea {
 	overflow:	visible;
-	height:	8em;
 }
 
 fieldset {
@@ -639,8 +638,9 @@ a.tab:hover,
 	background:	<?php echo $GLOBALS['cfg']['BgTwo']; ?>;
 }
 
-/* disabled drop/empty tabs */
+/* disabled drop/empty tabs 61031*/
 span.tab,
+a.warning,
 span.tabcaution {
 	<?php
 	if (strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') < 0) {
diff --git a/grid/layout.inc.php b/grid/layout.inc.php
index e23a5ff4d..80f316fe9 100644
--- a/grid/layout.inc.php
+++ b/grid/layout.inc.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * derived from theme "original" pma 2.9, HEAD
- * modifications by windkiel 20060819~0922 marked with "*jw"
+ * modifications by windkiel 2006-08-19 ~ 10-31 marked with "*jw"
  * works with pma 2.8 (still experimental)
  * no '' allowed, except for Font.. ..Link.. ..Marke...
  * for detailed layout configuration please refer to the css files
@@ -50,7 +50,7 @@ $GLOBALS['cfg']['NaviFontPercentage']       = '90%';/*jw*/
 $GLOBALS['cfg']['MainColor']                = '#000';
 
 // background for the main frame
-$GLOBALS['cfg']['MainBackground']           = '#d3d3d3';
+$GLOBALS['cfg']['MainBackground']           = '#e7e7e7';
 
 if ( PMA_USR_BROWSER_AGENT != 'MOZILLA' ) { 	/*jw index.php: NO frameborder="0"*/
 $GLOBALS['cfg']['MainBackground'] .=
@@ -82,7 +82,7 @@ $GLOBALS['cfg']['BrowseMarkerBackground']   = '#fc9';
  * if not set the browser default will be used
  * (depending on browser, DTD and system settings)
  */
-$GLOBALS['cfg']['FontFamily']           = 'Arial, sans-serif';
+$GLOBALS['cfg']['FontFamily']           = 'sans-serif'; //was:Arial
 /**
  * fixed width font family, used in textarea
  */
@@ -95,18 +95,18 @@ $GLOBALS['cfg']['FontFamilyFixed']      = 'monospace';
  * pma >2.8 uses font size stored in cookie
  */
 
-// for pma <= 2.8 :
+// for pma 2.8 :
 $GLOBALS['cfg']['FontSize']             = '90%';
 
 /**
  * tables
  */
 /*jw*/
-// border strenght ONLY FF(Gecko, e.g. .05em(min!)|1px|3pt| 0 but NOT 1)
+// border strenght ( e.g. .05em(min!)|1px|3pt| 0 but NOT 1)
 $GLOBALS['cfg']['Border'] = '1px';
-//at least 1 bit difference from $GLOBALS['cfg']['MainBackground'] to show the grid!
-$GLOBALS['cfg']['MainGridColor'] = '#d3d3d2';
 
+//at least 1 bit difference from $GLOBALS['cfg']['MainBackground'] to show the grid!
+$GLOBALS['cfg']['MainGridColor'] = '#e7e7e8';
 // table header and footer color
 $GLOBALS['cfg']['ThBackground'] = $GLOBALS['cfg']['NaviBackground'];#def';//'#D3DCE3';
 // table header and footer background
@@ -115,6 +115,9 @@ $GLOBALS['cfg']['ThColor']              = '#000';
 $GLOBALS['cfg']['BgOne']                = '#f7f7f7';
 // table data row background, alternate
 $GLOBALS['cfg']['BgTwo']                = '#fff';
+// table outer border color
+//$GLOBALS['cfg']['TblBorderColor'] = 'blue';//60928 test
+
 //needed for pma2.8 only (if E_NOTICE=1 , but no effect) :
 $GLOBALS['cfg']['BgcolorOne']='#f7f7f7';
 $GLOBALS['cfg']['BgcolorTwo']='#fff';
@@ -142,10 +145,10 @@ $GLOBALS['cfg']['SQP']['fmtColor']      = array(
     'digit_float'        => 'aqua',
     'punct'              => 'fuchsia',
     'alpha'              => '',
-    'alpha_columnType'   => '#FF9900',
-    'alpha_columnAttrib' => '#0000FF',
-    'alpha_reservedWord' => '#990099',
-    'alpha_functionName' => '#FF0000',
+    'alpha_columnType'   => '#F90',
+    'alpha_columnAttrib' => 'blue',
+    'alpha_reservedWord' => '#909',
+    'alpha_functionName' => 'red',
     'alpha_identifier'   => 'black',
     'alpha_charset'      => '#6495ed',
     'alpha_variable'     => '#800000',