diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-02-22 14:42:19 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 02:10:16 +0200 |
| commit | 6145e0ba65978e11249f6eb13d40391f348200ed (patch) | |
| tree | caebb274c25916f92620c1e728625fa8cc5aab8c /phpBB | |
| parent | cf92528390923fe62de67a7dcbc7dbeb878167f6 (diff) | |
| download | forums-6145e0ba65978e11249f6eb13d40391f348200ed.tar forums-6145e0ba65978e11249f6eb13d40391f348200ed.tar.gz forums-6145e0ba65978e11249f6eb13d40391f348200ed.tar.bz2 forums-6145e0ba65978e11249f6eb13d40391f348200ed.tar.xz forums-6145e0ba65978e11249f6eb13d40391f348200ed.zip | |
[ticket/10270] Changing close button for ajax popups
Changed close button for popups to match prosilver style and from img to css, moved color values to colours.css
PHPBB3-10270
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/images/alert_close.png | bin | 669 -> 2097 bytes | |||
| -rw-r--r-- | phpBB/adm/style/admin.css | 14 | ||||
| -rw-r--r-- | phpBB/adm/style/overall_footer.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_footer.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/colours.css | 14 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/common.css | 17 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/theme/images/alert_close.png | bin | 669 -> 2097 bytes |
7 files changed, 42 insertions, 11 deletions
diff --git a/phpBB/adm/images/alert_close.png b/phpBB/adm/images/alert_close.png Binary files differindex 123ac4ac90..79750a013c 100644 --- a/phpBB/adm/images/alert_close.png +++ b/phpBB/adm/images/alert_close.png diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index a162d44f9d..d5dc957ac5 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1089,11 +1089,21 @@ input.disabled { padding: 0 25px 20px 25px; } -.phpbb_alert img.alert_close { +.phpbb_alert .alert_close { + display: block; float: right; + width: 16px; + height: 16px; + overflow: hidden; + text-decoration: none !important; + background: transparent url("../images/alert_close.png") 0 0 no-repeat; margin-top: -7px; - margin-right: -30px; + margin-right: -31px; } +.phpbb_alert .alert_close:hover { + background-position: 0 -16px; +} + .phpbb_alert p { margin: 8px 0; diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html index dfe161fd76..0337080f3d 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" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}"> - <a href="#"><img src="images/alert_close.png" class="alert_close" /></a> + <a href="#" 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="images/alert_close.png" class="alert_close" /></a> + <a href="#" class="alert_close"></a> <p class="alert_text"></p> <input type="button" class="button1" value="{L_YES}" /> <input type="button" class="button2" value="{L_NO}" /> diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index ccc5b8b5de..1561bae26a 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -31,11 +31,11 @@ </div> <div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}"> - <a href="#"><img src="{T_THEME_PATH}/images/alert_close.png" class="alert_close" /></a> + <a href="#" 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="#" class="alert_close"></a> <p class="alert_text"></p> <input type="button" class="button1" value="{L_YES}" /> <input type="button" class="button2" value="{L_NO}" /> diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 42f6efc5b1..855febf4aa 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -1074,3 +1074,17 @@ input.search { input.disabled { color: #666666; } + +/* jQuery popups +---------------------------------------- */ +.phpbb_alert { + background-color: #FFFFFF; + border-color: #999999; +} +.phpbb_alert .alert_close { + background-image: url("./images/alert_close.png"); +} +#darken { + background-color: #000000; +} + diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 3b0e7899cb..31015b28f9 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -591,8 +591,7 @@ li.pagination { /* jQuery popups ---------------------------------------- */ .phpbb_alert { - background-color: #FFFFFF; - border: 1px solid #999999; + border: 1px solid transparent; position: fixed; display: none; top: 100px; @@ -603,10 +602,19 @@ li.pagination { padding: 0 25px 20px 25px; } -.phpbb_alert img.alert_close { +.phpbb_alert .alert_close { + display: block; float: right; + width: 16px; + height: 16px; + overflow: hidden; + text-decoration: none !important; + background: transparent none 0 0 no-repeat; margin-top: -7px; - margin-right: -30px; + margin-right: -31px; +} +.phpbb_alert .alert_close:hover { + background-position: 0 -16px; } .phpbb_alert p { @@ -624,7 +632,6 @@ li.pagination { top: 0; width: 100%; height: 100%; - background-color: #000000; opacity: 0.5; } diff --git a/phpBB/styles/prosilver/theme/images/alert_close.png b/phpBB/styles/prosilver/theme/images/alert_close.png Binary files differindex 123ac4ac90..79750a013c 100644 --- a/phpBB/styles/prosilver/theme/images/alert_close.png +++ b/phpBB/styles/prosilver/theme/images/alert_close.png |
