Skip to content

Commit

Permalink
Minor visual tweaks
Browse files Browse the repository at this point in the history 
* Hide collapse button when only one post
* Convert tabs to spaces squash
  • Loading branch information
@suth @ginatrapani
suth authored and ginatrapani committed Jul 19, 2012
1 parent b22f752 commit 4baa9e1
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 42 deletions.
45 changes: 26 additions & 19 deletions webapp/_lib/view/_header.tpl
View file
Expand Up @@ -20,29 +20,36 @@
<link href="./assets/css/bootstrap.css" rel="stylesheet">
<style>
{literal}
.detail-btn {
margin-top : -18px;
.insight-item {
position: relative;
}
.detail-btn {
position: absolute;
top: 14px;
right: 14px;
z-index: 999;
}
.metaroll {
color : #999;
display : inline;
font-size : small;
line-height : 100%;
color : #999;
display : inline;
font-size : small;
line-height : 100%;
}
.label {
padding: 1px 4px 2px;
-webkit-border-radius: 1px;
-moz-border-radius: 1px;
border-radius: 1px;
}
.lead {
padding-left : 75px;
margin-right : 50px;
}
.label {
padding: 1px 4px 2px;
-webkit-border-radius: 1px;
-moz-border-radius: 1px;
border-radius: 1px;
}
.lead {
padding-left : 75px;
margin-right : 50px;
}
{/literal}
</style>
Expand Down
2 changes: 1 addition & 1 deletion webapp/_lib/view/_insights.count_history.tpl
View file
Expand Up @@ -2,7 +2,7 @@
<i class="icon-star-empty"></i>
{$i->text}

<div class="pull-right detail-btn"><button class="btn-mini" data-toggle="collapse" data-target="#chart-{$i->id}"><i class="icon-signal"></i></button></div>
<div class="pull-right detail-btn"><button class="btn btn-mini" data-toggle="collapse" data-target="#chart-{$i->id}"><i class="icon-signal"></i></button></div>

<div class="collapse in" id="chart-{$i->id}">

Expand Down
2 changes: 1 addition & 1 deletion webapp/_lib/view/_insights.post.tpl
View file
Expand Up @@ -57,7 +57,7 @@

{if $i->slug eq 'geoencoded_replies'}

<div class="pull-right detail-btn"><button class="btn-minid detail-btn" data-toggle="collapse" data-target="#map-{$i->id}"><i class="icon-map-marker"></i></button></div>
<div class="pull-right detail-btn"><button class="btn btn-mini detail-btn" data-toggle="collapse" data-target="#map-{$i->id}"><i class="icon-map-marker"></i></button></div>
<div class="collapse in" id="map-{$i->id}">
<script type="text/javascript" src="{$site_root_path}plugins/geoencoder/assets/js/iframe.js"></script>
<iframe width="680" frameborder="0" src="{$site_root_path}plugins/geoencoder/map.php?pid={$post->post_id}&n=twitter&t=post" name="childframe" id="childframe" >
Expand Down
6 changes: 3 additions & 3 deletions webapp/_lib/view/_insights.posts.tpl
View file
Expand Up @@ -17,12 +17,12 @@
{include file="_insights.post.tpl" post=$p hide_insight_header='1'}

{* Show more link if there are more posts after the first one *}
{if $smarty.foreach.bar.total gt 0 and $smarty.foreach.bar.first}
<div class="pull-right detail-btn"><button class="btn-mini" data-toggle="collapse" data-target="#flashback-{$i->id}"><i class=" icon-chevron-down"></i></button></div>
{if $smarty.foreach.bar.total gt 1 and $smarty.foreach.bar.first}
<div class="pull-right detail-btn"><button class="btn btn-mini" data-toggle="collapse" data-target="#flashback-{$i->id}"><i class=" icon-chevron-down"></i></button></div>
{/if}

{* Close up hidden div if there is one *}
{if $smarty.foreach.bar.total gt 0 and $smarty.foreach.bar.last}
{if $smarty.foreach.bar.total gt 1 and $smarty.foreach.bar.last}
</div>
{/if}

Expand Down
36 changes: 18 additions & 18 deletions webapp/assets/css/bootstrap.css
View file
Expand Up @@ -2694,18 +2694,19 @@ input[type="submit"].btn.btn-mini {

-moz-border-radius: 2px;
-webkit-border-radius: 2px;
box-shadow: 0 1px 0 #fff;
border-radius: 2px;
margin-bottom: 20px;
padding: 1px; /* fake a gradient border with the above background and a single pixel of padding */
}
.sidebar-nav ul{
background: #cacacb; /* starting color */
background: #e2e2e2; /* ending color */
background: -moz-linear-gradient(top, #cacacb 0%, #e2e2e2 100%);
background: -webkit-linear-gradient(top, #cacacb 0%,#e2e2e2 100%);
background: -ms-linear-gradient(top, #cacacb 0%,#e2e2e2 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#cacacb', endColorstr='#e2e2e2',GradientType=0 );
background: linear-gradient(top, #cacacb 0%,#e2e2e2 100%);
background: #e2e2e2; /* starting color */
background: #cacaca; /* ending color */
background: -moz-linear-gradient(top, #e2e2e2 0%, #cacaca 100%);
background: -webkit-linear-gradient(top, #e2e2e2 0%,#cacaca 100%);
background: -ms-linear-gradient(top, #e2e2e2 0%,#cacaca 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e2e2e2', endColorstr='#cacaca',GradientType=0 );
background: linear-gradient(top, #e2e2e2 0%,#cacaca 100%);

-moz-border-radius: 2px;
border-radius: 2px;
Expand All @@ -2718,6 +2719,7 @@ input[type="submit"].btn.btn-mini {
font-weight: bold;
height: 24px;
padding: 8px 0 0 16px;
text-shadow: rgba(255,255,255,0.5) 0 1px 0;
}
/* no top rule on the first nav element or bottom rule on the last nav element */
.sidebar-nav ul li:first-child{
Expand Down Expand Up @@ -3062,7 +3064,6 @@ input[type="submit"].btn.btn-mini {
line-height: 19px;
color: #00aeef;
text-decoration: none;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
}
.navbar .btn {
display: inline-block;
Expand Down Expand Up @@ -3405,7 +3406,7 @@ a.thumbnail:hover {
padding: 9px;
}
.alert {
padding: 8px 35px 8px 14px;
padding: 8px 14px;
margin-bottom: 18px;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
background-color: #d5f0fc;
Expand All @@ -3414,7 +3415,7 @@ a.thumbnail:hover {
-moz-border-radius: 1px;
-webkit-border-radius: 1px;
border-radius: 1px;
box-shadow: 0 0 4px rgba(0,0,0,0.4);
box-shadow: 0 1px 2px rgba(0,0,0,0.3);
color: #000;
}

Expand Down Expand Up @@ -3456,7 +3457,7 @@ a.thumbnail:hover {
}

.alert strong {
color : #666;
color : #666;
}

@-webkit-keyframes progress-bar-stripes {
Expand Down Expand Up @@ -3671,18 +3672,17 @@ a.thumbnail:hover {
}

footer {
background : #7D7D7D;
margin-top : 40px;
color : #DADAD8;
background : #7D7D7D;
margin-top : 40px;
color : #DADAD8;
}

.footer {
margin-top : 20px;
padding : 40px 20px 60px 20px;
width : 100%;
margin-top : 20px;
padding : 40px 20px 60px 20px;
width : 100%;
}


.tooltip {
position: absolute;
z-index: 1020;
Expand Down

0 comments on commit 4baa9e1

Please sign in to comment.