[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1-2945-gccc65dd

Michal Čihař nijel at users.sourceforge.net
Thu Jun 2 17:06:58 CEST 2011


The branch, master has been updated
       via  ccc65dd6ba25549e22d0f881705d38641a52dfe5 (commit)
       via  f7cb8e8cca0363d70bdf8b75da320c6505be9344 (commit)
       via  8f021279ffba5b749abbb1d80e87b292efcea8a2 (commit)
       via  7dccf6d9440c0dddf323d5374db39fc1c48d7d8f (commit)
      from  42e1fc1533941c86b6f1017cf899ca41f29dbb06 (commit)


- Log -----------------------------------------------------------------
commit ccc65dd6ba25549e22d0f881705d38641a52dfe5
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Jun 2 17:06:26 2011 +0200

    Drop padding as it is not used at all because sub elements are floating

commit f7cb8e8cca0363d70bdf8b75da320c6505be9344
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Jun 2 17:05:50 2011 +0200

    Drop "bottom" line which is rendered on top

commit 8f021279ffba5b749abbb1d80e87b292efcea8a2
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Jun 2 17:04:48 2011 +0200

    Remove margin from caption, it just misalignes it with table

commit 7dccf6d9440c0dddf323d5374db39fc1c48d7d8f
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Jun 2 17:03:14 2011 +0200

    Revert "Remove div which seems to be leftover from slider removal"
    
    This reverts commit 095e0818b8d69722fceae3ad518b74d02b488ed0.
    
    It seems to be useful after recent fix for the broken CSS.

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

Summary of changes:
 tbl_structure.php                       |    4 ++++
 themes/pmahomme/css/theme_right.css.php |    9 ---------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/tbl_structure.php b/tbl_structure.php
index 4f91e16..e2a436d 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -706,6 +706,7 @@ if (! $tbl_is_view && ! $db_is_information_schema && 'ARCHIVE' !=  $tbl_type) {
 // BEGIN - Calc Table Space
 // Get valid statistics whatever is the table type
 if ($cfg['ShowStats']) {
+    echo '<div id="tablestatistics">';
     if (empty($showtable)) {
         $showtable = PMA_Table::sGetStatusInfo($GLOBALS['db'], $GLOBALS['table'], null, true);
     }
@@ -924,6 +925,9 @@ if ($cfg['ShowStats']) {
     </tbody>
     </table>
 
+    <!-- close tablestatistics div -->
+    </div>
+
     <?php
 }
 // END - Calc Table Space
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index c3a2747..17ab26c 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -1022,12 +1022,6 @@ form.clock {
 
 
 /* table stats */
-div#tablestatistics {
-    border-bottom: 0.1em solid #669999;
-    margin-bottom: 0.5em;
-    padding-bottom: 0.5em;
-}
-
 div#tablestatistics table {
     float: <?php echo $left; ?>;
     margin-bottom: 0.5em;
@@ -1035,9 +1029,6 @@ div#tablestatistics table {
     margin-top: 0.5em;
 }
 
-div#tablestatistics table caption {
-    margin-<?php echo $right; ?>: 0.5em;
-}
 /* END table stats */
 
 


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list