Merge pull request #227 from SlappyBag/master

Static Header & Popups
This commit is contained in:
Tyler Renelle 2013-01-28 17:06:50 -08:00
commit c2cd3d8498
4 changed files with 12 additions and 8 deletions

View file

@ -17,6 +17,13 @@ html,body,p,h1,ul,li,table,tr,th,td
box-shadow: inset 0 1px #f7f7f7, 0 1px #888, 0 2px #e7e7e7
padding: 12px 16px
white-space: nowrap
position:fixed
width: 100%;
#head .pull-right{
margin-right: 2%
margin-left: 1%
}
.color-worst pre
background-color: rgb(230, 184, 175)
@ -176,7 +183,6 @@ li:hover .task-meta-controls .hover-show
/* Bootstrap website boilerplate */
.footer {
padding: 70px 0;
margin-top: 70px;
border-top: 1px solid #e5e5e5;
background-color: #f5f5f5;
}
@ -194,7 +200,7 @@ li:hover .task-meta-controls .hover-show
/* Customizations to make footer sticky */
/*html, body {height: 100%;}*/
#wrap {min-height: 100%;}
#wrap {min-height: 100%; margin-top:130px; z-index:-1}
#main
/*overflow:auto;*/
padding-bottom: 250px; /* don't know why this works, sticky footers are weird */

View file

@ -89,6 +89,7 @@
.hidden-phone {
display: none !important;
}
}
@media (min-width: 1200px) {

View file

@ -1,5 +1,5 @@
.connection {
position: absolute;
position: fixed;
text-align: center;
top: 0;
left: 0;

View file

@ -354,10 +354,7 @@
</div>
{#if :task.notes}
{#if equal(:task.type,'reward')}
<span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
{else}
<span rel="popover" data-trigger="hover" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
<span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
{/}
{/}
</div>
@ -455,4 +452,4 @@
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
{/}
{/}