Permalink
Browse files

Getting Ready for CSS

  • Loading branch information...
1 parent d0e3cb3 commit dbb2a6bf996a42345d4396ef1b841a6a6fd686ad @grigerny committed Apr 26, 2012
Showing with 38 additions and 8 deletions.
  1. +3 −1 app/helpers/application_helper.rb
  2. +22 −5 app/views/layouts/application.html.erb
  3. +13 −2 app/views/static_pages/home.html.erb
@@ -1,2 +1,4 @@
module ApplicationHelper
-end
+end
+
+
@@ -1,14 +1,31 @@
<!DOCTYPE html>
<html>
<head>
- <title>SampleApp</title>
+ <title>Ruby on Rails Tutorial Sample App </title>
<%= stylesheet_link_tag "application", :media => "all" %>
<%= javascript_include_tag "application" %>
<%= csrf_meta_tags %>
-</head>
-<body>
-
+ <!--[if lt IE 9]>
+ <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
+ </head>
+ <body>
+ <header class="navbar navbar-fixed-top">
+ <div class="navbar-inner">
+ <div class="container">
+ <%= link_to "sample app", '#', id: "logo" %>
+ <nav>
+ <ul class="nav pull-right">
+ <li><%= link_to "Home", '#' %></li>
+ <li><%= link_to "Help", '#' %></li>
+ <li><%= link_to "Sign in", '#' %></li>
+ </ul>
+ </nav>
+ </div>
+ </div>
+ </header>
+ <div class="container">
<%= yield %>
-
+</div>
</body>
</html>
@@ -1,2 +1,13 @@
-<h1>StaticPages#home</h1>
-<p>Find me in app/views/static_pages/home.html.erb</p>
+<div class="center hero-unit">
+ <h1>Welcome to the Sample App</h1>
+
+ <h2>
+ This is the home page for the
+ <a href="http://railstutorial.org/">Ruby on Rails Tutorial</a>
+ sample application.
+ </h2>
+
+ <%= link_to "Sign up now!", '#', class: "btn btn-large btn-primary" %>
+</div>
+
+<%= link_to image_tag("rails.png", alt: "Rails"), 'http://rubyonrails.org/' %>

0 comments on commit dbb2a6b

Please sign in to comment.