diff options
| -rwxr-xr-x | static/css/dump.css | 52 | ||||
| -rwxr-xr-x | static/css/header.css | 12 | ||||
| -rw-r--r-- | template/chat.st | 10 | ||||
| -rw-r--r-- | template/log_dump.st | 4 | ||||
| -rw-r--r-- | template/profile_dump.st | 1 |
5 files changed, 54 insertions, 25 deletions
diff --git a/static/css/dump.css b/static/css/dump.css index 6c655f5..9d5f838 100755 --- a/static/css/dump.css +++ b/static/css/dump.css @@ -167,11 +167,10 @@ margin-right:374; display:inline-block; width:120px; height:35px; -right:260px; +right:40px; font-size:20px; background-image:url(/static/img/urlbutton.png); text-indent:27; - top:15px; text-align:center; z-index:100; @@ -194,7 +193,7 @@ top:15px; width:120px; height:35px; background-position:center; -right:20; +right:60; top:15px; padding-bottom:1; text-indent:28; @@ -222,7 +221,7 @@ background-image:url(/static/img/cambutton.png); width:120px; height:35px; background-position:center; -right:20; +right:60; top:15px; padding-bottom:4; text-align:center; @@ -286,7 +285,7 @@ border:1px solid #999; width:120px; height:35px; background-position:center; -right:140; +right:180; top:15px; padding-bottom:1; text-indent:24; @@ -334,7 +333,7 @@ opacity:1; display: none; width:40px; height:34px; - right:260px; + right:20px; top:15px; padding-bottom:1; text-align:center; @@ -349,13 +348,33 @@ opacity:1; #palette { position: absolute; right: 30px; - bottom: 80px; - width: 420px; - height: 400px; - background-color: black; + bottom: 76px; + width: auto; +max-width:350; +min-width:150; + height: auto; +max-height:400px; +min-height:150; +padding:20; + background-color: white; z-index: 1000000000; display: none; - overflow-y: scroll; + overflow-y: auto; + box-shadow: 3px 4px 4px #c8cbce; +-webkit-box-shadow: 3px 4px 4px #c8cbce; +-moz-box-shadow: 3px 3px 4px #c8cbce; + border-top-right-radius:5px; + background-color:#FFF; + -webkit-border-top-right-radius:5px; + -moz-border-radius-topleft:5px; + -moz-border-radius-topright:5px; + border-bottom-left-radius:5px; + border-bottom-right-radius:5px; + -webkit-border-bottom-left-radius:5px; + -webkit-border-bottom-right-radius:5px; + -moz-border-radius-bottomleft:5px; + -moz-border-radius-bottomright:5px; +border:1px solid #999; } #palette-thumbs { @@ -363,6 +382,17 @@ opacity:1; #palette-thumbs img { max-width: 100px; +cursor:pointer; +opacity:.9; +padding:1; + max-height: 100px; +} +#palette-thumbs img:hover { + max-width: 100px; +cursor:pointer; +opacity:1; +padding:0; +border:1px solid blue; max-height: 100px; } diff --git a/static/css/header.css b/static/css/header.css index 8c70ff5..2caa474 100755 --- a/static/css/header.css +++ b/static/css/header.css @@ -33,11 +33,7 @@ margin-right:80%; color: #fff; } -#wherestim{ -position:absolute; -top:-10; -left:390; -} + #header7{ background-image:url(/static/img/dblue2.png); @@ -298,10 +294,10 @@ img.chat-thumb { /* sharing */ .buttons{ cursor:pointer; - padding-top: 8px; + } .buttons .share { - opacity: 0.5; + opacity: 0.7; } .buttons .share:hover { opacity: 1; @@ -326,4 +322,4 @@ img.thumb { height: 16px; width: 16px; display: block; -}
\ No newline at end of file +} diff --git a/template/chat.st b/template/chat.st index 4d75df5..a018174 100644 --- a/template/chat.st +++ b/template/chat.st @@ -60,14 +60,14 @@ $users: { u | $messages: { m | <div class="msgDiv oldmsg dump $if(m.favorited)$favorite$endif$" id="message-$m.message_id$" nick="$m.nick$"> <span class="nick"> - <b><a href="/u/$m.nick$">$m.nick$</a></b> + <b><a href="/u/$m.nick$">$m.nick$</a>:</b> $if(m.favorited)$ <img src="/static/img/thumbs/color.right.gif" class="chat-thumb" onclick="Tag.favorite(this)"> $else$ <img src="/static/img/thumbs/pink.circle.gif" class="chat-thumb" onclick="Tag.favorite(this)"> $endif$ </span> - <span class="content">$m.content$<span> + <span class="content">$m.content$</span> </div> }$ <hr /> @@ -76,10 +76,11 @@ $if(user_avatar)$ <div id="msgInputDiv"> <div id="msginputrapper"> <input id="msgInput" class="msgInput" type="input" /> </div> <input id="msgSubmit" type="submit" value="Send"/> - <button id="palette-button"><img src="/static/img/palette.gif"></button> + <input id="upload" value="Upload" type="submit"> <input id="webcam-button-upload" value="Webcam" type="submit"> <input id="webcam-button-snap" value="Send Pic" type="submit" class="invisible blink"> + <button id="palette-button"><img src="/static/img/palette.gif"></button> <div id="trophy"><a href="javascript:pop('http://www.likeneveralways.com/trash/count/index.php');"class="tooltip" title="Contest Counter"><img src="/static/img/trophyicon.gif"></a></div> </div><div id="effects-msg"class="invisible">click on your face for effects!</div> </div> @@ -87,10 +88,11 @@ $else$ <div id="msgInputDiv"> <div id="msginputrapper"> <input id="msgInput" class="msgInput" type="input" /> </div> <input id="msgSubmit" type="submit" value="Send"onClick="showAlert();"/> - <button id="palette-button"><img src="/static/img/palette.gif"></button> + <input id="upload" value="Upload" type="submit"onClick="showAlert();"> <input id="webcam-button-upload" value="Webcam" type="submit"onClick="showAlert();"> <input id="webcam-button-snap" value="Send Pic" type="submit" class="invisible blink" onClick="showAlert();"> + <button id="palette-button"><img src="/static/img/palette.gif"></button> <div id="trophy"><a href="javascript:pop('http://www.likeneveralways.com/trash/count/index.php');"class="tooltip" title="Contest Counter"onClick="showAlert();"><img src="/static/img/trophyicon.gif"></a></div> </div> </div> diff --git a/template/log_dump.st b/template/log_dump.st index 0a6b596..2f06e81 100644 --- a/template/log_dump.st +++ b/template/log_dump.st @@ -18,6 +18,6 @@ $else$ <img src="/static/img/thumbs/bw.left.gif" class="thumb" onclick="Tag.favorite(this)"> $endif$ <div class="content">$dump.content$</div> - <!-- <hr /> --> + <hr /> $share_buttons()$ - </div>
\ No newline at end of file + </div> diff --git a/template/profile_dump.st b/template/profile_dump.st index 31a0ca3..b910274 100644 --- a/template/profile_dump.st +++ b/template/profile_dump.st @@ -16,5 +16,6 @@ $else$ <img src="/static/img/thumbs/bw.left.gif" class="thumb" onclick="Tag.favorite(this)"> $endif$ <div class="content">$dump.content$</div> +<hr/> $share_buttons()$ </div> |