diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2016-02-22 16:00:20 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-02-22 16:00:20 +0100 |
commit | 709c6685a90bb819696566cc9e42e587546d72dc (patch) | |
tree | 272783009e0a0c8b13b8003dc4bc4e58f3b0b84b /app/views/layouts | |
parent | 9c4856bdb11fc9311ab30a97224cee3dfaec492f (diff) |
Made some progress
Diffstat (limited to 'app/views/layouts')
-rw-r--r-- | app/views/layouts/application.html.erb | 14 | ||||
-rw-r--r-- | app/views/layouts/application.html.haml | 10 |
2 files changed, 10 insertions, 14 deletions
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb deleted file mode 100644 index ff0d4c865..000000000 --- a/app/views/layouts/application.html.erb +++ /dev/null @@ -1,14 +0,0 @@ -<!DOCTYPE html> -<html> -<head> - <title>Mastodon</title> - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> - <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> - <%= csrf_meta_tags %> -</head> -<body> - -<%= yield %> - -</body> -</html> diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml new file mode 100644 index 000000000..0cb4e96e8 --- /dev/null +++ b/app/views/layouts/application.html.haml @@ -0,0 +1,10 @@ +!!! +%html + %head + %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/ + %title Mastodon + = stylesheet_link_tag 'application', media: 'all' + = javascript_include_tag 'application' + = csrf_meta_tags + %body + = yield |