From 5db4a2ff60bb822a319f23e2b3d47771a021cfce Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 7 Apr 2015 17:15:27 +0200 Subject: [PATCH 1/3] remove padding because it breaks things --- app/styles/app/layouts/footer.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/app/layouts/footer.sass b/app/styles/app/layouts/footer.sass index 36896cf7..951c5665 100644 --- a/app/styles/app/layouts/footer.sass +++ b/app/styles/app/layouts/footer.sass @@ -25,7 +25,7 @@ footer height: auto @media (min-width: 640px) .wrapper - padding-bottom: 244px //footer height plus some extra padding + padding-bottom: 204px footer margin-top: -204px From f3543bf2255814aa9f4d4a0ad4eeee06e0556e61 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 7 Apr 2015 17:49:04 +0200 Subject: [PATCH 2/3] trying to fix sticky footer in safari by unifing markup --- app/styles/app/layouts/footer.sass | 10 +++++----- app/styles/app/modules/tabs.sass | 2 +- app/templates/layouts/dashboard.hbs | 19 ++++++++++--------- app/templates/layouts/profile.hbs | 22 ++++++++++++---------- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/app/styles/app/layouts/footer.sass b/app/styles/app/layouts/footer.sass index 951c5665..982ebbdb 100644 --- a/app/styles/app/layouts/footer.sass +++ b/app/styles/app/layouts/footer.sass @@ -2,6 +2,8 @@ * Footer on the dashboard */ +$footer-height: 204px + a color : $color-link text-decoration : none @@ -25,11 +27,11 @@ footer height: auto @media (min-width: 640px) .wrapper - padding-bottom: 204px + padding-bottom: $footer-height + 50 footer - margin-top: -204px - min-height: 204px + margin-top: - $footer-height + min-height: $footer-height footer h3 font-size : 15px @@ -87,5 +89,3 @@ footer a:active .status-circle.major background: #e74c3c -.wrapper:not(.centered) ~ footer - display: none diff --git a/app/styles/app/modules/tabs.sass b/app/styles/app/modules/tabs.sass index 0bb9bbbd..c0a02746 100644 --- a/app/styles/app/modules/tabs.sass +++ b/app/styles/app/modules/tabs.sass @@ -25,7 +25,7 @@ content: "" position: absolute left: 0 - bottom: -4px + bottom: -0.25em width: 100% height: 2px background-color: $teal2 diff --git a/app/templates/layouts/dashboard.hbs b/app/templates/layouts/dashboard.hbs index ebbffe2c..c1a87f20 100644 --- a/app/templates/layouts/dashboard.hbs +++ b/app/templates/layouts/dashboard.hbs @@ -1,14 +1,15 @@ -
-
-
+
+
+
{{render "top"}} -
+
+
+
{{yield}} -
- -
- {{render "footer"}} -
+ +
+ {{render "footer"}} +
diff --git a/app/templates/layouts/profile.hbs b/app/templates/layouts/profile.hbs index 47623eb8..027246bc 100644 --- a/app/templates/layouts/profile.hbs +++ b/app/templates/layouts/profile.hbs @@ -1,15 +1,17 @@ -
+
+
+
+ {{render "top"}} +
+
+
- {{render "top"}} -
-
+ {{render "flash"}} +
+ {{yield}} -
- {{render "flash"}} -
- {{yield}} - - {{outlet "left"}} + {{outlet "left"}} +
From c0599de54f50fea397e11601218509fa6ff5b304 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 7 Apr 2015 18:03:22 +0200 Subject: [PATCH 3/3] hopefully fix sticky footer in safari --- app/styles/app/layout.sass | 2 ++ app/templates/layouts/home.hbs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/styles/app/layout.sass b/app/styles/app/layout.sass index 5d455793..61fe2bd9 100644 --- a/app/styles/app/layout.sass +++ b/app/styles/app/layout.sass @@ -47,11 +47,13 @@ .wrapper overflow: hidden +.wrapper.non-centered #main, #left margin-bottom: -99999px padding-bottom: 100034px + @media #{$large-up} #left, #right, .wrapper-main diff --git a/app/templates/layouts/home.hbs b/app/templates/layouts/home.hbs index d26758de..cb1e693f 100644 --- a/app/templates/layouts/home.hbs +++ b/app/templates/layouts/home.hbs @@ -17,6 +17,6 @@
-