Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2013-06-22 15:49:04 +02:00
commit 592b86156c
2 changed files with 2 additions and 2 deletions

View File

@ -1455,7 +1455,7 @@ div.upload_progress_bar_outer
div.upload_progress_bar_inner
{
background-color: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
background-color: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
width: 0;
height: 12px;
margin: 1px;

View File

@ -1840,7 +1840,7 @@ div.upload_progress_bar_outer
div.upload_progress_bar_inner
{
background-color: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
background-color: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
width: 0;
height: 12px;
margin: 1px;