Permalink
Browse files

[#15] Added footer and html5 shiv

+ Html 5 Shiv
+ thoughtbot red bar
+ Ignore hidden system files
+ Link back to thoughtbot in footer
  • Loading branch information...
1 parent d53121a commit ffb73f2022cfc6787eb2e01ad01f4b721c59659a @harlow harlow committed Aug 3, 2012
View
@@ -17,3 +17,4 @@
/log/*.log
/tmp
*.swp
+.DS_Store
Deleted file not rendered
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -10,4 +10,5 @@
*
*= require_self
*= require_tree .
+ *= require reset
*/
No changes.
@@ -1,6 +1,6 @@
$color-1: #444;
-$color-2: #eee;
-$color-3: #B32216; // red
+$color-2: gainsboro;
+$color-3: #B32216;
$color-4: #999;
$color-5: white;
@@ -22,19 +22,13 @@ $color-5: white;
// Base Styles
// ----------------------------------------
-
-div#main-wrap {
- margin: 0 auto;
- width: 1000px;
-
- h2 {
- margin-bottom: 50px;
- }
+body {
+ border-top: 4px solid #AD141E;
}
header {
- background: transparent url(logo.png) no-repeat 40px center;
- margin: 20px auto 50px;
+ background: transparent url(logo.png) no-repeat 40px 20px;
+ margin: 30px auto 50px;
padding: 0 40px;
width: 1040px;
@@ -50,6 +44,23 @@ header {
}
}
}
+
+ hr {
+ background: url(shadowing.png) no-repeat top center;
+ width: 100%;
+ height: 10px;
+ margin: 0px;
+ border: none;
+ }
+}
+
+div#main-wrap {
+ margin: 0 auto;
+ width: 1000px;
+
+ h2 {
+ margin-bottom: 50px;
+ }
}
a.new-friend {
@@ -63,10 +74,28 @@ a.new-friend {
}
}
-// Friend
-// ----------------------------------------
+footer {
+ margin: 50px auto;
+ width: 1000px;
+
+ a {
+ color: $color-4;
+ border-bottom: 1px dotted;
+ }
+ p {
+ color: $color-4;
+ font: 400 12px helvetica neue, sans-serif;
+ font-size: 16px;
+ line-height: 24px;
+ margin-bottom: 24px;
+ margin-top: 10px;
+ text-align: center;
+ }
+}
+// Friend
+// ----------------------------------------
section#friends {
font-size: 0;
}
@@ -146,7 +175,6 @@ div.actions {
// Forms
// ----------------------------------------
-
input {
font-size: 16px;
padding: 5px 0;
@@ -181,9 +209,9 @@ form {
}
}
}
+
// Other
// ----------------------------------------
-
aside {
color: $color-4;
font-size: 10px;
@@ -1,21 +1,26 @@
<!DOCTYPE html>
<html>
<head>
- <title>PaperclipDemo</title>
- <%= stylesheet_link_tag "application", :media => "all" %>
- <%= javascript_include_tag "application" %>
+ <title>Paperclip Demo</title>
+ <!--[if IE]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+ <%= stylesheet_link_tag 'application', :media => 'all' %>
<%= csrf_meta_tags %>
</head>
<body>
<header>
<div class="header-wrap">
- <h1><%= link_to 'Paperclip on Heroku Demo', root_path %></h1>
+ <h1><%= link_to 'Paperclip Demo', root_path %></h1>
</div>
+ <hr />
</header>
-<div id="main-wrap">
- <%= yield %>
-</div>
+ <div id="main-wrap">
+ <%= yield %>
+ </div>
+ <footer>
+ <p id="copyright">© 2012 thoughtbot, inc. The <em>design of a robot</em> and <em>thoughtbot</em> are registered trademarks of <%= link_to 'thoughtbot, inc', 'http://thoughtbot.com', target: 'blank' %>.</p>
+ </footer>
+ <%= javascript_include_tag "application" %>
</body>
</html>

0 comments on commit ffb73f2

Please sign in to comment.