Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

2014-03-29 12:38:10 +01:00 · 2014-03-29 12:38:10 +01:00 · 91871fb6ba
commit 91871fb6ba
parent a4bf6e532d b87c3ea29a
3 changed files with 5 additions and 2 deletions
--- a/1
+++ b/1
@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog

 4.1.13.0 (not yet released)
 - bug #4279 CTRL + up or down moves 2 fields
+- bug #4336 List server css style wrong

 4.1.12.0 (2014-03-27)
 - bug #4334 Add event : datepicker won't open
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@ -1385,7 +1385,8 @@ textarea#partitiondefinition {
 }

 #list_server {
-    list-style-image: none;
+    list-style-type: none;
+    padding: 0;
 }

 /**
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@ -1760,7 +1760,8 @@ textarea#partitiondefinition {
 }

 #list_server {
-    list-style-image: none;
+    list-style-type: none;
+    padding: 0;
 }

 /**