Merge remote-tracking branch 'origin/master'

2014-03-29 12:39:33 +01:00 · 2014-03-29 12:39:33 +01:00 · 60277d8d38
commit 60277d8d38
parent fbbe9af6ab ea4e18ba84
3 changed files with 5 additions and 2 deletions
--- a/1
+++ b/1
@ -47,6 +47,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
@ -1428,7 +1428,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
@ -1871,7 +1871,8 @@ textarea#partitiondefinition {
 }

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

 /**