Change template language to slim

itkpi · Jan 28, 2017 · f3e79f7 · f3e79f7
1 parent 4726beb
commit f3e79f7
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 28 deletions.
diff --git a/Gemfile b/Gemfile
@@ -12,6 +12,7 @@ gem 'pg', '~> 0.18'
 gem 'puma', '~> 3.0'
 gem 'rails', '~> 5.0.1'
 gem 'sass-rails', '~> 5.0'
+gem 'slim'
 gem 'turbolinks', '~> 5'
 gem 'uglifier', '>= 1.3.0'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -224,6 +224,9 @@ GEM
     shellany (0.0.1)
     shoulda-matchers (3.1.1)
       activesupport (>= 4.0.0)
+    slim (3.0.7)
+      temple (~> 0.7.6)
+      tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
     spring (2.0.1)
       activesupport (>= 4.2)
@@ -237,6 +240,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    temple (0.7.7)
     thor (0.19.4)
     thread_safe (0.3.5)
     tilt (2.0.6)
@@ -289,6 +293,7 @@ DEPENDENCIES
   sass-rails (~> 5.0)
   selenium-webdriver
   shoulda-matchers
+  slim
   spring
   spring-watcher-listen (~> 2.0.0)
   turbolinks (~> 5)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
@@ -0,0 +1,9 @@
+doctype html
+html
+  head
+    title Room538
+    = csrf_meta_tags
+    = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload'
+    = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
+  body
+    = yield
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
diff --git a/app/views/layouts/mailer.html.slim b/app/views/layouts/mailer.html.slim
@@ -0,0 +1,8 @@
+doctype html
+html
+  head
+    meta[http-equiv="Content-Type" content="text/html; charset=utf-8"]
+    style
+      |  /* Email styles need to be inline */ 
+  body
+    = yield
diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb
diff --git a/app/views/layouts/mailer.text.slim b/app/views/layouts/mailer.text.slim
@@ -0,0 +1 @@
+= yield