aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-12-07 21:05:03 +0100
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-12-07 21:05:03 +0100
commitf08c77448554704710e6430779e75d958f261b7d (patch)
tree50005264b7daa2fbf571addde4732519df708da7
parent5285f22442fa3117429b974767aa998cffa423bd (diff)
parentd7317c9b25e5343bc28bd7cee7ad825cba30734a (diff)
downloadforums-f08c77448554704710e6430779e75d958f261b7d.tar
forums-f08c77448554704710e6430779e75d958f261b7d.tar.gz
forums-f08c77448554704710e6430779e75d958f261b7d.tar.bz2
forums-f08c77448554704710e6430779e75d958f261b7d.tar.xz
forums-f08c77448554704710e6430779e75d958f261b7d.zip
Merge pull request #4068 from marc1706/ticket/14310
[ticket/14310] Put progress percentage inside span and make more visible * marc1706/ticket/14310: [ticket/14310] Put progress percentage inside span and make more visible
-rw-r--r--phpBB/adm/style/admin.css1
-rw-r--r--phpBB/assets/javascript/installer.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index cfa55b58a1..e38e1cc3d7 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -2566,6 +2566,7 @@ fieldset.permissions .padding {
text-align: center;
line-height: 25px;
font-weight: bold;
+ color: #fff;
}
#progress-bar #progress-bar-filler {
diff --git a/phpBB/assets/javascript/installer.js b/phpBB/assets/javascript/installer.js
index 4fc2e55b66..c5909556c6 100644
--- a/phpBB/assets/javascript/installer.js
+++ b/phpBB/assets/javascript/installer.js
@@ -191,12 +191,12 @@
$progressText.attr('id', 'progress-bar-text');
$progressFiller = $('<span />');
$progressFiller.attr('id', 'progress-bar-filler');
+ $progressFiller.html($progressText);
$statusText = $('<p />');
$statusText.attr('id', 'progress-status-text');
$progressBar.append($progressFiller);
- $progressBar.append($progressText);
$progressBarWrapper.append($statusText);
$progressBarWrapper.append($progressBar);