diff options
| author | dumpfmprod <dumpfmprod@ubuntu.(none)> | 2010-06-25 02:21:09 -0400 |
|---|---|---|
| committer | dumpfmprod <dumpfmprod@ubuntu.(none)> | 2010-06-25 02:21:09 -0400 |
| commit | f37c7b937f4a9a0b1ea527f620dbd81b57fd264f (patch) | |
| tree | 2f67880da8afe689f82333a8c80428c1ce425c7b /static | |
| parent | 6ab42d3e4480301ed52e7d56dc96c63229016e5c (diff) | |
| parent | 160ceb3b6881ae1e66b6db99cebc6d75a5d96c32 (diff) | |
Merge branch 'master' of /pichat/repo
Diffstat (limited to 'static')
| -rwxr-xr-x | static/css/dump.css | 18 | ||||
| -rw-r--r-- | static/index.html | 1 | ||||
| -rw-r--r-- | static/js/pichat.js | 9 | ||||
| -rwxr-xr-x | static/js/register.js | 5 |
4 files changed, 19 insertions, 14 deletions
diff --git a/static/css/dump.css b/static/css/dump.css index fc8ec4a..48135a3 100755 --- a/static/css/dump.css +++ b/static/css/dump.css @@ -425,7 +425,7 @@ a.msg-image-zoom img.zoom-icon:hover { } -div.content img:hover{background-color:white;} +/*div.content img:hover{background-color:white;}*/ .nick{background-color:white;margin-right:3px;} .msgDiv dump{background-color:white;} @@ -1423,10 +1423,18 @@ background-color:#fff; -moz-border-radius-bottomright:5px; } -#profiletxt img{ + + +.buttons .permalink img { width:16px; height:16px; } +/* don't show permalink button on permalink pages */ +body.permalink .buttons .permalink { + display: none; +} + + #pnav a { font-size: 30px; color:#000; @@ -1483,22 +1491,18 @@ color:000; .logged-dump img{ max-width:400px; - width: expression(this.width > 600 ? 600: true); max-height:400px; - height: expression(this.width > 600 ? 600: true); border:0px; z-index:4; } #messageList img { max-width:400px; - width: expression(this.width > 600 ? 600: true); max-height:400px; - height: expression(this.width > 600 ? 600: true); z-index:4; } .logged-dump { - background-color:#f0f9ff; + background-color:#fff; text-overflow: ellipsis-word; padding: 18px 18px 6px 18px; font-family: Arial, Helvetica, sans-serif; diff --git a/static/index.html b/static/index.html index 4eaeafa..9a8c434 100644 --- a/static/index.html +++ b/static/index.html @@ -2,7 +2,6 @@ <head> <title>dump.fm</title> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> - <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/home.js"></script> diff --git a/static/js/pichat.js b/static/js/pichat.js index 5f66ee2..7b60071 100644 --- a/static/js/pichat.js +++ b/static/js/pichat.js @@ -240,9 +240,16 @@ function removeFavAndHideBox() { function showFav(f) { $('#favbox').show(); - buildFav(f).appendTo('#favbox').fadeOut(5000, removeFavAndHideBox); + buildFav(f).appendTo('#favbox').animate( + {"opacity": 0}, + {"duration": 9000, + "easing": "easeInExpo", + "complete": removeFavAndHideBox + }) + } + function updateFavs(fs) { if (fs.length == 0) return; diff --git a/static/js/register.js b/static/js/register.js index ebdc095..35fcc8a 100755 --- a/static/js/register.js +++ b/static/js/register.js @@ -26,11 +26,6 @@ function submitRegistration() { return; } - if (password.length < 5) { - alert("Password must be at least 5 characters long."); - return; - } - var hash = hex_sha1(nick + '$' + password + '$dumpfm'); var onSuccess = function() { if (typeof pageTracker !== 'undefined') { |