Merge branch 'QA_5_0'

[ci skip] Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Dec 24, 2019 · 22df6b6 · 22df6b6
2 parents 3673f04 + 5b3d126
commit 22df6b6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -69,6 +69,7 @@ phpMyAdmin - ChangeLog
 - issue #15608 Fix DisableIS is broken when with controluser configured (database list broken)
 - issue #15614 Fix undefined offset on index page for MySQL 5.7.8 (server charset)
 - issue #15692 Fix JavaScript error when user has not enough privilege to view query statistics.
+- issue #14248 Fixed date selection in search menu missing higher Z-index value
 
 4.9.2 (2019-11-21)
 - issue #14184 Change the cookie name from phpMyAdmin to phpMyAdmin_https for HTTPS, fixes many "Failed to set session cookie" errors

diff --git a/themes/metro/scss/_common.scss b/themes/metro/scss/_common.scss
@@ -3123,6 +3123,10 @@ body .ui-widget {
   font-size: 1em;
 }
 
+body #ui-datepicker-div {
+  z-index: 9999 !important;
+}
+
 .ui-dialog fieldset legend a {
   color: #235a81;
 }

diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss
@@ -2594,6 +2594,10 @@ body .ui-widget {
   font-size: 1em;
 }
 
+body #ui-datepicker-div {
+  z-index: 9999 !important;
+}
+
 .ui-dialog fieldset legend a {
   color: #00f;
 }

diff --git a/themes/pmahomme/scss/_common.scss b/themes/pmahomme/scss/_common.scss
@@ -3033,6 +3033,10 @@ body .ui-widget {
   font-size: 1em;
 }
 
+body #ui-datepicker-div {
+  z-index: 9999 !important;
+}
+
 .ui-dialog fieldset legend a {
   color: #235a81;
 }