diff --git a/styles/app/index.styl b/styles/app/index.styl index a95d1edeea..0c03005a00 100644 --- a/styles/app/index.styl +++ b/styles/app/index.styl @@ -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 */ diff --git a/styles/bootstrap-responsive.styl b/styles/bootstrap-responsive.styl index 2c75e7a585..297945e48b 100644 --- a/styles/bootstrap-responsive.styl +++ b/styles/bootstrap-responsive.styl @@ -89,6 +89,7 @@ .hidden-phone { display: none !important; } + } @media (min-width: 1200px) { diff --git a/styles/ui.styl b/styles/ui.styl index a62c8e62b5..83d86db444 100644 --- a/styles/ui.styl +++ b/styles/ui.styl @@ -1,5 +1,5 @@ .connection { - position: absolute; + position: fixed; text-align: center; top: 0; left: 0; diff --git a/views/app/index.html b/views/app/index.html index f01e42a2a4..80b80d863d 100644 --- a/views/app/index.html +++ b/views/app/index.html @@ -354,10 +354,7 @@ {#if :task.notes} - {#if equal(:task.type,'reward')} - - {else} - + {/} {/} @@ -455,4 +452,4 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); - {/} \ No newline at end of file + {/}