gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Weblate 2013-05-11 16:18:39 +02:00
commit 8fd07ac7ca
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
======================
4.0.2.0 (not yet released)
+ center loading indicator for navigation refresh, related to bug #3920
4.0.1.0 (not yet released)
- bug #3879 Import broken for CSV using LOAD DATA

14
themes/original/css/navigation.css.php
View File

@ -82,8 +82,8 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
#pma_navigation #databaseList,
#pma_navigation div.pageselector.dbselector {
text-align: center;
margin-bottom: 0.5em;
padding-bottom: 0.5em;
margin-bottom: 0.3em;
padding-bottom: 0.3em;
border: 0;
}
@ -93,6 +93,16 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
width: 80%;
}
#pma_navigation #recentTableList {
margin-bottom: 0;
padding-bottom: 0;
}
#pma_navigation_content > img.throbber {
display: block;
margin: 0 auto;
}
/* Navigation tree*/
#pma_navigation_tree {
margin: 0.5em 0 0;

5
themes/pmahomme/css/navigation.css.php
View File

@ -83,6 +83,11 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) {
width: 80%;
}
#pma_navigation_content > img.throbber {
display: block;
margin: .3em auto 0;
}
/* Navigation tree*/
#pma_navigation_tree {
margin: 5px 0 0;