paoda/polyglot
1
0
Fork 0
mirror of https://github.com/beatriceo/polyglot.git synced 2025-10-22 17:52:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into front-end

Browse Source
This commit is contained in:
Beatrice Olivera
2018-08-28 17:21:12 +01:00
committed by GitHub
parent e98199d013 9f23553256
commit e7b4b74c00
14 changed files with 146 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,14 +3,14 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title>TODO</title>
<title>Polyglot</title>
<%= csrf_meta_tags %>
<%= action_cable_meta_tag %>
<%= stylesheet_link_tag 'application', media: 'all' %>
<%#= stylesheet_pack_tag 'application', media: 'all' %> <!-- Uncomment if you import CSS in app/javascript/packs/application.js -->
</head>
<body>
<%= render 'shared/navbar' %>
<%= render 'shared/navbar' unless params["action"] == "home"%>
<%= render 'shared/flashes' %>
<%= yield %>
<%= javascript_include_tag 'application' %>