From 56d7e943532a8f100bcd8d2e1b9958cc1ce2e18b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 21 Nov 2011 16:10:24 +0400 Subject: [PATCH] use css for help overlay, css cleanup --- functions.js | 10 -------- functions.php | 12 ---------- images/c1.png | Bin 266 -> 0 bytes images/c2.png | Bin 267 -> 0 bytes images/c3.png | Bin 266 -> 0 bytes images/c4.png | Bin 266 -> 0 bytes images/shadow-grid.gif | Bin 56 -> 0 bytes images/shadow.png | Bin 2925 -> 0 bytes images/shadow_dark.png | Bin 111 -> 0 bytes images/shadow_white.png | Bin 111 -> 0 bytes prefs.js | 2 +- prefs.php | 2 -- tt-rss.css | 50 +++------------------------------------- tt-rss.js | 2 +- tt-rss.php | 2 -- 15 files changed, 5 insertions(+), 75 deletions(-) delete mode 100644 images/c1.png delete mode 100644 images/c2.png delete mode 100644 images/c3.png delete mode 100644 images/c4.png delete mode 100644 images/shadow-grid.gif delete mode 100644 images/shadow.png delete mode 100644 images/shadow_dark.png delete mode 100644 images/shadow_white.png diff --git a/functions.js b/functions.js index 1fd421809..c47070ed3 100644 --- a/functions.js +++ b/functions.js @@ -394,16 +394,6 @@ function make_timestamp() { } -function closeErrorBox() { - - if (Element.visible("errorBoxShadow")) { - Element.hide("dialog_overlay"); - Element.hide("errorBoxShadow"); - } - - return false; -} - function closeInfoBox(cleanup) { try { dialog = dijit.byId("infoBox"); diff --git a/functions.php b/functions.php index 83159e62c..498750851 100644 --- a/functions.php +++ b/functions.php @@ -5979,18 +5979,6 @@ } } - function rounded_table_start($classname, $header = " ") { - print ""; - print ""; - print ""; - print ""; - print "
 $header 
 "; - } - - function rounded_table_end($footer = " ") { - print " 
 $footer 
"; - } - function feed_has_icon($id) { return is_file(ICONS_DIR . "/$id.ico") && filesize(ICONS_DIR . "/$id.ico") > 0; } diff --git a/images/c1.png b/images/c1.png deleted file mode 100644 index 84e294e54851ecfbba1888f35616fcc753a80427..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TGEa{HEjtmSN`?>!lvI6*0qkYDhA1_8$PL1oOjdNL`~qcxoN)aox+07|BMx;TbtoUc6{$>-p} zaNxqMyYK!jf9kF@tt}mHm$fseRI$J+(s`jbb#ld~6Se{?Bv=)DU)Y4LZmHPdsj6XDmAE$$S N;OXk;vd$@?2>=uROH2R& diff --git a/images/c2.png b/images/c2.png deleted file mode 100644 index 98303a4850b50ac0d0fec52d16db71ee3344c90a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TGEa{HEjtmSN`?>!lvI6*0qkYDhA1_8$PL1oOjdNL`~qcxoN)aox+07|BLx;TbtoUc7+$=6^Y zz;ZCLHvYi>_-;-eq04ipm2KHo+rMyz^|s8Z=Ur^1+icW%BDpvt_bGXcZ=U5GR&rwg z`^etPzu%9qI%B7(ZE$*q@#ktkn;BDQ_&+!lvI6*0qkYDhA1_8$PL1oOjdNL`~qcxoN)aox+07|BMx;TbtoUc7+$=6^Y za^%99^ZOXT+v~=*1SD-=zp?mA^DCy$34UiL?lh9#?5^vyZ-((Fkxh!?iqb_Qg(pt< z9@*ZpyJNC?+^(nlLY}X-ZC86Rqx4zQrHRkw?PJ#I!lvI6*0qkYDhA1_8$PL1oOjdNL`~qcxoN)aox+07|BMx;TbtoUgrLDb(P= z;d1fi&GNnfGmjoIy5Rq7K}JEJwvqp{GjnE0Z%*esv+B(3od(&4)oDEHa^_)4dV-O2 zBiT2z6`wd!zwS8ur}BN`tKCzkw&eU@f8yGP3Asnt9r-?W-%^{$m5iDOj6d#pJgNZs Nz|+;wWt~$(695etP2B(h diff --git a/images/shadow-grid.gif b/images/shadow-grid.gif deleted file mode 100644 index ff58a611c4871dd90f8b8e46ab133a01bd7fab97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56 zcmZ?wbhEHbF$S-&W12>CAwcGN!NxDlWFf%gf2yrcDi|(7PCE{w+ zCdHYM$uyHyjH9wgyEu_gq2Dn?!&uG3Qg+#bNqQ_7fWGC@@N{tuskrs_a(I|hGy{VJ zyQ_goiNf@V$fAdxH%VE_swV~B3c4uvkTG_K$V;4Kq;j_X56V7g^+p}-(uiLkN zeV5xPN_JIsMGy=x>g{FWL5W?M+So&&85_KjK^0;^gm_b zmp4D^X8c=&k@4q=S-p>*8UCC4cjXTK^re?%1$u%swcmI9@84wq{AT=V{dLX}x8qN( zul$yN)3M9}4NizHn;?q{Q>M$Nu%pA9sq8lyQJ`ZPamG!M#bO|)ag0FIFbu@vI(itF z!j9=aEUt4X!{R+bJ zA%O|~Yi?@f)uqOlwsk*!VthKTAtB}F^OT(uWnuO=7nfYKx^jK*de6-~EK4kZzFPab z{hCg1-c9zm-rp^>zD?`>t1Zw|n|xEdukWsR^@q8&n9ZF0o5#22{{K>Dd#!!8x`M*& z#J?4_)?c@8{doV))XZ6X=AXOk{9KU3>-h!S`S&K5MD0xN&uU$=fA^NK!aqDL%6;K$ zPp_LVl66tH+VuXsyvg6*Fmjw(GdJh*pQ^9c)vB|uJ!{^=z@jF5Cj0V=Pm}k~DwlT; xEa7KS>$g3(Iz0d8e}@0uo0{J=yg6Y1-2Ua2mk-q%>=Z%GV^3E!lvI6UFg{Y;V+>?5c)I$ztaD0e0sxD@ B7kdBz diff --git a/images/shadow_white.png b/images/shadow_white.png deleted file mode 100644 index b04efaa00ae6b771bdb2384a2133a1d813463692..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)gaEa{HEjtmSN`?>!lvI6?&t;ucLK6T? C+Z$y7 diff --git a/prefs.js b/prefs.js index 13dc93b1c..dc06ef35b 100644 --- a/prefs.js +++ b/prefs.js @@ -1049,7 +1049,7 @@ function pref_hotkey_handler(e) { if ((keycode == 191 || keychar == '?') && shift_key) { // ? if (!Element.visible("hotkey_help_overlay")) { //Element.show("hotkey_help_overlay"); - Effect.Appear("hotkey_help_overlay", {duration : 0.3}); + Effect.Appear("hotkey_help_overlay", {duration : 0.3, to: 0.9}); } else { Element.hide("hotkey_help_overlay"); } diff --git a/prefs.php b/prefs.php index c28a5b1ef..794ebb7b2 100644 --- a/prefs.php +++ b/prefs.php @@ -72,9 +72,7 @@ diff --git a/tt-rss.css b/tt-rss.css index a1b896a07..fe6d88353 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -749,16 +749,6 @@ div.browserFeedInfo div.detailsPart { border-width : 0px; } -#dialog_overlay { - left : 0; - top : 0; - height : 100%; - width : 100%; - z-index : 4; - position : absolute; - background-image : url("images/shadow_white.png"); -} - #overlay { background : white; left : 0; @@ -1040,6 +1030,9 @@ div#hotkey_help_overlay { z-index : 999; color : white; font-size : 15px; + background : black; + border-radius : 30px; + padding : 10px; } div#hotkey_help_overlay h1 { @@ -1091,43 +1084,6 @@ div#hotkey_help_overlay h2 { color : #88b0f0; } -div#hotkey_help_overlay table.hho td.c1 { - height : 30px; - width : 30px; - background : url("images/c1.png"); - background-repeat : no-repeat; - -} - -div#hotkey_help_overlay table.hho td.c2 { - height : 30px; - width : 30px; - background : url("images/c2.png"); - background-repeat : no-repeat; -} - -div#hotkey_help_overlay table.hho td.c3 { - height : 30px; - width : 30px; - background : url("images/c3.png"); - background-repeat : no-repeat; -} - -div#hotkey_help_overlay table.hho td.c4 { - height : 30px; - width : 30px; - background : url("images/c4.png"); - background-repeat : no-repeat; -} - -div#hotkey_help_overlay table.hho td.top, -div#hotkey_help_overlay table.hho td.left, -div#hotkey_help_overlay table.hho td.right, -div#hotkey_help_overlay table.hho td.bottom, -div#hotkey_help_overlay table.hho td.content { - background : url("images/shadow_dark.png"); -} - div#hotkey_help_overlay table.hho td.top, div#hotkey_help_overlay table.hho td.bottom { text-align : center; diff --git a/tt-rss.js b/tt-rss.js index a64bed374..321a74c17 100644 --- a/tt-rss.js +++ b/tt-rss.js @@ -695,7 +695,7 @@ function hotkey_handler(e) { if ((keycode == 191 || keychar == '?') && shift_key) { // ? if (!Element.visible("hotkey_help_overlay")) { - Effect.Appear("hotkey_help_overlay", {duration : 0.3}); + Effect.Appear("hotkey_help_overlay", {duration : 0.3, to : 0.9}); } else { Element.hide("hotkey_help_overlay"); } diff --git a/tt-rss.php b/tt-rss.php index 65dcdde83..679b09b65 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -90,9 +90,7 @@