Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Showing with 24 additions and 1 deletion.
  1. BIN .swp
  2. +9 −0 app/views/layouts/application.html.erb
  3. +15 −1 app/views/layouts/application.html.erb~
View
BIN .swp
Binary file not shown.
View
9 app/views/layouts/application.html.erb
@@ -1,10 +1,19 @@
<!DOCTYPE html>
<html>
<head>
+ <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+ <!--[if lt IE 9]>
+ <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
<title>Danta</title>
<%= stylesheet_link_tag "bootstrap", :media => "all" %>
<%= javascript_include_tag :all %>
<%= csrf_meta_tags %>
+ <style type="text/css">
+ body {
+ padding-top: 60px;
+ }
+ </style>
</head>
<body>
View
16 app/views/layouts/application.html.erb~
@@ -1,14 +1,22 @@
<!DOCTYPE html>
<html>
<head>
+ <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+ <!--[if lt IE 9]>
+ <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
<title>Danta</title>
<%= stylesheet_link_tag "bootstrap", :media => "all" %>
<%= javascript_include_tag :all %>
<%= csrf_meta_tags %>
+ <style type="text/css">
+ body {
+ padding-top: 60px;
+ }
+ </style>
</head>
<body>
-
<div class="topbar">
<div class="topbar-inner">
<div class="container-fluid">
@@ -98,5 +106,11 @@
</div>
</div>
+ <footer>
+ <p>&copy; DudesOnRails 2012 - Colegio Universitario Francisco de Miranda</p>
+ </footer>
+ </div>
+ </div>
+
</body>
</html>

No commit comments for this range

Something went wrong with that request. Please try again.