Merge remote-tracking branch 'origin/master'

2013-11-20 13:58:36 +01:00 · 2013-11-20 13:58:36 +01:00 · 7a6c258a50
commit 7a6c258a50
parent 04577b7f97 034886e620
3 changed files with 0 additions and 6 deletions
--- a/1
+++ b/1
@ -55,7 +55,6 @@ phpMyAdmin - ChangeLog
 - bug #3931 IN Clause search does not permit multiple values
 - bug #4086 Clicking OK from edit popup opens new tab
 - bug #2983 unknown table status: TABLE_TYPE
- bug #4096 horizontal scrollbar should not overflow on the left column
 - bug #4030 ORDER BY SUM(`field`) does not sort DESC

 4.0.10.0 (not yet released)
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@ -2095,13 +2095,9 @@ fieldset .disabled-field td {
    color: #FFF !important;
 }

-.data {
-    overflow: scroll;
-}

 .data_full_width {
    width: 100%;
-    overflow: scroll;
 }

 .cDrop {
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@ -81,7 +81,6 @@ h2 a img {
 .data,
 .data_full_width {
    margin: 0 0 12px;
-    overflow: scroll;
 }

 .data_full_width {