vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added haml-lint and fix warnings (#2773)

Browse source 
* add haml_lint to Gemfile

* add .haml-lint.yml

* fix warnings of haml_lint
This commit is contained in:
yhirano 2017-05-08 10:35:25 +09:00 • committed by Eugen Rochko
parent b18504adfe
commit 48594b18e6
39 changed files with 207 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/admin.html.haml
View file

@ -17,4 +17,4 @@
= yield
= render template: "layouts/application", locals: { body_classes: 'admin' }
= render template: 'layouts/application', locals: { body_classes: 'admin' }

23
app/views/layouts/application.html.haml
View file

@ -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)

2
app/views/layouts/auth.html.haml
View file

@ -13,4 +13,4 @@
= yield
= render template: "layouts/application"
= render template: 'layouts/application'

4
app/views/layouts/embedded.html.haml
View file

@ -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

12
app/views/layouts/error.html.haml
View file

@ -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

6
app/views/layouts/public.html.haml
View file

@ -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'