luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-16 11:53:13 +00:00
Code Issues Projects Releases Wiki Activity

Fix glitch-soc HAML linting issues (#2166)

Browse source
This commit is contained in:
Claire 2023-04-07 20:55:28 +02:00 committed by GitHub
parent 02d5c69404
commit c3a8f6a0a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/views/layouts/_theme.html.haml
View file

@ -9,6 +9,5 @@
= stylesheet_pack_tag pack_path, media: 'all', crossorigin: 'anonymous' = stylesheet_pack_tag pack_path, media: 'all', crossorigin: 'anonymous'
- else - else
= stylesheet_pack_tag "skins/#{theme[:flavour]}/#{theme[:skin]}/#{theme[:pack]}", media: 'all', crossorigin: 'anonymous' = stylesheet_pack_tag "skins/#{theme[:flavour]}/#{theme[:skin]}/#{theme[:pack]}", media: 'all', crossorigin: 'anonymous'
- if theme[:preload] - theme[:preload]&.each do |link|
- theme[:preload].each do |link| %link{ href: asset_pack_path("#{link}.js"), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/
%link{ href: asset_pack_path("#{link}.js"), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/

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

@ -39,7 +39,7 @@
= yield :header_tags = yield :header_tags
-# These must come after :header_tags to ensure our initial state has been defined. -# These must come after :header_tags to ensure our initial state has been defined.
= render partial: 'layouts/theme', object: @core = render partial: 'layouts/theme', object: @core
= render partial: 'layouts/theme', object: @theme = render partial: 'layouts/theme', object: @theme

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

@ -12,7 +12,7 @@
%link{ rel: 'dns-prefetch', href: storage_host }/ %link{ rel: 'dns-prefetch', href: storage_host }/
= render_initial_state = render_initial_state
= javascript_pack_tag "locales", crossorigin: 'anonymous' = javascript_pack_tag 'locales', crossorigin: 'anonymous'
- if @theme - if @theme
- if @theme[:supported_locales].include? I18n.locale.to_s - if @theme[:supported_locales].include? I18n.locale.to_s
= javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", crossorigin: 'anonymous' = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", crossorigin: 'anonymous'

2
app/views/media/player.html.haml
View file

@ -1,6 +1,6 @@
- content_for :header_tags do - content_for :header_tags do
= render_initial_state = render_initial_state
= javascript_pack_tag "locales", crossorigin: 'anonymous' = javascript_pack_tag 'locales', crossorigin: 'anonymous'
- if @theme - if @theme
- if @theme[:supported_locales].include? I18n.locale.to_s - if @theme[:supported_locales].include? I18n.locale.to_s
= javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", crossorigin: 'anonymous' = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", crossorigin: 'anonymous'

4
app/views/settings/flavours/show.html.haml
View file

@ -5,7 +5,7 @@
= render 'shared/error_messages', object: current_user = render 'shared/error_messages', object: current_user
- Themes.instance.flavour(@selected)['screenshot'].each do |screen| - Themes.instance.flavour(@selected)['screenshot'].each do |screen|
%img.flavour-screen{ src: full_pack_url("media/#{screen}") } %img.flavour-screen{ src: full_pack_url("media/#{screen}"), alt: '' }
.flavour-description .flavour-description
= t "flavours.#{@selected}.description", default: '' = t "flavours.#{@selected}.description", default: ''
@ -14,7 +14,7 @@
- if Themes.instance.skins_for(@selected).length > 1 - if Themes.instance.skins_for(@selected).length > 1
.fields-group .fields-group
= f.input :setting_skin, collection: Themes.instance.skins_for(@selected), label_method: lambda { |skin| I18n.t("skins.#{@selected}.#{skin}", default: skin) }, wrapper: :with_label, include_blank: false = f.input :setting_skin, collection: Themes.instance.skins_for(@selected), label_method: ->(skin) { I18n.t("skins.#{@selected}.#{skin}", default: skin) }, wrapper: :with_label, include_blank: false
.actions .actions
= f.button :button, t('generic.use_this'), type: :submit = f.button :button, t('generic.use_this'), type: :submit