[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23276-gdab7a58

[Rouslan Placella]

The branch, master has been updated
       via  dab7a58304edd88a913ebe12435ce62e29ccff17 (commit)
      from  1ac63d13898d0ffa86e15f0852236c2ba3391eb0 (commit)


- Log -----------------------------------------------------------------
commit dab7a58304edd88a913ebe12435ce62e29ccff17
Author: Rouslan Placella <rouslan at placella.com>
Date:   Wed Nov 23 15:59:17 2011 +0000

    Prevent the menubar from floating in print view

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

Summary of changes:
 js/functions.js                         |    7 -------
 themes/original/css/theme_right.css.php |    8 ++++++++
 themes/pmahomme/css/theme_right.css.php |    8 ++++++++
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index d96f15e..23c484e 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3704,13 +3704,6 @@ $(document).ready(function() {
 $(document).ready(function () {
     if ($("#floating_menubar").length) {
         $("#floating_menubar")
-            .css({
-                'position': 'fixed',
-                'top': 0,
-                'left': 0,
-                'width': '100%',
-                'z-index': 500
-            })
             .append($('#serverinfo'))
             .append($('#topmenucontainer'));
         $('body').css(
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 1284ae1..28ba2e8 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -878,6 +878,14 @@ div#tablestatistics table {
     width: 100%;
 }
 
+#floating_menubar {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%';
+    z-index: 500;
+}
+
 #serverinfo {
     background: white;
     font-weight:        bold;
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 5d4c3f3..2c7acd8 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -1089,6 +1089,14 @@ div#tablestatistics table {
     background-color: #dcdcdc;
 }
 
+#floating_menubar {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%';
+    z-index: 500;
+}
+
 #serverinfo {
     border-bottom:1px solid #fff;
     background:#888;


hooks/post-receive
-- 
phpMyAdmin