# HG changeset patch # User Yves-Marie Haussonne <1218002+ymph@users.noreply.github.com> # Date 1319560028 -7200 # Node ID d60efd677b503c79d50463f011383ec3f9fc8081 # Parent 1a77b44dfa7d2406a4389c9bed5ca1e113f37ca6# Parent 5f83c21dee69a205a9c67fe5a50043225c1b61fa Merge with 9321f0a58b041ce1db18e2437be94be4677de391 diff -r 1a77b44dfa7d -r d60efd677b50 tweetcast/nodejs/client/css/style.css --- a/tweetcast/nodejs/client/css/style.css Tue Oct 25 18:26:39 2011 +0200 +++ b/tweetcast/nodejs/client/css/style.css Tue Oct 25 18:27:08 2011 +0200 @@ -28,33 +28,45 @@ /* Liste de Tweets */ #tweetlist { - position: absolute; left: 50px; top: 50px; width: 240px; height: 600px; list-style: none; overflow: hidden; border: 1px solid #999; + position: absolute; left: 50px; top: 50px; width: 250px; height: 600px; list-style: none; border: 1px solid #999; +} + +li.tweet, li.placeholder { + border: 1px solid; overflow: hidden; float: left; margin: -1px 0 0 -1px; border-color: #ccc; } li.tweet { - border-width: 1px; border-style: none solid solid none; border-color: #ccc; overflow: hidden; float: left; + position: relative; background: #fff; } -li.tweet.full { - width: 240px; height: 99px; +li.full { + width: 240px; height: 119px; border-right: 10px solid #ff0; +} + +li.half { + width: 250px; height: 49px; } -li.tweet.half { - width: 240px; height: 49px; +li.quarter { + width: 124px; height: 44px; } -li.tweet.quarter { - width: 119px; height: 49px; +li.icons { + width: 24px; height: 24px; } -li.tweet.icons { - width: 29px; height: 29px; +li.placeholder { + height: 0; visibility: hidden; } .tweet h4 { font-weight: bold; } +.quarter p { + word-break: break-all; +} + .full h4, .full p, .half p { margin: 5px; } @@ -68,55 +80,94 @@ } .quarter p { - font-size: 10px; margin: 2px 2px 2px 28px; + margin: 2px; font-size: 10px; } -img.tweet_profile_image { - float: left; opacity: .7; filter:alpha(opacity=70); +img.profile_image { + float: left; } -.full .tweet_profile_image { +.full .profile_image { margin: 5px; width: 48px; height: 48px; } -.half .tweet_profile_image { +.half .profile_image { margin: 5px; width: 39px; height: 39px; } -.quarter .tweet_profile_image { - margin: 2px; width: 25px; height: 25px; +.quarter .profile_image { + margin: 2px; width: 22px; height: 22px; } - .icons .tweet_profile_image { - margin: 3px; width: 23px; height: 23px; +.icons .profile_image { + margin: 2px; width: 20px; height: 20px; } -p.tweet_created_at { +.full .created_at { font-style: italic; color: #999; } -.half h4, .half p.tweet_created_at, .quarter h4, .quarter p.tweet_created_at, .icons h4, .icons p { +.half h4, .half p.created_at, .quarter h4, .quarter p.created_at, .icons h4, .icons p { display: none } -.a_positive { - background: #c5e7cd; +.full .tweet_text { + clear: left; +} + +.annotations { + position: absolute; margin: 0; padding: 0; top: 0; left: 0; width: 100%; height: 100%; +} + +/*.icons .annotations { + position: absolute; width: 6px; height: 6px; right: 2px; bottom: 2px; border: 1px solid #ccc; z-index: 3; +}*/ + +div.annotation { + float: left; height: 100%; +} + +div.twmain { + position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 2; overflow: hidden; +} + +.full .twmain { } -.a_negative { - background: #f6ced0; +.half .twmain { + opacity: .9 +} + +.half.fade .twmain { + opacity: .8 } -.a_reference { - background: #ecedc1; +.quarter .twmain { + opacity: .7 } -.a_question { - background: #bfdbec; +.quarter.fade .twmain { + opacity: .6 +} + +.icons .twmain { + opacity: .5 +} + +.icons.fade .twmain { + opacity: .4 } /* timeline */ +#timeline, #timewindow { + position: absolute; top: 50px; left: 301px; height: 600px; width: 220px; border: 1px solid #999; +} + #timeline { - position: absolute; top: 50px; left: 291px; height: 600px; width: 160px; border: 1px solid #999; + z-index: 42 +} + +#timewindow { + z-index: 47 } \ No newline at end of file diff -r 1a77b44dfa7d -r d60efd677b50 tweetcast/nodejs/client/index.html --- a/tweetcast/nodejs/client/index.html Tue Oct 25 18:26:39 2011 +0200 +++ b/tweetcast/nodejs/client/index.html Tue Oct 25 18:27:08 2011 +0200 @@ -4,20 +4,17 @@
Niveau de zoom (liste de tweets) 1 - 2 - 3 - 4
-Niveau de zoom (timeline) 1 - 2 - 3 - 4
-