From 24bde808eb428c9ae0bd57c1398711db8a365b65 Mon Sep 17 00:00:00 2001 From: Stan Lindsey Date: Sat, 26 Jan 2013 12:22:15 +0000 Subject: [PATCH 1/9] Static Header .head = position fixed .wrap = relative, top 130px, z-index -1 --- styles/app/index.styl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/styles/app/index.styl b/styles/app/index.styl index 9f13938e5f..61945b8ab0 100644 --- a/styles/app/index.styl +++ b/styles/app/index.styl @@ -17,6 +17,7 @@ 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 .color-worst pre background-color: rgb(230, 184, 175) @@ -183,7 +184,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%; position: relative; top:130px; z-index:-1} #main /*overflow:auto;*/ padding-bottom: 250px; /* don't know why this works, sticky footers are weird */ From 0a4fbe80cdf74cfe7a33cd6ecebae98085fab915 Mon Sep 17 00:00:00 2001 From: Stan Lindsey Date: Sat, 26 Jan 2013 12:23:24 +0000 Subject: [PATCH 2/9] Connection follows browswer --- styles/ui.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From da3c0f1a2d6f3410e625b45e72baa61858f40657 Mon Sep 17 00:00:00 2001 From: Stan Lindsey Date: Sat, 26 Jan 2013 13:15:57 +0000 Subject: [PATCH 3/9] All popups on left --- views/app/index.html | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/views/app/index.html b/views/app/index.html index 0d3c894633..929b0f863c 100644 --- a/views/app/index.html +++ b/views/app/index.html @@ -346,10 +346,7 @@ {#if :task.notes} - {#if equal(:task.type,'reward')} - - {else} - + {/} {/} @@ -447,4 +444,4 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); - {/} \ No newline at end of file + {/} From 4b87888b495b4b140190afa6f29ec697aaa270dd Mon Sep 17 00:00:00 2001 From: Stan Lindsey Date: Mon, 28 Jan 2013 07:22:56 +0000 Subject: [PATCH 4/9] Replace relative with margin top --- styles/app/index.styl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/styles/app/index.styl b/styles/app/index.styl index 61945b8ab0..67896f4050 100644 --- a/styles/app/index.styl +++ b/styles/app/index.styl @@ -166,7 +166,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; } @@ -184,7 +183,7 @@ li:hover .task-meta-controls .hover-show /* Customizations to make footer sticky */ /*html, body {height: 100%;}*/ -#wrap {min-height: 100%; position: relative; top:130px; z-index:-1} +#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 */ From ad3221a846891cf6e9937e8fd649bdfb5e743d99 Mon Sep 17 00:00:00 2001 From: Stan Lindsey Date: Mon, 28 Jan 2013 22:56:14 +0000 Subject: [PATCH 5/9] Update styles/app/index.styl --- styles/app/index.styl | 1 + 1 file changed, 1 insertion(+) diff --git a/styles/app/index.styl b/styles/app/index.styl index 67896f4050..096f741343 100644 --- a/styles/app/index.styl +++ b/styles/app/index.styl @@ -18,6 +18,7 @@ html,body,p,h1,ul,li,table,tr,th,td padding: 12px 16px white-space: nowrap position:fixed + width: 100%; .color-worst pre background-color: rgb(230, 184, 175) From 858c2dded7c31b938b65bea7c9c01c44ed842244 Mon Sep 17 00:00:00 2001 From: Stan Lindsey Date: Mon, 28 Jan 2013 23:36:25 +0000 Subject: [PATCH 6/9] Update styles/bootstrap-responsive.styl --- styles/bootstrap-responsive.styl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/styles/bootstrap-responsive.styl b/styles/bootstrap-responsive.styl index 2c75e7a585..2198d8c5da 100644 --- a/styles/bootstrap-responsive.styl +++ b/styles/bootstrap-responsive.styl @@ -89,6 +89,7 @@ .hidden-phone { display: none !important; } + } @media (min-width: 1200px) { @@ -439,6 +440,10 @@ .row-fluid .thumbnails { margin-left: 0; } + #head .pull-right { + margin-right: 2% + margin-left: 1% + } } @media (min-width: 768px) and (max-width: 979px) { @@ -780,6 +785,10 @@ .uneditable-input.span1 { width: 28px; } + #head .pull-right{ + margin-right: 2% + margin-left: 1% + } } @media (max-width: 767px) { @@ -878,6 +887,11 @@ .modal.fade.in { top: 20px; } + #head .pull-right{ + margin-right: 2% + margin-left: 1% + } + } @media (max-width: 480px) { From 6e4d14d64f718fd9beba2f3c9508c868a94a5285 Mon Sep 17 00:00:00 2001 From: Stan Lindsey Date: Mon, 28 Jan 2013 23:39:10 +0000 Subject: [PATCH 7/9] Update styles/bootstrap-responsive.styl --- styles/bootstrap-responsive.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/bootstrap-responsive.styl b/styles/bootstrap-responsive.styl index 2198d8c5da..5de91b5568 100644 --- a/styles/bootstrap-responsive.styl +++ b/styles/bootstrap-responsive.styl @@ -888,7 +888,7 @@ top: 20px; } #head .pull-right{ - margin-right: 2% + margin-right: 3% margin-left: 1% } From 9ef4236bb788e638a352b24147e57e98d959d15c Mon Sep 17 00:00:00 2001 From: Stan Lindsey Date: Tue, 29 Jan 2013 00:22:22 +0000 Subject: [PATCH 8/9] Removed edits --- styles/bootstrap-responsive.styl | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/styles/bootstrap-responsive.styl b/styles/bootstrap-responsive.styl index 5de91b5568..297945e48b 100644 --- a/styles/bootstrap-responsive.styl +++ b/styles/bootstrap-responsive.styl @@ -440,10 +440,6 @@ .row-fluid .thumbnails { margin-left: 0; } - #head .pull-right { - margin-right: 2% - margin-left: 1% - } } @media (min-width: 768px) and (max-width: 979px) { @@ -785,10 +781,6 @@ .uneditable-input.span1 { width: 28px; } - #head .pull-right{ - margin-right: 2% - margin-left: 1% - } } @media (max-width: 767px) { @@ -887,11 +879,6 @@ .modal.fade.in { top: 20px; } - #head .pull-right{ - margin-right: 3% - margin-left: 1% - } - } @media (max-width: 480px) { From 29387b9c037fadd5dde45def8c96432c1b87a7d3 Mon Sep 17 00:00:00 2001 From: Stan Lindsey Date: Tue, 29 Jan 2013 00:22:43 +0000 Subject: [PATCH 9/9] Update styles/app/index.styl --- styles/app/index.styl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/styles/app/index.styl b/styles/app/index.styl index 096f741343..ee6576c8fd 100644 --- a/styles/app/index.styl +++ b/styles/app/index.styl @@ -20,6 +20,11 @@ html,body,p,h1,ul,li,table,tr,th,td position:fixed width: 100%; +#head .pull-right{ + margin-right: 2% + margin-left: 1% + } + .color-worst pre background-color: rgb(230, 184, 175) .color-worse pre