Permalink
Browse files

Commit

  • Loading branch information...
2 parents 2de9c30 + c465eb5 commit d5994d5e61d288a93955d92a402c2fa8b0421fab @e911miri committed May 4, 2012
@@ -1,4 +1,5 @@
<<<<<<< HEAD
+<<<<<<< HEAD
@import "bootstrap";
/* mixins, variables, etc. */
@@ -203,4 +204,7 @@ footer {
}
}
>>>>>>> filling-in-layout
-}
+}
+=======
+@import "bootstrap";
+>>>>>>> filling-out-layout
@@ -6,6 +6,7 @@
<%= stylesheet_link_tag "application", media: "all" %>
<%= javascript_include_tag "application" %>
<%= csrf_meta_tags %>
+<<<<<<< HEAD
<%= render 'layouts/shim' %>
</head>
<body>
@@ -33,4 +34,29 @@
</div>
</body>
>>>>>>> filling-in-layout
+=======
+ <!--[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>
+>>>>>>> filling-out-layout
</html>
@@ -1,14 +1,20 @@
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> filling-out-layout
<% provide(:title, 'Contact') %>
<h1>Contact</h1>
<p>
Contact Ruby on Rails Tutorial about the sample app at the
<a href="http://railstutorial.org/contact">contact page</a>.
+<<<<<<< HEAD
=======
<% provide(:title, 'Contact') %>
<h1>Contact</h1>
<p>
Contact Ruby on Rails Tutorial about the sample app at the
<a href="http://railstutorial.org/contact">contact page</a>.
>>>>>>> filling-in-layout
+=======
+>>>>>>> filling-out-layout
</p>
@@ -1,4 +1,7 @@
<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> filling-out-layout
<div class="center hero-unit">
<h1>Welcome to the Sample App</h1>
@@ -8,6 +11,7 @@
sample application.
</h2>
+<<<<<<< HEAD
<%= link_to "Sign up now!", signup_path, class: "btn btn-large btn-primary" %>
</div>
@@ -25,4 +29,9 @@
</div>
>>>>>>> filling-in-layout
+=======
+ <%= link_to "Sign up now!", '#', class: "btn btn-large btn-primary" %>
+</div>
+
+>>>>>>> filling-out-layout
<%= link_to image_tag("rails.png", alt: "Rails"), 'http://rubyonrails.org/' %>

0 comments on commit d5994d5

Please sign in to comment.