From 6145e0ba65978e11249f6eb13d40391f348200ed Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Wed, 22 Feb 2012 14:42:19 +0200 Subject: [PATCH] [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 --- phpBB/adm/images/alert_close.png | Bin 669 -> 2097 bytes phpBB/adm/style/admin.css | 14 ++++++++++++-- phpBB/adm/style/overall_footer.html | 4 ++-- .../prosilver/template/overall_footer.html | 4 ++-- phpBB/styles/prosilver/theme/colours.css | 14 ++++++++++++++ phpBB/styles/prosilver/theme/common.css | 17 ++++++++++++----- .../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 index 123ac4ac901f817080d565efbf952886f2177b5e..79750a013c5db627a14bf3d57edc8f8e3a477046 100644 GIT binary patch literal 2097 zcmaJ?YgAKL7LJ0*E65`_OVRcktP$(m;m=}RWa0BUlnFI$KFgT?|u4kiA3~!|za!^XLV766|9vif#KejaL{7)!6A}_|31pm15rZevXf%TciR7k7xWS211XQ|7 zVaFu}76kJZVmTs~Ndbc*7%e-9FtPed|G0ug{y|m>zi*SiVR$7d#}jb`!`M;+DD?ERrEISR|7J zeqkN}7vzhjhWH(x%cXOqFak>X5QoLY>J@Nev4GC@B#`|*{mC94R5FpsCi<{wRDTMY z!ydg(~-9>ey7ZS}zi<3m!t+ZB3SKgt9WQ7Gdw4$Ft9d~}4j zFW?e{Nv?m9pHdj_97b)G@1|0l9`^7s(F1|DU%OVV^zp?&GlP5Zhxvso<-*BtV`j90+^+Kq+rZ^rVgVBNYDp_VD1tDjYM!MYi*vF#7t(PL0l z)DyZYi6cAnqoAfJ+sj$iJv7vitlLk2akMevXSk}Y?AyJOkta(^u++rfgKD3$rw7cKB`MuM-owP8{DYdB?iOn(y5+F}JX2vgz#XG`}8n#b{t^MpOj~ zg+kWF*_X97H56K5&}Lh+f9sl>d^#RHFta*$?i_(mKY8nxM|XGkwh+v4o5;OgTKnnc z(t&~Y_IBgXf1jGN&Iw?#NDM}n-5HHWV`FJ@v3LC2uj}dxI1;{9<)g_%Ez!i`;!Br| znM`Ij^a@jO_Uv(;ZhyqJ-C%Rg;?5DqCY$?$XqHO_x$=jU7ObcxOv{#IgZ&VT-z={VJW37mK0GC+~Yb-~OSGgC|l zZr!!dj?z>Fuz&h~MEzxs&zgQg<3&zW3AgzLh1+4IKqzYtm@Vp3jR!(7oD}PFIVLjH zzWr@oYYbJz;Z3@9K1=N#x1V{!$2%>0ev*Z*jE<<-YCWq=PgvMqn?3dB6pvt;H{Up{ zd7_DioBR6uGJWm)QpUF(*kVuz0!+ph1Beywao>^UFx1wac`1|_6gs6iqg>D5F;_n_sqUFU+rFJp-wFwhQkVD7JgIw13D@SeKaZ>)ZJd4< z+yAO-gF4Z=JHFzfN8W7Hfby#=Ocj}k59M^l>lQ38kK?L8?&YOrwf8gR`5pnzrJk07 z9h>HqX7}&L$Wx~68AZB`wWs)RGd{E4H?(8tzjDos27za(tedB`w-v2!Ti0L7i8%Kg z{pab)fVr32!GH^D*`%P6vmxhA_uiJxkAp>NlObLf(dO&-mrdKxoIaINP)J#o)3)m4 zP&-o_>eMz2#Z3YgxgTUO}hquind8 z6ZFON6Q7E3^pnjtJ7$l0Z`TYmj0WTG-oDUjK}#HF0P-Ihb32c&Kw&oWB|A*ZcNl)+ N9Ci?^(l_eZe*jUwWY7Qr delta 658 zcmV;D0&V@V5S;~(7k>~41^@s6AM^iV00004b3#c}2nYxWddbVG7wVRUJ4ZXi@?ZDjy5H7_|YF)`g4T#x_&0338hSaefw zW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#En5<2C>Q0rp8mL4Q;@jeV25Ym-qJ#(&37 zf)M#!98zOSz%;#BX>^rtb*W8B92y%db#bbsi+@171grt4L>-G+B7|77hgqmX^LNaE}%5M5AMc z{ixMyGVS%&6kH!Ddo2*qB-^&dw(SAo+1Z)iTb3o0PN%620;{V(du7|UEs>2439qkf zlYBle*9=2)xtun65{Xy}?xA4f;mV2*G#U+=@%co7gnxoTDHIBF)!`5Yl1L;puUIUK zf>$WGG2Hv{@v%1Pt#~{>G7kkQ6wK}J?v4aa)70V_pHJHD_BexsOTh2blaqlPsZ=UF z4u=6S41-ds#G_D%PN$vg%aupkQL>E@=+ zp2=kL3V;4Ts@wDP2c~K2U@R7sXIonXgMF~PES6>IvnjVbryrC8W7_MjwOXx_KF1-M zOny}GX82Rw_b)E~Xf~S{iqq+INx01E&B07*qoM6N<$f_tGUn*aa+ 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 @@
- +

- +

  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 @@
- +

- +

  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 index 123ac4ac901f817080d565efbf952886f2177b5e..79750a013c5db627a14bf3d57edc8f8e3a477046 100644 GIT binary patch literal 2097 zcmaJ?YgAKL7LJ0*E65`_OVRcktP$(m;m=}RWa0BUlnFI$KFgT?|u4kiA3~!|za!^XLV766|9vif#KejaL{7)!6A}_|31pm15rZevXf%TciR7k7xWS211XQ|7 zVaFu}76kJZVmTs~Ndbc*7%e-9FtPed|G0ug{y|m>zi*SiVR$7d#}jb`!`M;+DD?ERrEISR|7J zeqkN}7vzhjhWH(x%cXOqFak>X5QoLY>J@Nev4GC@B#`|*{mC94R5FpsCi<{wRDTMY z!ydg(~-9>ey7ZS}zi<3m!t+ZB3SKgt9WQ7Gdw4$Ft9d~}4j zFW?e{Nv?m9pHdj_97b)G@1|0l9`^7s(F1|DU%OVV^zp?&GlP5Zhxvso<-*BtV`j90+^+Kq+rZ^rVgVBNYDp_VD1tDjYM!MYi*vF#7t(PL0l z)DyZYi6cAnqoAfJ+sj$iJv7vitlLk2akMevXSk}Y?AyJOkta(^u++rfgKD3$rw7cKB`MuM-owP8{DYdB?iOn(y5+F}JX2vgz#XG`}8n#b{t^MpOj~ zg+kWF*_X97H56K5&}Lh+f9sl>d^#RHFta*$?i_(mKY8nxM|XGkwh+v4o5;OgTKnnc z(t&~Y_IBgXf1jGN&Iw?#NDM}n-5HHWV`FJ@v3LC2uj}dxI1;{9<)g_%Ez!i`;!Br| znM`Ij^a@jO_Uv(;ZhyqJ-C%Rg;?5DqCY$?$XqHO_x$=jU7ObcxOv{#IgZ&VT-z={VJW37mK0GC+~Yb-~OSGgC|l zZr!!dj?z>Fuz&h~MEzxs&zgQg<3&zW3AgzLh1+4IKqzYtm@Vp3jR!(7oD}PFIVLjH zzWr@oYYbJz;Z3@9K1=N#x1V{!$2%>0ev*Z*jE<<-YCWq=PgvMqn?3dB6pvt;H{Up{ zd7_DioBR6uGJWm)QpUF(*kVuz0!+ph1Beywao>^UFx1wac`1|_6gs6iqg>D5F;_n_sqUFU+rFJp-wFwhQkVD7JgIw13D@SeKaZ>)ZJd4< z+yAO-gF4Z=JHFzfN8W7Hfby#=Ocj}k59M^l>lQ38kK?L8?&YOrwf8gR`5pnzrJk07 z9h>HqX7}&L$Wx~68AZB`wWs)RGd{E4H?(8tzjDos27za(tedB`w-v2!Ti0L7i8%Kg z{pab)fVr32!GH^D*`%P6vmxhA_uiJxkAp>NlObLf(dO&-mrdKxoIaINP)J#o)3)m4 zP&-o_>eMz2#Z3YgxgTUO}hquind8 z6ZFON6Q7E3^pnjtJ7$l0Z`TYmj0WTG-oDUjK}#HF0P-Ihb32c&Kw&oWB|A*ZcNl)+ N9Ci?^(l_eZe*jUwWY7Qr delta 658 zcmV;D0&V@V5S;~(7k>~41^@s6AM^iV00004b3#c}2nYxWddbVG7wVRUJ4ZXi@?ZDjy5H7_|YF)`g4T#x_&0338hSaefw zW^{L9a%BKPWN%_+AVz6&Wp{6KYjYq&Q#En5<2C>Q0rp8mL4Q;@jeV25Ym-qJ#(&37 zf)M#!98zOSz%;#BX>^rtb*W8B92y%db#bbsi+@171grt4L>-G+B7|77hgqmX^LNaE}%5M5AMc z{ixMyGVS%&6kH!Ddo2*qB-^&dw(SAo+1Z)iTb3o0PN%620;{V(du7|UEs>2439qkf zlYBle*9=2)xtun65{Xy}?xA4f;mV2*G#U+=@%co7gnxoTDHIBF)!`5Yl1L;puUIUK zf>$WGG2Hv{@v%1Pt#~{>G7kkQ6wK}J?v4aa)70V_pHJHD_BexsOTh2blaqlPsZ=UF z4u=6S41-ds#G_D%PN$vg%aupkQL>E@=+ zp2=kL3V;4Ts@wDP2c~K2U@R7sXIonXgMF~PES6>IvnjVbryrC8W7_MjwOXx_KF1-M zOny}GX82Rw_b)E~Xf~S{iqq+INx01E&B07*qoM6N<$f_tGUn*aa+