# HG changeset patch # User edogawaconan # Date 1381841517 -32400 # Node ID 5d084a9716cadcdc500fc837feb9887a2797aba3 # Parent ceb44fca8b4a4a92159b199ee1b085a0cc7ce788 Update basic layout and css. diff -r ceb44fca8b4a -r 5d084a9716ca app/assets/stylesheets/app_bootstrap.scss --- a/app/assets/stylesheets/app_bootstrap.scss Tue Oct 15 21:51:31 2013 +0900 +++ b/app/assets/stylesheets/app_bootstrap.scss Tue Oct 15 21:51:57 2013 +0900 @@ -1,2 +1,2 @@ @import 'twitter/bootstrap'; -@import 'twitter/bootstrap-responsive'; +@import 'sticky-footer'; diff -r ceb44fca8b4a -r 5d084a9716ca app/assets/stylesheets/sticky-footer.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/assets/stylesheets/sticky-footer.css Tue Oct 15 21:51:57 2013 +0900 @@ -0,0 +1,34 @@ +/* Sticky footer styles +-------------------------------------------------- */ + +html, +body { + height: 100%; + /* The html and body elements cannot have any padding or margin. */ +} + +/* Wrapper for page content to push down footer */ +#wrap { + min-height: 100%; + height: auto !important; + height: 100%; + /* Negative indent footer by its height */ + margin: 0 auto -60px; + /* Pad bottom by footer height */ + padding: 0 0 60px; +} + +/* Set the fixed height of the footer here */ +#footer { + height: 60px; + background-color: #f5f5f5; +} + + +/* Custom page CSS +-------------------------------------------------- */ +/* Not required for template or sticky footer method. */ + +.container .credit { + margin: 20px 0; +} diff -r ceb44fca8b4a -r 5d084a9716ca app/views/layouts/application.html.erb --- a/app/views/layouts/application.html.erb Tue Oct 15 21:51:31 2013 +0900 +++ b/app/views/layouts/application.html.erb Tue Oct 15 21:51:57 2013 +0900 @@ -3,25 +3,24 @@ <%= html_title %> + <%= stylesheet_link_tag "application", :media => "all" %> -
-
-
- - <%= yield %> +
+
+ <%= yield %> +
+
- -
+