about summary refs log tree commit diff
path: root/app/views/layouts
diff options
context:
space:
mode:
authoryhirano <yhirano@me.com>2017-05-08 10:35:25 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-05-08 03:35:25 +0200
commit48594b18e6285d87ee2f58daa08d356b571c8aa6 (patch)
tree58401bb04d522822b1463dd754a9555f1de3d755 /app/views/layouts
parentb18504adfefe521ab1486e1fa04662e9084fbe32 (diff)
Added haml-lint and fix warnings (#2773)
* add haml_lint to Gemfile

* add .haml-lint.yml

* fix warnings of haml_lint
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/admin.html.haml2
-rwxr-xr-xapp/views/layouts/application.html.haml23
-rw-r--r--app/views/layouts/auth.html.haml2
-rw-r--r--app/views/layouts/embedded.html.haml4
-rw-r--r--app/views/layouts/error.html.haml12
-rw-r--r--app/views/layouts/public.html.haml6
6 files changed, 24 insertions, 25 deletions
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index f7cea41e2..59d95a0c6 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -17,4 +17,4 @@
 
         = yield
 
-= render template: "layouts/application", locals: { body_classes: 'admin' }
+= render template: 'layouts/application', locals: { body_classes: 'admin' }
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 683d0272f..73fab9a5c 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,17 +1,16 @@
 !!! 5
-%html{:lang => I18n.locale}
+%html{ lang: I18n.locale }
   %head
-    %meta{:charset => 'utf-8'}/
-    %meta{:name => 'viewport', :content => 'width=device-width, initial-scale=1'}/
-    %meta{'http-equiv' => 'X-UA-Compatible', :content => 'IE=edge'}/
-
-    %link{:rel => "icon", :href => favicon_path, :type => "image/x-icon"}/
-    %link{:rel => "apple-touch-icon", :sizes => "180x180", :href => "/apple-touch-icon.png"}/
-    %link{:rel => "mask-icon", :href => "/mask-icon.svg", :color => "#2B90D9"}/
-    %link{:rel => "manifest", :href => "/manifest.json"}/
-    %meta{:name => "msapplication-config", :content => "/browserconfig.xml"}/
-    %meta{:name => "theme-color", :content => "#282c37"}/
-    %meta{:name => "apple-mobile-web-app-capable", :content => "yes"}/
+    %meta{ charset: 'utf-8' }/
+    %meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }/
+    %meta{ 'http-equiv' => 'X-UA-Compatible', content: 'IE=edge' }/
+    %link{ rel: 'icon', href: favicon_path, type: 'image/x-icon' }/
+    %link{ rel: 'apple-touch-icon', sizes: '180x180', href: '/apple-touch-icon.png' }/
+    %link{ rel: 'mask-icon', href: '/mask-icon.svg', color: '#2B90D9' }/
+    %link{ rel: 'manifest', href: '/manifest.json' }/
+    %meta{ name: 'msapplication-config', content: '/browserconfig.xml' }/
+    %meta{ name: 'theme-color', content: '#282c37' }/
+    %meta{ name: 'apple-mobile-web-app-capable', content: 'yes' }/
 
     %title<
       - if content_for?(:page_title)
diff --git a/app/views/layouts/auth.html.haml b/app/views/layouts/auth.html.haml
index 2478776ab..e5429a8ed 100644
--- a/app/views/layouts/auth.html.haml
+++ b/app/views/layouts/auth.html.haml
@@ -13,4 +13,4 @@
 
       = yield
 
-= render template: "layouts/application"
+= render template: 'layouts/application'
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index fcc474ff6..f0fd1b00d 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -1,7 +1,7 @@
 !!! 5
-%html{:lang => I18n.locale}
+%html{ lang: I18n.locale }
   %head
-    %meta{:charset => 'utf-8'}/
+    %meta{ charset: 'utf-8' }/
     = stylesheet_link_tag 'application', media: 'all'
     = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'
   %body.embed
diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml
index 543881d7d..08b94af54 100644
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@ -1,11 +1,11 @@
 !!!
-%html{:lang => I18n.locale}
+%html{ lang: I18n.locale }
   %head
-    %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
-    %meta{:charset => "utf-8"}/
+    %meta{ content: 'text/html; charset=UTF-8', 'http-equiv' => 'Content-Type' }/
+    %meta{ charset: 'utf-8' }/
     %title= yield :page_title
-    %meta{:content => "width=device-width,initial-scale=1", :name => "viewport"}/
-    %link{:href => "https://fonts.googleapis.com/css?family=Roboto:400", :rel => "stylesheet"}/
+    %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
+    %link{ href: 'https://fonts.googleapis.com/css?family=Roboto:400', rel: 'stylesheet' }/
     :css
       body {
         font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
@@ -31,6 +31,6 @@
       }
   %body
     .dialog
-      %img{:alt => "Mastodon", :src => "/oops.png"}/
+      %img{ alt: 'Mastodon', src: '/oops.png' }/
       %div
         %h1= yield :content
diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index 9b94ad9a4..36cb1b4ad 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -7,9 +7,9 @@
     - if !user_signed_in? && single_user_mode?
       %span.single-user-login
         = link_to t('auth.login'), new_user_session_path
-        = "\u2014"
+        \u2014
     %span.domain= link_to site_hostname, root_path
     %span.powered-by
-      = t('generic.powered_by', link: link_to('Mastodon', 'https://github.com/tootsuite/mastodon')).html_safe
+      != t('generic.powered_by', link: link_to('Mastodon', 'https://github.com/tootsuite/mastodon'))
 
-= render template: "layouts/application"
+= render template: 'layouts/application'