diff options
| author | timb <timb@mb.home> | 2010-04-01 00:40:42 -0700 |
|---|---|---|
| committer | timb <timb@mb.home> | 2010-04-01 00:40:42 -0700 |
| commit | 70d8c1992f97286a63babcf7ebd996ab74ec7eac (patch) | |
| tree | 0be94521405b982e8b97f4234a02d4d3c28fc8ce /static | |
| parent | 8d0e1e9aa4505ccaf0c77583fc2654806d17e8df (diff) | |
| parent | aa3165c303d8feb2a34329539c67bd71863c9eb4 (diff) | |
fixing conflicts >:|
Diffstat (limited to 'static')
| -rwxr-xr-x | static/dump.css | 10 | ||||
| -rwxr-xr-x | static/index.html | 3 | ||||
| -rwxr-xr-x | static/js/pichat.js | 2 | ||||
| -rw-r--r-- | static/urlbutton.png | bin | 3288 -> 2879 bytes | |||
| -rw-r--r-- | static/webcam/webcam.js | 3 | ||||
| -rw-r--r-- | static/webcam/webcam.swf | bin | 17076 -> 18933 bytes |
6 files changed, 17 insertions, 1 deletions
diff --git a/static/dump.css b/static/dump.css index 36f3231..f8bbe30 100755 --- a/static/dump.css +++ b/static/dump.css @@ -61,6 +61,16 @@ right:2; bottom:30; } +#effects-msg{ +position:fixed; +bottom:68; +z-index:1111; +right:38; +font-size:15; +color:#fff; +text-shadow: #000 1px 1px 1px; + +} #footerc { text-align:center; diff --git a/static/index.html b/static/index.html index b1d650c..badf35a 100755 --- a/static/index.html +++ b/static/index.html @@ -2,6 +2,9 @@ "http://www.w3.org/TR/html4/strict.dtd"> <html><head> +<title>dump.fm</title> + <META NAME="keywords" CONTENT="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board"> +<META NAME="description" CONTENT="Talk with pictures!"> <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script> <script type="text/javascript" src="/static/js/sha1.js"></script> <script type="text/javascript" src="/static/js/home.js"></script> diff --git a/static/js/pichat.js b/static/js/pichat.js index 8211168..4d4ed17 100755 --- a/static/js/pichat.js +++ b/static/js/pichat.js @@ -129,7 +129,7 @@ function submitMessage() { var content = $.trim($('#msgInput').val()); $('#msgInput').val(''); if (content == '') { return; } - if (content.length > 6666) { + if (content.length > 1000) { alert("POST TOO LONG DUDE!"); return; } // this shouldn't just be client side :V diff --git a/static/urlbutton.png b/static/urlbutton.png Binary files differindex ef5ab64..1fc486b 100644 --- a/static/urlbutton.png +++ b/static/urlbutton.png diff --git a/static/webcam/webcam.js b/static/webcam/webcam.js index 42af499..f2e287b 100644 --- a/static/webcam/webcam.js +++ b/static/webcam/webcam.js @@ -56,12 +56,15 @@ window.webcam = { $("body").append(camHtml) $("#webcam-button-upload").addClass("invisible") $("#webcam-button-snap").removeClass("invisible") + $("#effects-msg").removeClass("invisible").fadeOut(70000) + blinkStart() }, hide: function() { $("#webcam-button-snap").addClass("invisible") $("#webcam-button-upload").removeClass("invisible") + $("#effects-msg").addClass("invisible") blinkStop() $("#webcam-preview").remove() }, diff --git a/static/webcam/webcam.swf b/static/webcam/webcam.swf Binary files differindex 823f276..ce7b114 100644 --- a/static/webcam/webcam.swf +++ b/static/webcam/webcam.swf |
