Mercurial > zeropaste

changeset 259:5d084a9716ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update basic layout and css.
author edogawaconan <me@myconan.net>
date Tue, 15 Oct 2013 21:51:57 +0900
parents ceb44fca8b4a
children c4aba8990c5e
files app/assets/stylesheets/app_bootstrap.scss app/assets/stylesheets/sticky-footer.css app/views/layouts/application.html.erb
diffstat 3 files changed, 48 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- 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';
--- /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;
+}
--- 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 @@
   <head>
     <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
     <title><%= html_title %></title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <%= stylesheet_link_tag    "application", :media => "all" %>
   </head>
   <body>
 
-    <div class="container-fluid">
-      <div class="row-fluid">
-        <div class="span12">
-
-          <%= yield %>
+    <div id="wrap">
+      <div class="container">
+        <%= yield %>
+      </div>
+    </div>
 
-          <div class="footer">
-            <hr />
-            <p>
-             Zeropaste &copy; edogawaconan 2012.
-             <a href="https://bitbucket.org/edogawaconan/zeropaste">Source</a>.
-             <%= link_to 'Donate', 'https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=edho%40myconan%2enet&lc=ID&item_name=Zeropaste%20development&currency_code=USD&bn=PP%2dDonationsBF%3abtn_subscribe_LG%2egif%3aNonHosted' %>.
-            </p>
-          </div>
-        </div>
+    <div id="footer">
+      <div class="container">
+        <p class="text-muted credit">
+         Zeropaste &copy; edogawaconan 2012.
+         <a href="https://bitbucket.org/edogawaconan/zeropaste">Source</a>.
+         <%= link_to 'Donate', 'https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=edho%40myconan%2enet&lc=ID&item_name=Zeropaste%20development&currency_code=USD&bn=PP%2dDonationsBF%3abtn_subscribe_LG%2egif%3aNonHosted' %>.
+        </p>
       </div>
     </div>