consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing conflicts [#6]

Browse Source
This commit is contained in:
rgarcia
2015-07-16 20:14:18 +02:00
parent 1d17d1d1f7 24fb2765b9
commit e88832b5a3
10 changed files with 1545 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/views/layouts/application.html.erb
View File

@@ -1,15 +1,19 @@
<!DOCTYPE html>
<html>
<head>
<title>Participacion</title>
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
<%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
<%= csrf_meta_tags %>
</head>
<body>
<p class="alert"><%= notice %></p>
<p class="alert"><%= alert %></p>
<%= yield %>
<html lang="es">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
</body>
</html>
<title><%= content_for?(:title) ? yield(:title) : "foundation-rails" %></title>
<%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "vendor/modernizr" %>
<%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
<%= csrf_meta_tags %>
</head>
<body>
<p class="alert"><%= notice %></p>
<p class="alert"><%= alert %></p>
<%= yield %>
</body>
</html>