[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-18588-g51eb806

[Rouslan Placella]

The branch, master has been updated
       via  51eb8069dbeb6cb200ad9f12d78ebd0226d71eeb (commit)
      from  597c833a94b20a2ca7e3677fab2dbc396c11fa08 (commit)


- Log -----------------------------------------------------------------
commit 51eb8069dbeb6cb200ad9f12d78ebd0226d71eeb
Author: Rouslan Placella <rouslan at placella.com>
Date:   Sun Sep 11 19:33:00 2011 +0100

    Fixed display of codemirror in routines, triggers and events editors

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

Summary of changes:
 js/rte/common.js                        |    2 --
 themes/original/css/theme_right.css.php |    4 ++++
 themes/pmahomme/css/theme_right.css.php |    4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/js/rte/common.js b/js/rte/common.js
index 4e3893e..8523459 100644
--- a/js/rte/common.js
+++ b/js/rte/common.js
@@ -242,8 +242,6 @@ $(document).ready(function () {
                  */
                 var opts = {lineNumbers: true, matchBrackets: true, indentUnit: 4, mode: "text/x-mysql"};
                 RTE.syntaxHiglighter = CodeMirror.fromTextArea($elm[0], opts);
-                // Hack to prevent the syntax highlighter from expanding beyond dialog boundries
-                $('.CodeMirror-scroll').find('div').first().css('width', '1px');
                 // Execute item-specific code
                 RTE.postDialogShow(data);
             } else {
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 260869b..987b559 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -2059,6 +2059,10 @@ fieldset .disabled-field td {
     margin-bottom: 0.5em;
 }
 
+.rte_table {
+    table-layout: fixed;
+}
+
 .rte_table td {
     vertical-align:     middle;
 }
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 508e4f4..5278085 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -2455,6 +2455,10 @@ fieldset .disabled-field td {
     margin-bottom: 0.5em;
 }
 
+.rte_table {
+    table-layout: fixed;
+}
+
 .rte_table td {
     vertical-align:     middle;
 }


hooks/post-receive
-- 
phpMyAdmin