From: Andrew Dolgov Date: Mon, 21 Nov 2011 12:10:24 +0000 (+0400) Subject: use css for help overlay, css cleanup X-Git-Tag: 1.5.7~4 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=56d7e943532a8f100bcd8d2e1b9958cc1ce2e18b;p=tt-rss.git use css for help overlay, css cleanup --- diff --git a/functions.js b/functions.js index 1fd42180..c47070ed 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 83159e62..49875085 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 84e294e5..00000000 Binary files a/images/c1.png and /dev/null differ diff --git a/images/c2.png b/images/c2.png deleted file mode 100644 index 98303a48..00000000 Binary files a/images/c2.png and /dev/null differ diff --git a/images/c3.png b/images/c3.png deleted file mode 100644 index c291242f..00000000 Binary files a/images/c3.png and /dev/null differ diff --git a/images/c4.png b/images/c4.png deleted file mode 100644 index 682d494b..00000000 Binary files a/images/c4.png and /dev/null differ diff --git a/images/shadow-grid.gif b/images/shadow-grid.gif deleted file mode 100644 index ff58a611..00000000 Binary files a/images/shadow-grid.gif and /dev/null differ diff --git a/images/shadow.png b/images/shadow.png deleted file mode 100644 index 394eb501..00000000 Binary files a/images/shadow.png and /dev/null differ diff --git a/images/shadow_dark.png b/images/shadow_dark.png deleted file mode 100644 index c91a5620..00000000 Binary files a/images/shadow_dark.png and /dev/null differ diff --git a/images/shadow_white.png b/images/shadow_white.png deleted file mode 100644 index b04efaa0..00000000 Binary files a/images/shadow_white.png and /dev/null differ diff --git a/prefs.js b/prefs.js index 13dc93b1..dc06ef35 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 c28a5b1e..794ebb7b 100644 --- a/prefs.php +++ b/prefs.php @@ -72,9 +72,7 @@ diff --git a/tt-rss.css b/tt-rss.css index a1b896a0..fe6d8835 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 a64bed37..321a74c1 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 65dcdde8..679b09b6 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -90,9 +90,7 @@