diff options
| -rwxr-xr-x | static/css/dump.css | 52 | ||||
| -rwxr-xr-x | static/css/header.css | 18 | ||||
| -rw-r--r-- | static/js/pichat.js | 2 | ||||
| -rw-r--r-- | template/log_dump.st | 9 | ||||
| -rw-r--r-- | template/profile_dump.st | 16 | ||||
| -rw-r--r-- | template/share_buttons.st | 7 |
6 files changed, 71 insertions, 33 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 60da96c..2caa474 100755 --- a/static/css/header.css +++ b/static/css/header.css @@ -287,33 +287,39 @@ img.chat-thumb { padding-right: 15px; } +.logged-dump { + position: relative; +} + /* sharing */ .buttons{ cursor:pointer; - padding-top: 8px; + } .buttons .share { -opacity:0.88; + opacity: 0.7; } .buttons .share:hover { opacity: 1; } .buttons .other-sites { - padding-left: 20px; + /*padding-left: 20px;*/ } -.buttons img.thumb { +img.thumb { position: absolute; margin-left: 0px; margin-top: 0px; height: 16px; width: 16px; + right: 10px; + top: 10px; display: block; } -.buttons .thumb.favorite { +.thumb.favorite { position: absolute; margin-left: 0px; margin-top: 0px; height: 16px; width: 16px; display: block; -}
\ No newline at end of file +} diff --git a/static/js/pichat.js b/static/js/pichat.js index 50dd8b0..5fa079a 100644 --- a/static/js/pichat.js +++ b/static/js/pichat.js @@ -448,7 +448,7 @@ function initLog() { // jesus this logic is ugly function initLogThumb(){ - $(".buttons .thumb").bind('mouseover mouseout', + $(".logged-dump .thumb").bind('mouseover mouseout', function(e) { var favorited = $(this).parents(".dump").hasClass("favorite") ? true : false; if (e.type == "mouseover") { diff --git a/template/log_dump.st b/template/log_dump.st index 155981d..2f06e81 100644 --- a/template/log_dump.st +++ b/template/log_dump.st @@ -12,7 +12,12 @@ $else$ <img height="50" width="50" src="/static/noinfo.png"> $endif$ </div></a> +$if(dump.favorited)$ + <img src="/static/img/thumbs/color.left.gif" class="thumb favorite" onclick="Tag.favorite(this)"> +$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 ff5ff8c..b910274 100644 --- a/template/profile_dump.st +++ b/template/profile_dump.st @@ -4,14 +4,18 @@ </div> <a href="/u/$dump.nick$"> <div id="logavatar"> - - $if(dump.avatar)$ +$if(dump.avatar)$ <img height="50" width="50" src="$dump.avatar$" /> - $else$ +$else$ <img height="50" width="50" src="/static/img/noinfo.png"> - $endif$ - +$endif$ </div></a> +$if(dump.favorited)$ + <img src="/static/img/thumbs/color.left.gif" class="thumb favorite" onclick="Tag.favorite(this)"> +$else$ + <img src="/static/img/thumbs/bw.left.gif" class="thumb" onclick="Tag.favorite(this)"> +$endif$ <div class="content">$dump.content$</div> - $share_buttons()$ +<hr/> +$share_buttons()$ </div> diff --git a/template/share_buttons.st b/template/share_buttons.st index 3f1f472..02736dc 100644 --- a/template/share_buttons.st +++ b/template/share_buttons.st @@ -1,11 +1,4 @@ <div class="buttons"> -$if(dump)$ - $if(dump.favorited)$ - <img src="/static/img/thumbs/color.left.gif" class="thumb favorite" onclick="Tag.favorite(this)"> - $else$ - <img src="/static/img/thumbs/bw.left.gif" class="thumb" onclick="Tag.favorite(this)"> - $endif$ -$endif$ <span class="other-sites"> <img src="/static/img/share/tumblricon.png" class="share" onclick="Share.tumblr(this)"> <img src="/static/img/share/fbbutton.png" class="share" onclick="Share.facebook(this)"> |