From 3b502423fc5bb2ed22051c465e8384f3e44519cc Mon Sep 17 00:00:00 2001 From: dumpfmprod Date: Sun, 11 Apr 2010 02:48:57 -0400 Subject: sostler PROD commit --- static/css/dump.css | 21 +++-- static/css/header.css | 21 +++-- static/css/index.css | 45 ++++++++++- static/css/pages.css | 5 +- static/css/profile.css | 19 ++++- static/img/bottomarrow.png | Bin 0 -> 201 bytes static/img/btn-slide.gif | Bin 0 -> 1320 bytes static/img/dumparial.ttf | Bin 0 -> 47750 bytes static/img/favheart.gif | Bin 0 -> 337 bytes static/img/palette.gif | Bin 292 -> 159 bytes static/img/thumbs/chatheartover.gif | Bin 0 -> 125 bytes static/img/thumbs/favheart.gif | Bin 0 -> 337 bytes static/img/thumbs/heart.gif | Bin 0 -> 125 bytes static/img/thumbs/heartfaved.gif | Bin 0 -> 125 bytes static/img/thumbs/heartover.gif | Bin 0 -> 271 bytes static/img/thumbs/pink.circle.gif | Bin 258 -> 68 bytes static/img/thumbs/smallheart.gif | Bin 0 -> 73 bytes static/img/thumbs/smallheartfaved.gif | Bin 0 -> 64 bytes static/img/thumbup.gif | Bin 0 -> 91 bytes static/img/white-arrow.gif | Bin 0 -> 185 bytes static/index.html | 32 +++++--- static/js/pichat.js | 20 ++--- static/register.html | 5 +- template/butt.st | 142 +++++++++++++++++++++++++++++++++- template/chat.st | 6 +- template/log_dump.st | 4 +- template/profile.st | 3 + template/profile_dump.st | 4 +- template/tagged_dumps.st | 6 +- 29 files changed, 271 insertions(+), 62 deletions(-) create mode 100644 static/img/bottomarrow.png create mode 100644 static/img/btn-slide.gif create mode 100644 static/img/dumparial.ttf create mode 100644 static/img/favheart.gif create mode 100644 static/img/thumbs/chatheartover.gif create mode 100644 static/img/thumbs/favheart.gif create mode 100644 static/img/thumbs/heart.gif create mode 100644 static/img/thumbs/heartfaved.gif create mode 100644 static/img/thumbs/heartover.gif create mode 100644 static/img/thumbs/smallheart.gif create mode 100644 static/img/thumbs/smallheartfaved.gif create mode 100644 static/img/thumbup.gif create mode 100644 static/img/white-arrow.gif diff --git a/static/css/dump.css b/static/css/dump.css index 9d5f838..40e29c8 100755 --- a/static/css/dump.css +++ b/static/css/dump.css @@ -167,7 +167,7 @@ margin-right:374; display:inline-block; width:120px; height:35px; -right:40px; +right:260px; font-size:20px; background-image:url(/static/img/urlbutton.png); text-indent:27; @@ -193,7 +193,7 @@ top:15px; width:120px; height:35px; background-position:center; -right:60; +right:20; top:15px; padding-bottom:1; text-indent:28; @@ -221,7 +221,7 @@ background-image:url(/static/img/cambutton.png); width:120px; height:35px; background-position:center; -right:60; +right:20; top:15px; padding-bottom:4; text-align:center; @@ -285,7 +285,7 @@ border:1px solid #999; width:120px; height:35px; background-position:center; -right:180; +right:140; top:15px; padding-bottom:1; text-indent:24; @@ -321,19 +321,16 @@ opacity:1; } #palette-button { - border-top-right-radius:10px; - -webkit-border-top-right-radius:5px; - -moz-border-radius-topright:5px; - border-bottom-right-radius:5px; - -webkit-border-bottom-right-radius:5px; - -moz-border-radius-bottomright:5px; + border-radius:5px; +background-image:url(/static/img/upbutton.png); +background-position:top right; position:absolute; /* display:inline-block;*/ display: none; width:40px; - height:34px; - right:20px; + height:35px; + right:260px; top:15px; padding-bottom:1; text-align:center; diff --git a/static/css/header.css b/static/css/header.css index 2caa474..4c64c72 100755 --- a/static/css/header.css +++ b/static/css/header.css @@ -34,13 +34,17 @@ margin-right:80%; color: #fff; } - + @font-face { + font-family: dumparial ; + src: url(/static/img/dumparial.ttf) format("truetype"); +} #header7{ background-image:url(/static/img/dblue2.png); background-attachment:inherit; margin: 0px auto -1px auto; top: 0px; height:49; + position:fixed; background-position:7 -14; background-repeat:repeat-x; @@ -297,7 +301,7 @@ img.chat-thumb { } .buttons .share { - opacity: 0.7; + opacity: 0.8; } .buttons .share:hover { opacity: 1; @@ -307,19 +311,20 @@ img.chat-thumb { } img.thumb { position: absolute; +image-rendering: -moz-crisp-edges; margin-left: 0px; margin-top: 0px; - height: 16px; - width: 16px; - right: 10px; - top: 10px; + height: 27px; + width: 27px; + right: 6px; + top: 3px; display: block; } .thumb.favorite { position: absolute; margin-left: 0px; margin-top: 0px; - height: 16px; - width: 16px; + height: 27px; + width: 27px; display: block; } diff --git a/static/css/index.css b/static/css/index.css index 680fe8a..24a28da 100644 --- a/static/css/index.css +++ b/static/css/index.css @@ -5,13 +5,56 @@ body { background:#EEF2FF url(/static/img/fade-blue.png) top center repeat-x; background-repeat:repeat-x; background-position:top; - margin:6%; + +} +#content{ +margin:6%; } #preload { position: absolute; left: 0px; top: 0px; } + +#panel { + padding: 10px 10px 10px 10px; + height: 600; + margin: 0 auto 0 auto; + display: none; + +} +.slide { margin: 0 auto 0 auto; + margin: 0; + padding: 0; +border-top:1px solid #ccc; + +color:black; +} +.btn-slide { + + text-align: center; + width: 144px; margin: 0 auto 0 auto; + height: 0px; + padding: 5px 10px 0 0; + margin: 0 auto; + display: block; + +font-size:42%; + text-decoration: none; + text-align: center; + -webkit-border-bottom-left-radius:5px; + -webkit-border-bottom-right-radius:5px; + -moz-border-radius-bottomleft:5px; + -moz-border-radius-bottomright:5px; + +width:150; + +} + +.active { + background-position: right 12px; +} + #main { width:460px; margin: 0 auto 0 auto; diff --git a/static/css/pages.css b/static/css/pages.css index a24e102..f2b3fae 100644 --- a/static/css/pages.css +++ b/static/css/pages.css @@ -9,10 +9,7 @@ top:150; margin-left:auto; margin-right: auto ; -#cats{ -background-image:url(/static/img/dumpcats2.png); -} - + } diff --git a/static/css/profile.css b/static/css/profile.css index 24c9af1..4429a91 100755 --- a/static/css/profile.css +++ b/static/css/profile.css @@ -6,6 +6,7 @@ height:auto; background-image:url(/static/img/upload.png); width:auto; padding:2; +color:#fff; text-align:center; background-color:#0c8fff; border-bottom:1px solid #f0e0d6; @@ -17,12 +18,12 @@ border-left:1px solid #f0e0d6; } #edit-toggle a{font-size:12; letter-spacing:; - text-shadow: 1px 1px 1px #ccc; + color:#fff; } #edit-toggle a:hover{font-size:12; letter-spacing:; -color:#fff; text-shadow: 1px 1px 1px #ccc; + } #profile { @@ -69,6 +70,20 @@ background-image:url(/static/img/leftarrow.png); background-position:22 1; margin-top:-22; +} +#profile h7{ +margin-top:12; +font-size:140%; +letter-spacing:1.5; +color:blue; +text-transform:uppercase; +font-weight:bold; +display:inline-block; +line-height:1.5; +bottom:0; +padding-bottom:10; +position:absolute; +text-shadow:#EEF2FF -1px -1px 1; } #logavatar img{ diff --git a/static/img/bottomarrow.png b/static/img/bottomarrow.png new file mode 100644 index 0000000..b9aeb47 Binary files /dev/null and b/static/img/bottomarrow.png differ diff --git a/static/img/btn-slide.gif b/static/img/btn-slide.gif new file mode 100644 index 0000000..3a73530 Binary files /dev/null and b/static/img/btn-slide.gif differ diff --git a/static/img/dumparial.ttf b/static/img/dumparial.ttf new file mode 100644 index 0000000..29b211e Binary files /dev/null and b/static/img/dumparial.ttf differ diff --git a/static/img/favheart.gif b/static/img/favheart.gif new file mode 100644 index 0000000..c22628d Binary files /dev/null and b/static/img/favheart.gif differ diff --git a/static/img/palette.gif b/static/img/palette.gif index ffe5b3e..5eeed2b 100644 Binary files a/static/img/palette.gif and b/static/img/palette.gif differ diff --git a/static/img/thumbs/chatheartover.gif b/static/img/thumbs/chatheartover.gif new file mode 100644 index 0000000..e79d9cc Binary files /dev/null and b/static/img/thumbs/chatheartover.gif differ diff --git a/static/img/thumbs/favheart.gif b/static/img/thumbs/favheart.gif new file mode 100644 index 0000000..c22628d Binary files /dev/null and b/static/img/thumbs/favheart.gif differ diff --git a/static/img/thumbs/heart.gif b/static/img/thumbs/heart.gif new file mode 100644 index 0000000..241fb04 Binary files /dev/null and b/static/img/thumbs/heart.gif differ diff --git a/static/img/thumbs/heartfaved.gif b/static/img/thumbs/heartfaved.gif new file mode 100644 index 0000000..e79d9cc Binary files /dev/null and b/static/img/thumbs/heartfaved.gif differ diff --git a/static/img/thumbs/heartover.gif b/static/img/thumbs/heartover.gif new file mode 100644 index 0000000..3385af9 Binary files /dev/null and b/static/img/thumbs/heartover.gif differ diff --git a/static/img/thumbs/pink.circle.gif b/static/img/thumbs/pink.circle.gif index 19f6e6c..32f2ef5 100644 Binary files a/static/img/thumbs/pink.circle.gif and b/static/img/thumbs/pink.circle.gif differ diff --git a/static/img/thumbs/smallheart.gif b/static/img/thumbs/smallheart.gif new file mode 100644 index 0000000..8d853ab Binary files /dev/null and b/static/img/thumbs/smallheart.gif differ diff --git a/static/img/thumbs/smallheartfaved.gif b/static/img/thumbs/smallheartfaved.gif new file mode 100644 index 0000000..0177b26 Binary files /dev/null and b/static/img/thumbs/smallheartfaved.gif differ diff --git a/static/img/thumbup.gif b/static/img/thumbup.gif new file mode 100644 index 0000000..b039245 Binary files /dev/null and b/static/img/thumbup.gif differ diff --git a/static/img/white-arrow.gif b/static/img/white-arrow.gif new file mode 100644 index 0000000..19ecebb Binary files /dev/null and b/static/img/white-arrow.gif differ diff --git a/static/index.html b/static/index.html index 8a24365..08b934e 100755 --- a/static/index.html +++ b/static/index.html @@ -11,11 +11,21 @@ + + + + @@ -23,7 +33,12 @@ jQuery(".auto .jCarouselLite").jCarouselLite({ +
+
+
+

