aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCallum Macrae <callum@lynxphp.com>2011-10-22 22:48:05 +0100
committerIgor Wiedler <igor@wiedler.ch>2012-03-31 02:09:21 +0200
commit885c2914db51f0ed8157d9e43333d89dcfdb0153 (patch)
tree2a1fa06b107847d4ed43939c9c4b709bfe462de9
parent03d4ae20d1fc98b43edfdf26ae2a2379e52b3182 (diff)
downloadforums-885c2914db51f0ed8157d9e43333d89dcfdb0153.tar
forums-885c2914db51f0ed8157d9e43333d89dcfdb0153.tar.gz
forums-885c2914db51f0ed8157d9e43333d89dcfdb0153.tar.bz2
forums-885c2914db51f0ed8157d9e43333d89dcfdb0153.tar.xz
forums-885c2914db51f0ed8157d9e43333d89dcfdb0153.zip
[ticket/10270] Fixed JavaScript alerts in the ACP.
PHPBB3-10270
-rw-r--r--phpBB/adm/images/alert_close.pngbin0 -> 669 bytes
-rw-r--r--phpBB/adm/style/admin.css10
-rw-r--r--phpBB/adm/style/overall_footer.html4
3 files changed, 10 insertions, 4 deletions
diff --git a/phpBB/adm/images/alert_close.png b/phpBB/adm/images/alert_close.png
new file mode 100644
index 0000000000..123ac4ac90
--- /dev/null
+++ b/phpBB/adm/images/alert_close.png
Binary files differ
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 70c06f2d62..01af071766 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1072,7 +1072,7 @@ input.disabled {
/* jQuery popups
---------------------------------------- */
-.jalert {
+.phpbb_alert {
background-color: #FFFFFF;
border: 1px solid #999999;
position: fixed;
@@ -1085,7 +1085,13 @@ input.disabled {
padding: 0 25px 20px 25px;
}
-.jalert p {
+.phpbb_alert img.alert_close {
+ float: right;
+ margin-top: -7px;
+ margin-right: -30px;
+}
+
+.phpbb_alert p {
margin: 8px 0;
padding-bottom: 8px;
}
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html
index d58ac06aaa..5daaa4c6db 100644
--- a/phpBB/adm/style/overall_footer.html
+++ b/phpBB/adm/style/overall_footer.html
@@ -24,11 +24,11 @@
</div>
<div id="phpbb_alert" class="phpbb_alert">
- <a href="#"><img src="{T_THEME_PATH}/images/alert_close.png" class="alert_close" /></a>
+ <a href="#"><img src="images/alert_close.png" class="alert_close" /></a>
<h3 class="alert_title"></h3><p class="alert_text"></p>
</div>
<div id="phpbb_confirm" class="phpbb_alert">
- <a href="#"><img src="{T_THEME_PATH}/images/alert_close.png" class="alert_close" /></a>
+ <a href="#"><img src="images/alert_close.png" class="alert_close" /></a>
<p class="alert_text"></p>
<input type="button" class="button1" value="{L_YES}" />&nbsp;
<input type="button" class="button2" value="{L_NO}" />