[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11001-gb857e95

[Michal Čihař]

The branch, master has been updated
       via  b857e9580757a84132fc8ccd820a549115af7e2d (commit)
      from  fc387fe531b6ca1e95f3ba1ad6fbcc499e0f2ccf (commit)


- Log -----------------------------------------------------------------
commit b857e9580757a84132fc8ccd820a549115af7e2d
Author: Michal Čihař <mcihar at suse.cz>
Date:   Wed Jul 20 15:20:59 2011 +0200

    Avoid using overrides for jquery CSS
    
    It is better to modify the style itself instead of including another
    tiny file with changes.

-----------------------------------------------------------------------

Summary of changes:
 libraries/header_meta_style.inc.php               |    7 -------
 themes/original/jquery/jquery-ui-1.8.custom.css   |    6 ++++--
 themes/original/jquery/jquery-ui-1.8.override.css |    8 --------
 themes/pmahomme/jquery/jquery-ui-1.8.custom.css   |    6 ++++--
 themes/pmahomme/jquery/jquery-ui-1.8.override.css |    8 --------
 5 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 themes/original/jquery/jquery-ui-1.8.override.css
 delete mode 100644 themes/pmahomme/jquery/jquery-ui-1.8.override.css

diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php
index e78b653..5e5c533 100644
--- a/libraries/header_meta_style.inc.php
+++ b/libraries/header_meta_style.inc.php
@@ -48,11 +48,4 @@ if ($GLOBALS['text_dir'] == 'ltr') {
     <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>phpmyadmin.css.php<?php echo PMA_generate_common_url(array('server' => $GLOBALS['server'])); ?>&js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
     <link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>print.css" media="print" />
     <link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['pmaThemePath']; ?>/jquery/jquery-ui-1.8.custom.css" />
-<?php
-    if (is_readable($GLOBALS['pmaThemePath'] . '/jquery/jquery-ui-1.8.override.css')) {
-?>
-    <link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['pmaThemePath']; ?>/jquery/jquery-ui-1.8.override.css" />
-<?php
-    }
-?>
     <meta name="robots" content="noindex,nofollow" />
diff --git a/themes/original/jquery/jquery-ui-1.8.custom.css b/themes/original/jquery/jquery-ui-1.8.custom.css
index bc1fb0e..edcb8e6 100644
--- a/themes/original/jquery/jquery-ui-1.8.custom.css
+++ b/themes/original/jquery/jquery-ui-1.8.custom.css
@@ -47,7 +47,7 @@
 
 /* Component containers
 ----------------------------------*/
-.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
 .ui-widget .ui-widget { font-size: 1em; }
 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
 .ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
@@ -485,4 +485,6 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 }/* Progressbar
 ----------------------------------*/
 .ui-progressbar { height:2em; text-align: left; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
+/* Timepicker */
+#ui-timepicker-div { z-index: 1003; }
diff --git a/themes/original/jquery/jquery-ui-1.8.override.css b/themes/original/jquery/jquery-ui-1.8.override.css
deleted file mode 100644
index 2835781..0000000
--- a/themes/original/jquery/jquery-ui-1.8.override.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Use this file to override styles set by jquery-ui-1.8.custom.css
- */
-
-/* Component containers
-----------------------------------*/
-.ui-widget { font-size: 1em; }
-#ui-timepicker-div { z-index: 1003; }
diff --git a/themes/pmahomme/jquery/jquery-ui-1.8.custom.css b/themes/pmahomme/jquery/jquery-ui-1.8.custom.css
index a350461..ca2b44b 100644
--- a/themes/pmahomme/jquery/jquery-ui-1.8.custom.css
+++ b/themes/pmahomme/jquery/jquery-ui-1.8.custom.css
@@ -47,7 +47,7 @@
 
 /* Component containers
 ----------------------------------*/
-.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
+.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
 .ui-widget .ui-widget { font-size: 1em; }
 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
 .ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
@@ -485,4 +485,6 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 }/* Progressbar
 ----------------------------------*/
 .ui-progressbar { height:2em; text-align: left; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
+/* Timepicker */
+#ui-timepicker-div { z-index: 1003; }
diff --git a/themes/pmahomme/jquery/jquery-ui-1.8.override.css b/themes/pmahomme/jquery/jquery-ui-1.8.override.css
deleted file mode 100644
index 2835781..0000000
--- a/themes/pmahomme/jquery/jquery-ui-1.8.override.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Use this file to override styles set by jquery-ui-1.8.custom.css
- */
-
-/* Component containers
-----------------------------------*/
-.ui-widget { font-size: 1em; }
-#ui-timepicker-div { z-index: 1003; }


hooks/post-receive
-- 
phpMyAdmin