Loading app/assets/images/branding/logos/powered_by_diaspora.pngdeleted 100644 → 0 −1.64 KiB Loading image diff... app/assets/stylesheets/footer.scss +17 −16 Original line number Diff line number Diff line footer { width: 100%; left: 0; bottom: 0; color: $text-grey; html { min-height: 100%; position: relative; } body { margin-bottom: 150px; } .container { width: 95%; margin: 4em auto 0 auto; padding: 0.5em 0 1em 0; footer { background-color: $background-grey; border-top: 1px solid $border-grey; } bottom: 0; max-height: 130px; padding-top: 15px; padding-bottom: 15px; position: absolute; width: 100%; .logos-powered_by_diaspora { display: inline-block; margin-top: 3px; height: 11px; width: 145px; .powered-by-diaspora { color: $link-grey; font-weight: bold; } ul#footer_nav { margin: 0; padding: 0; display: inline-block; float: right; > li { display: inline; Loading app/assets/stylesheets/mobile/mobile.scss +1 −1 Original line number Diff line number Diff line Loading @@ -6,7 +6,7 @@ @import 'entypo'; @import 'icons'; @import "header"; @import "mobile/header"; @import "mobile/tags"; @import "mobile/conversations"; @import "mobile/settings"; Loading app/assets/stylesheets/new_styles/_base.scss +0 −6 Original line number Diff line number Diff line html, body { /* hack to ensure fixed elements at height: 100%; are in relation to the window */ max-height : 100%; } body { margin-top: 50px; padding : none; Loading app/views/layouts/_footer.html.haml +4 −2 Original line number Diff line number Diff line %footer .container .logos-powered_by_diaspora %ul#footer_nav .pull-left .powered-by-diaspora powered by diaspora* %ul#footer_nav.pull-right = render :partial =>'shared/links' Loading
app/assets/images/branding/logos/powered_by_diaspora.pngdeleted 100644 → 0 −1.64 KiB Loading image diff...
app/assets/stylesheets/footer.scss +17 −16 Original line number Diff line number Diff line footer { width: 100%; left: 0; bottom: 0; color: $text-grey; html { min-height: 100%; position: relative; } body { margin-bottom: 150px; } .container { width: 95%; margin: 4em auto 0 auto; padding: 0.5em 0 1em 0; footer { background-color: $background-grey; border-top: 1px solid $border-grey; } bottom: 0; max-height: 130px; padding-top: 15px; padding-bottom: 15px; position: absolute; width: 100%; .logos-powered_by_diaspora { display: inline-block; margin-top: 3px; height: 11px; width: 145px; .powered-by-diaspora { color: $link-grey; font-weight: bold; } ul#footer_nav { margin: 0; padding: 0; display: inline-block; float: right; > li { display: inline; Loading
app/assets/stylesheets/mobile/mobile.scss +1 −1 Original line number Diff line number Diff line Loading @@ -6,7 +6,7 @@ @import 'entypo'; @import 'icons'; @import "header"; @import "mobile/header"; @import "mobile/tags"; @import "mobile/conversations"; @import "mobile/settings"; Loading
app/assets/stylesheets/new_styles/_base.scss +0 −6 Original line number Diff line number Diff line html, body { /* hack to ensure fixed elements at height: 100%; are in relation to the window */ max-height : 100%; } body { margin-top: 50px; padding : none; Loading
app/views/layouts/_footer.html.haml +4 −2 Original line number Diff line number Diff line %footer .container .logos-powered_by_diaspora %ul#footer_nav .pull-left .powered-by-diaspora powered by diaspora* %ul#footer_nav.pull-right = render :partial =>'shared/links'