Skip to content

Commit

Permalink
Minor tweaks to design and styles.
Browse files Browse the repository at this point in the history
  • Loading branch information
Dash30 committed Mar 11, 2010
1 parent b575126 commit 44c72aa
Show file tree
Hide file tree
Showing 8 changed files with 129 additions and 213 deletions.
39 changes: 25 additions & 14 deletions webapp/cssjs/style.css
Expand Up @@ -12,7 +12,7 @@ a img {border:none;}

html {
background: #EEEEEA;
font-family: Candara, "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
}

#hd, #ft {padding : 20px 20px 20px 0px;}
Expand Down Expand Up @@ -123,15 +123,7 @@ visibility:visible;



.reply-count {
font-size: 3em;
background-color: #222;
}
.reply-count a:link, .reply-count a:visited {
color: #FFF;
padding: 0 10px;
text-decoration: underline;
}

.individual-tweet:hover h4, individual-tweet:hover form {
visibility: visible;
color : #666;
Expand All @@ -156,9 +148,9 @@ font-size:1.2em;
}
.pic {
float: right;
margin-left: 10px;
margin: 10px 0 10px 10px;
border: 1px solid #CCC;
padding: 5px;
padding: 5px 5px 0px 5px;
}
.error {
background-color:#FF8080;
Expand All @@ -184,9 +176,11 @@ font-weight:bold;
#app-title {float:left;margin-bottom:20px;}
#app-title h1 {font-size: 50px;letter-spacing: -.08em;margin:0;padding:0;line-height:.8em;}
#app-title h2 {font-size: 19px;color: #0060e0;margin:0;padding:0 0 0 10px;line-height:.8em;}
#app-title a:hover h1 {color: #000;}

.thinktank-canvas h1 {color: #666;font-size:1.6em;font-weight:700;margin:0;padding:0 0 0 35px;}
.thinktank-canvas h4 {color: #000;line-height:1em;font-size:1em;font-weight:700;margin:0;padding:0 0 10px 35px;}
.thinktank-canvas h1.user {margin:0;padding:0;}

.bt {border-top: 1px solid #CCC;}
.br {border-right: 1px solid #CCC;}
Expand Down Expand Up @@ -263,7 +257,7 @@ top: -20px;
.key-stat h1 {font-size: 1.7em;font-weight:700;letter-spacing:-4px}
.key-stat h3 {font-size: .8;font-weight:500;}


/* numbers */
.big-number {
color: #000;
font-size: 1.7em;
Expand All @@ -278,9 +272,26 @@ margin: 0;
}
.big-number h3 {
color: #666;
font-size: .8em;
}
.reply-count {
font-size: 24px;
font-weight: bold;
background-color: #222;
padding: 10px;
display:block;
margin-top:2px;
text-align:center;
line-height: 1.8em;
}
.reply-count a:link, .reply-count a:visited {
color: #FFF;
text-decoration: underline;
}


.tweet {
font-size: 2em;
font-size: 1.6em; /* knocked down from 2em */
line-height: 1.1em;
}

Expand Down
10 changes: 5 additions & 5 deletions webapp/templates/_status.mine.tpl
Expand Up @@ -5,8 +5,8 @@
<div class="grid_3 right">date</div>

<div class="grid_10">post</div>
<div class="grid_2 right">replies</div>
<div class="grid_2 right omega">retweets</div>
<div class="grid_2 center">replies</div>
<div class="grid_2 center omega">retweets</div>
</div>
{/if}

Expand All @@ -26,14 +26,14 @@

<p>{$t->tweet_html|link_usernames} {if $t->in_reply_to_status_id}[<a href="{$cfg->site_root_path}status/?t={$t->in_reply_to_status_id}">in reply to</a>]{/if}</p>

{if $t->link->expanded_url}<ul><li><a href="{$t->link->expanded_url}" title="{$t->link->expanded_url}">{$t->link->title}</a></li></ul>{/if}
{if $t->link->expanded_url}<ul><li><a href="{$t->link->expanded_url}" title="{$t->link->expanded_url}" target="_blank">{if $t->link->title neq ''}{$t->link->title}{else}{$t->link->expanded_url}{/if}</a></li></ul>{/if}

{if $t->location}<br />[location: {$t->location}]{/if}
</div>
<div class="grid_2 right">
<div class="grid_2 center">
{if $t->mention_count_cache > 0}<span class="reply-count"><a href="{$cfg->site_root_path}status/?t={$t->status_id}">{$t->mention_count_cache}<!-- repl{if $t->mention_count_cache eq 1}y{else}ies{/if}--></a></span>{else}&nbsp;{/if}
</div>
<div class="grid_2 right omega">
<div class="grid_2 center omega">
{if $t->retweet_count_cache > 0}<span class="reply-count"><a href="{$cfg->site_root_path}status/?t={$t->status_id}">{$t->retweet_count_cache}<!-- retweet{if $t->retweet_count_cache eq 1}{else}s{/if}--></a></span>{else}&nbsp;{/if}
</div>

Expand Down
36 changes: 16 additions & 20 deletions webapp/templates/_status.otherorphan.tpl
@@ -1,11 +1,11 @@
{if $smarty.foreach.foo.first}
<div class="header clearfix">
<div class="grid_2 alpha">&nbsp;</div>
<div class="grid_3 right">name</div>
<div class="grid_3 right">followers</div>
<div class="header clearfix">
<div class="grid_2 alpha">&nbsp;</div>
<div class="grid_3 right">name</div>
<div class="grid_3 right">followers</div>
<div class="grid_3 right">date</div>
<div class="grid_11 omega">post</div>
</div>
<div class="grid_11 omega">post</div>
</div>
{/if}

<div class="individual-tweet clearfix{if $t->is_protected} private{/if}">
Expand All @@ -21,32 +21,28 @@
<div class="grid_3 right small">
<a href="{$cfg->site_root_path}status/?t={$t->status_id}">{$t->adj_pub_date|relative_datetime}</a>
</div>

<div class="grid_11 omega">

<div class="tweet-body">
{if $t->link->is_image}<a href="{$t->link->url}"><img src="{$t->link->expanded_url}" style="float:right;background:#eee;padding:5px" /></a>{/if}

<p>{$t->tweet_html|regex_replace:"/^@[a-zA-Z0-9_]+/":""|link_usernames}{if $t->in_reply_to_status_id} <a href="{$cfg->site_root_path}status/?t={$t->in_reply_to_status_id}">in reply to</a> {/if}</p>

{if $t->link->expanded_url}<a href="{$t->link->expanded_url}" title="{$t->link->expanded_url}">{$t->link->title}</a>{/if}

{if $t->author->location}<div class="small gray">Location: {$t->author->location}</div>{/if}
{if $t->author->description}<div class="small gray">Description: {$t->author->description}</div>{/if}


{$a->status_id}

<div id="div{$t->status_id}">
<form action="" class="tweet-setparent">
<select name="pid{$t->status_id}" id="pid{$t->status_id}" onselect>
<option disabled="disabled">Is in reply to...</option>
<option value="0">No particular tweet (standalone)</option>
{foreach from=$all_tweets key=aid item=a}
<option value="{$a->status_id}">{$a->tweet_html|truncate_for_select}</option>
{/foreach}
</select>
{include file='_status.selectparent.tpl' t=$t all_tweets=$all_tweets tweet=$t->in_reply_to_status_id|tweet_from_id}
<input type="submit" name="submit" class="button" id="{$t->status_id}" value="Save" />
</form>
</div>

</div>

</div>
Expand Down
4 changes: 2 additions & 2 deletions webapp/templates/_status.public.tpl
Expand Up @@ -30,10 +30,10 @@
{if $t->author->location}<div class="small gray">Location: {$t->author->location}</div>{/if}
</div>
<div class="grid_2 center">
{if $t->mention_count_cache > 0}<span class="reply-count"><a href="{$site_root}public.php?t={$t->status_id}">{$t->mention_count_cache}<!-- repl{if $t->mention_count_cache eq 1}y{else}ies{/if}--></a></span>{else}&nbsp;{/if}
{if $t->mention_count_cache > 0}<div class="reply-count"><a href="{$site_root}public.php?t={$t->status_id}">{$t->mention_count_cache}<!-- repl{if $t->mention_count_cache eq 1}y{else}ies{/if}--></a></div>{else}&nbsp;{/if}
</div>
<div class="grid_2 center omega">
{if $t->retweet_count_cache > 0}<span class="reply-count"><a href="{$site_root}public.php?t={$t->status_id}">{$t->retweet_count_cache}<!-- retweet{if $t->retweet_count_cache eq 1}{else}s{/if}--></a></span>{else}&nbsp;{/if}
{if $t->retweet_count_cache > 0}<div class="reply-count"><a href="{$site_root}public.php?t={$t->status_id}">{$t->retweet_count_cache}<!-- retweet{if $t->retweet_count_cache eq 1}{else}s{/if}--></a></div>{else}&nbsp;{/if}
</div>


Expand Down
5 changes: 3 additions & 2 deletions webapp/templates/_status.qa.tpl
Expand Up @@ -16,7 +16,8 @@
<a href="{$cfg->site_root_path}user/?u={$r.questioner}&i={$i->twitter_username}">{if $r.questioner eq $instance->twitter_username}You{else}{$r.questioner}{/if}</a>
</div>
<div class="grid_3 right small">
{$t->follower_count|number_format}
{$t->follower_count|number_format}???

</div>
<div class="grid_3 right small">
<a href="{$cfg->site_root_path}status/?t={$r.status_id}">{$r->question_adj_pub_date|relative_datetime}</a>
Expand All @@ -37,7 +38,7 @@
<div class="grid_3 alpha small">
<a href="{$cfg->site_root_path}user/?u={$r.answerer}&i={$i->twitter_username}">{if $r.answerer eq $instance->twitter_username}You{else}{$r.answerer}{/if}</a>
</div>
<div class="grid_3 right small">&nbsp;
<div class="grid_3 right small">&nbsp;???
</div>
<div class="grid_3 right small">
<a href="{$cfg->site_root_path}status/?t={$r.status_id}">{$r.answer_adj_pub_date|relative_datetime}</a>
Expand Down
106 changes: 0 additions & 106 deletions webapp/templates/public.tpl
@@ -1,106 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<title>ThinkTank Public Timeline</title>

<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="{$cfg->site_root_path}favicon.ico"/>

<link type="text/css" href="{$cfg->site_root_path}cssjs/jquery-ui-1.7.1.custom.css" rel="stylesheet" />
<link type="text/css" href="{$cfg->site_root_path}cssjs/style.css" rel="stylesheet" />

</head>

<body>

{include file="_header.login.tpl" mode="public"}

<div class="thinktank-canvas round-all container_24">
<div class="clearfix prepend_20">

<div class="grid_22 push_1 clearfix">

{if $tweet and ($replies OR $retweets) }

<div class="prepend_20">
<ul id="menu">
<!-- <li>Archived and Curated with <a href="http://thinktankapp.com">ThinkTank</a></li> -->
<li><a href="{$site_root}public.php">&larr; Back to the public timeline</a></li>
</ul>
</div>

<div class="clearfix">
{if $retweets}<div class="grid_15 alpha">{else}<div class="grid_22">{/if}
<a href="http://twitter.com/{$tweet->author_username}/"><img src="{$tweet->author_avatar}" class="avatar2"></a>
<span class="tweet">{$tweet->tweet_html|link_usernames_to_twitter}</span>
<div class="small">(<a href="http://twitter.com/{$tweet->author_username}/">{$tweet->author_username}</a>,
<a href="http://twitter.com/{$tweet->author_username}/status/{$tweet->status_id}/">{$tweet->pub_date|relative_datetime}</a>)</div>
</div>
{if $retweets}
<div class="grid_7 center big-number omega">
<div class="bl">
<div class="key-stat">
<h1>{$rtreach|number_format}</h1>
<h3>retweets to followers</h3>
</div>
</div>
</div>
{/if}
</div>

{if $replies}
<div class="append_20 clearfix">
{foreach from=$replies key=tid item=t name=foo}
{include file="_status.public.tpl" t=$t}
{/foreach}
</div>
{/if}
{if $retweets}
<div class="append_20 clearfix">
<!--<h3 align="center">Retweets to {$rtreach|number_format} followers</h3>-->
{foreach from=$retweets key=tid item=t name=foo}
{include file="_status.public.tpl" t=$t}
{/foreach}
</div>
{/if}


{else}

<div class="prepend_20">
<ul id="menu">
<li><a href="{$cfg->site_root_path}public.php">Latest</a></li>
<li><a href="{$cfg->site_root_path}public.php?v=mostreplies">Most Replied-To</a></li>
<li><a href="{$cfg->site_root_path}public.php?v=mostretweets">Most Retweeted</a></li>
<li><a href="{$cfg->site_root_path}public.php?v=photos">Photos</a></li>
<li><a href="{$cfg->site_root_path}public.php?v=links">Links</a></li>
</ul>
</div>

{/if}

{if $header}<h1>{$header}</h1>{/if}
{if $description}<h4>{$description}</h4>{/if}

{if $tweets}
{foreach from=$tweets key=tid item=t name=foo}
{include file="_status.public.tpl" t=$t}
{/foreach}
{/if}

</div>

</div> <!-- #top -->
</div> <!-- .thinktank-canvas -->

<script type="text/javascript" src="{$cfg->site_root_path}cssjs/linkify.js"></script>

<div id="footer" class="center prepend append clearfix">
<p>Set up your own <a href="http://thinktankapp.com">ThinkTank</a>.<br />It is nice to be nice</p>
</div>

</div> <!-- #content -->

</body>
</html>

0 comments on commit 44c72aa

Please sign in to comment.