Skip to content

Commit 54bb699

Browse files
authored
Merge pull request #2329 from olleolleolle/haml-lint-for-application-layout-and-meta
Haml lint for application layout and meta
2 parents 9c24207 + a410692 commit 54bb699

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

app/views/layouts/application.html.haml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
%meta{ property: 'og:site_name', content: 'codebar' }
1111
%meta{ name: 'keywords', content: 'codebar, programming, diversity, html, css, javascript, ruby, python' }
1212
%meta{ property: 'og:image', content: image_url('logo-square.png') }
13-
%meta{ property: 'og:url', content: "https://codebar.io#{url_for(nil)}" }
13+
%meta{ property: 'og:url', content: request.original_url }
1414
%meta{ property: 'og:title', content: 'codebar' }
1515
%meta{ property: 'og:description', content: 'Making tech more diverse and welcoming by bringing people together and helping teach programming skills.' }
1616
%meta{ name: 'description', content: 'Making tech more diverse and welcoming by bringing people together and helping teach programming skills.' }
@@ -20,28 +20,26 @@
2020

2121
= content_for :meta_tags
2222

23-
%link{ rel: 'image_src', href: '/assets/logo-square.png', :alt => "codebar logo" }
23+
%link{ rel: 'image_src', href: '/assets/logo-square.png', alt: 'codebar logo' }
2424

25-
%title
26-
= retrieve_title
25+
%title= retrieve_title
2726
= favicon_link_tag 'favicon.ico'
28-
= stylesheet_link_tag 'application', media: 'all', 'data-turbo-track': 'reload'
29-
30-
= javascript_include_tag 'application', 'data-turbo-track': 'reload'
31-
%link{ href: 'https://fonts.googleapis.com/css?family=Open+Sans:400,300', rel:'stylesheet', type:'text/css' }
32-
%link{ href: 'https://fonts.googleapis.com/icon?family=Material+Icons', rel:'stylesheet', type:'text/css' }
27+
= stylesheet_link_tag('application', media: 'all', data: { turbo_track: 'reload' })
28+
= javascript_include_tag('application', data: { turbo_track: 'reload' })
29+
%link{ href: 'https://fonts.googleapis.com/css?family=Open+Sans:400,300', rel: 'stylesheet', type: 'text/css' }
30+
%link{ href: 'https://fonts.googleapis.com/icon?family=Material+Icons', rel: 'stylesheet', type: 'text/css' }
3331

3432
// this gets any content from page templates
3533
= content_for :head
3634

3735
= csrf_meta_tags
3836
= csp_meta_tag
3937

40-
%body.no-js{ 'class': "#{params[:controller]}-#{params[:action]}", "data-bs-no-jquery": "true"}
38+
%body.no-js{ 'class': "#{params[:controller]}-#{params[:action]}", 'data-bs-no-jquery': 'true' }
4139
#top
42-
= render partial: 'layouts/navigation'
43-
= render partial: 'layouts/messages'
40+
= render 'layouts/navigation'
41+
= render 'layouts/messages'
4442
= yield
45-
= render partial: 'layouts/footer'
43+
= render 'layouts/footer'
4644

4745
= content_for :page_footer

0 commit comments

Comments
 (0)