Merge branch 'QA_5_1'

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Apr 29, 2021 · c49bb8f · c49bb8f
2 parents a33d58c + 522d874
commit c49bb8f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog
 - issue #16005 Improve the performance of the Export logic
 - issue #16829 Add "NOT LIKE %...%" operator to Table search
 - issue #16845 Fixed some links not passing through url.php
+- issue #16382 Remove apc upload progress method (all upload progress code was removed from the PHP extension)
 
 5.1.1 (not yet released)
 - issue #13325 Fixed created procedure shows up in triggers and events and vice-versa
@@ -106,7 +107,7 @@ phpMyAdmin - ChangeLog
 - issue #16420 Fixed single clicking on row starts editing even if GridEditing is set to double-click
 - issue #16854 Fixed "Undefined index: SERVER_SOFTWARE" on very minimal PHP FPM setups
 - issue #16863 Fixed replication setting up a replica is not working
-- issue #16382 Remove apc upload progress method (all upload progress code was removed from the PHP extension)
+- issue #16843 Fixes vertical alignment in Metro and pmahomme themes on user accounts overview
 
 5.1.0 (2021-02-24)
 - issue #15350 Change Media (MIME) type references to Media type

diff --git a/themes/metro/scss/_variables.scss b/themes/metro/scss/_variables.scss
@@ -212,6 +212,7 @@ $dropdown-border-radius: 0;
 
 $input-border-radius: 0;
 $form-check-input-margin-y: 0;
+$label-margin-bottom: 0;
 
 // Navs
 

diff --git a/themes/pmahomme/scss/_variables.scss b/themes/pmahomme/scss/_variables.scss
@@ -172,3 +172,7 @@ $alert-border-radius: 5px;
 $list-group-bg: inherit;
 $list-group-item-padding-x: 0.75rem;
 $list-group-item-padding-y: 0.375rem;
+
+// Forms
+
+$label-margin-bottom: 0;