10 files changed, 31 insertions, 13 deletions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
new file mode 100644
index 0000000..668b6cd
--- /dev/null
+++ b/app/views/layouts/application.html.haml

@@ -0,0 +1,11 @@
+!!! 5
+%html
+  %head
+    %title Pokeviewer
+    %meta{ name: "viewport", content: "width=device-width,initial-scale=1" }
+    = stylesheet_link_tag "application", media: "all"
+    = javascript_include_tag "application"
+    = csrf_meta_tags
+    = csp_meta_tag
+  %body
+    #content= yield
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
new file mode 100644
index 0000000..3aac900
--- /dev/null
+++ b/app/views/layouts/mailer.html.erb

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <style>
+      /* Email styles need to be inline */
+    </style>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
+</html>
diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb
new file mode 100644
index 0000000..37f0bdd
--- /dev/null
+++ b/app/views/layouts/mailer.text.erb

@@ -0,0 +1 @@
+<%= yield %>
diff --git a/app/views/layouts/pokeviewer/application.html.haml b/app/views/layouts/pokeviewer/application.html.haml
deleted file mode 100644
index 4fa0d19..0000000
--- a/app/views/layouts/pokeviewer/application.html.haml
+++ /dev/null

@@ -1,9 +0,0 @@
-!!! 5
-%html
-  %head
-    %title Pokeviewer
-    = stylesheet_link_tag "pokeviewer/application", media: "all"
-    = javascript_include_tag "pokeviewer/application"
-    = csrf_meta_tags
-  %body
-    #content= yield
diff --git a/app/views/pokeviewer/pokedex/index.html.haml b/app/views/pokedex/index.html.haml
index 676cd9f..676cd9f 100644
--- a/app/views/pokeviewer/pokedex/index.html.haml
+++ b/app/views/pokedex/index.html.haml

diff --git a/app/views/pokeviewer/pokemon/_embed_code.html.haml b/app/views/pokemon/_embed_code.html.haml
index 6bbff69..6bbff69 100644
--- a/app/views/pokeviewer/pokemon/_embed_code.html.haml
+++ b/app/views/pokemon/_embed_code.html.haml

diff --git a/app/views/pokeviewer/pokemon/embed.html.haml b/app/views/pokemon/embed.html.haml
index 3c82052..17fc7ba 100644
--- a/app/views/pokeviewer/pokemon/embed.html.haml
+++ b/app/views/pokemon/embed.html.haml

@@ -2,9 +2,11 @@
 %html
  %head
    %title Pokeviewer
-    = stylesheet_link_tag "pokeviewer/application", media: "all"
+    %meta{ name: "viewport", content: "width=device-width,initial-scale=1" }
-    = javascript_include_tag "pokeviewer/application"
+    = stylesheet_link_tag "application", media: "all"
+    = javascript_include_tag "application"
    = csrf_meta_tags
+    = csp_meta_tag
  %body#pokemon-embed
    %ul#pokemon-embed-tabs
      %li.ptabe-button.ptabe-details= link_to "Details", "\#", data: {tab: "details"}
diff --git a/app/views/pokeviewer/pokemon/index.html.haml b/app/views/pokemon/index.html.haml
index 67ea2cf..67ea2cf 100644
--- a/app/views/pokeviewer/pokemon/index.html.haml
+++ b/app/views/pokemon/index.html.haml

diff --git a/app/views/pokeviewer/pokemon/show.html.haml b/app/views/pokemon/show.html.haml
index cbd879b..cbd879b 100644
--- a/app/views/pokeviewer/pokemon/show.html.haml
+++ b/app/views/pokemon/show.html.haml

diff --git a/app/views/pokeviewer/revisions/_revision.html.haml b/app/views/revisions/_revision.html.haml
index 63ba22c..747c746 100644
--- a/app/views/pokeviewer/revisions/_revision.html.haml
+++ b/app/views/revisions/_revision.html.haml

@@ -9,7 +9,7 @@
      .pokemon-image-wrap
        = image_tag @revision.sprite_path, class: "pokemon-sprite"
        - if @revision.pokemon.shiny?
-          = image_tag "pokeviewer/ShinyIVStar.png", class: "pkv-shiny-star"
+          = image_tag "ShinyIVStar.png", class: "pkv-shiny-star"
    - if @revision.item.nil?
      .pokemon-item-label Item
      .pokemon-item None
@@ -129,7 +129,7 @@
    %ul
      - @revision.ribbons.each do |ribbon|
        %li.pkv-has-hover
-          = image_tag("pokeviewer/ribbons/#{ribbon[:filename]}")
+          = image_tag("ribbons/#{ribbon[:filename]}")
          .pkv-hover
            .pc-data-name= ribbon[:name]
            = ribbon[:description]