summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2015-07-14 13:58:56 -0700
committerelijah <elijah@riseup.net>2015-07-14 13:58:56 -0700
commitd2f1703e30319f7fc1f4c1a084d5b0363536d935 (patch)
tree9163e6ddff896d9257bdc1b3f9ad65fcfcb1296f /app
parente41f1a7bf3ce3c71e9fb3691c45121747c2ad306 (diff)
fix footer css when the locale links are visible
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/leap.scss24
-rw-r--r--app/views/layouts/_footer.html.haml26
2 files changed, 30 insertions, 20 deletions
diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss
index 35f0ed4..dddcc1a 100644
--- a/app/assets/stylesheets/leap.scss
+++ b/app/assets/stylesheets/leap.scss
@@ -243,7 +243,7 @@ input, textarea {
// http://getbootstrap.com/examples/sticky-footer/
//
-$footer-height: 60px;
+$footer-height: 100px;
$footer-border-width: 1px;
$footer-gutter: 20px; // vertical gap above footer
$footer-combined: $footer-height + $footer-border-width + $footer-gutter;
@@ -269,22 +269,30 @@ html, body {
#footer {
padding-top: $footer-gutter;
height: $footer-height - $footer-border-width;
+ display: table;
+ width: 100%;
+ .row {
+ height: $footer-height/2;
+ display: table-row;
+ .wrap-text {
+ vertical-align: middle;
+ text-align: center;
+ display: table-cell;
+ }
+ }
.locales {
- text-align: center;
- margin-bottom: 15px;
a {
padding: 4px;
&.active {
font-weight: bold;
- background-color: #eee;
+ background-color: #333;
+ color: white;
border-radius: 4px;
}
}
}
- .full-height {
- text-align: center;
- line-height: $footer-height - $footer-border-width;
- border-top: $footer-border-width solid darken($footer-color, 10%);
+ .links {
+ // border-top: $footer-border-width solid darken($footer-color, 10%);
background-color: $footer-color;
a {
color: $black;
diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml
index f502ddb..58f0551 100644
--- a/app/views/layouts/_footer.html.haml
+++ b/app/views/layouts/_footer.html.haml
@@ -1,13 +1,15 @@
- if CommonLanguages.available.size > 1
- .locales
- = locales_links
-.full-height
- = link_to icon('home') + t(:home), home_path
- = link_to icon('eye-close') + t(:privacy_policy), privacy_policy_path
- = link_to icon('file') + t(:terms_of_service), terms_of_service_path
- - if lookup_context.exists?('pages/about')
- = link_to icon('info-sign') + t(:about), about_path
- - if lookup_context.exists?('pages/contact')
- = link_to icon('comment') + t(:contact), contact_path
- - if paid_service_level?
- = link_to icon('shopping-cart') + t(:pricing), pricing_path
+ .locales.row
+ .wrap-text
+ = locales_links
+.links.row
+ .wrap-text
+ = link_to icon('home') + t(:home), home_path
+ = link_to icon('eye-close') + t(:privacy_policy), privacy_policy_path
+ = link_to icon('file') + t(:terms_of_service), terms_of_service_path
+ - if lookup_context.exists?('pages/about')
+ = link_to icon('info-sign') + t(:about), about_path
+ - if lookup_context.exists?('pages/contact')
+ = link_to icon('comment') + t(:contact), contact_path
+ - if paid_service_level?
+ = link_to icon('shopping-cart') + t(:pricing), pricing_path