watch a lil video! +

@@ -61,14 +76,9 @@ jQuery(".auto .jCarouselLite").jCarouselLite({
- + -
+
diff --git a/static/js/pichat.js b/static/js/pichat.js index d5ffbee..886e2c1 100644 --- a/static/js/pichat.js +++ b/static/js/pichat.js @@ -7,21 +7,21 @@ var MaxImagePosts = 40 // todo: preload these. also, look into image sprites (no go on animating their sizes tho) Imgs = { - "chatThumb": "/static/img/thumbs/color.right.gif", - "chatThumbBig": "/static/img/thumbs/color.right.4x.gif", - "chatThumbOff": "/static/img/thumbs/bw.right.gif", - "chatThumbDot": "/static/img/thumbs/pink.circle.gif", - "logThumb": "/static/img/thumbs/color.left.gif", - "logThumbBig": "/static/img/thumbs/color.left.4x.gif", - "logThumbOff": "/static/img/thumbs/bw.left.gif" + "chatThumb": "/static/img/thumbs/smallheartfaved.gif", + "chatThumbBig": "/static/img/thumbs/chatheartover.gif", + "chatThumbOff": "/static/img/thumbs/smallheart.gif", + "chatThumbDot": "/static/img/thumbs/smallheart.gif", + "logThumb": "/static/img/thumbs/heartfaved.gif", + "logThumbBig": "/static/img/thumbs/heartover.gif", + "logThumbOff": "/static/img/thumbs/heart.gif" } Anim = { - "chatThumbBig": {"width": "56px", "height": "60px", "right": "-35px", "bottom": "-10px"}, + "chatThumbBig": {"width": "27px", "height": "27px", "right": "0px", "bottom": "2px"}, "chatThumbTiny": {"width": "8px", "height": "8px", "right": "8px", "bottom": "8px"}, "chatThumb": {"width": "16px", "height": "16px", "right": "4px", "bottom": "4px"}, - "logThumb": {"width": "16px", "height": "16px", "marginLeft": "0px", "marginTop": "0px"}, - "logThumbBig": {"width": "56px", "height": "60px", "marginLeft": "-40px", "marginTop": "-27px"} + "logThumb": {"width": "27px", "height": "27px", "marginRight": "0px", "marginTop": "0px"}, + "logThumbBig": {"width": "64px", "height": "64px", "marginRight": "-20px", "marginTop": "-20px"} } // Utils diff --git a/static/register.html b/static/register.html index fe7f17e..0ce2911 100644 --- a/static/register.html +++ b/static/register.html @@ -41,15 +41,14 @@ password
- password 2x + password2x

email

-
- I Agree to the Terms of Service
+


diff --git a/template/butt.st b/template/butt.st index b14df64..e89a285 100644 --- a/template/butt.st +++ b/template/butt.st @@ -1 +1,141 @@ -Hi + + + $nick$'s dump.fm + $head()$ + + + + + + + + $banner()$ +
+
+ +
+
+
+
+
+ +
+ $if(dumps)$ +
+ +
+ + $dumps:{ d | $profile_dump(dump=d)$ }$ +
+ +

$nick$

+ $if(avatar)$ + + $else$ + + $endif$ + + $if(is_home)$ + + $endif$ + +

contact info

+ $if(contact)$ +
$contact$
+ $else$ +
+ $endif$ +
+ +

bio

+ $if(bio)$ +
$bio$
+ $else$ +
+ $endif$ + + $if(is_home)$ +
+ + $endif$ + +
+
+
+
+ + $else$ +

 

+

 

+

 

+

 

+

 

+

 

+
+

Welcome to dump.fm

+

+ +

Step ❶

+

☟ Find a sweet image for your avatar, paste the URL below ☟

+ $if(avatar)$ + + $else$ + + $endif$ + + $if(is_home)$ +
+
$avatar$
+ + +
+ $endif$ + +

Step ❷

+

☟ Enter some contact info below ☟

+
$contact$
+
+ +

Step ❸

+

☟ Enter some personal info below ☟

+
$bio$
+
+

Step ❹

+ +

Join the ♣ and start posting pictures!

+

 

+

 

+

 

+

 

+

 

+

 

+ $endif$ + +

 

+
+ + $if(next)$ + + $endif$ + +   + $if(prev)$ + + $endif$ + +

+
+ + +
+
+ + diff --git a/template/chat.st b/template/chat.st index a018174..422c640 100644 --- a/template/chat.st +++ b/template/chat.st @@ -60,11 +60,11 @@ $users: { u | $messages: { m |
- $m.nick$: + $m.nick$ $if(m.favorited)$ - + $else$ - + $endif$ $m.content$ diff --git a/template/log_dump.st b/template/log_dump.st index 2f06e81..633338f 100644 --- a/template/log_dump.st +++ b/template/log_dump.st @@ -13,9 +13,9 @@ $else$ $endif$
$if(dump.favorited)$ - + $else$ - + $endif$
$dump.content$
diff --git a/template/profile.st b/template/profile.st index e89a285..2af0072 100644 --- a/template/profile.st +++ b/template/profile.st @@ -66,6 +66,9 @@ $endif$
+ + $nick$'s
Favorite Pix +
diff --git a/template/profile_dump.st b/template/profile_dump.st index b910274..adc47f3 100644 --- a/template/profile_dump.st +++ b/template/profile_dump.st @@ -11,9 +11,9 @@ $else$ $endif$ $if(dump.favorited)$ - + $else$ - + $endif$
$dump.content$
diff --git a/template/tagged_dumps.st b/template/tagged_dumps.st index 037a52b..94b66e7 100644 --- a/template/tagged_dumps.st +++ b/template/tagged_dumps.st @@ -2,7 +2,7 @@ dump.fm - $page_title$ $head()$ - + @@ -31,11 +31,11 @@ $else$ $endif$
$if(next)$ - + $endif$   $if(prev)$ - + $endif$

-- cgit v1.2.3-70-g09d2