36393e1d2b
Conflicts:
app/views/layouts/application.html.haml
Edited:
app/helpers/application_helper.rb
app/views/admin/domain_blocks/new.html.haml
Conflict wasn't really one, just two changes too close to one another.
Edition was to adapt the class names for themes to class names for
skins and flavours.
Also edited app/views/admin/domain_blocks/new.html.haml to strip the
duplicate admin pack inclusion thing.
35 lines
1.6 KiB
Plaintext
Executable file
35 lines
1.6 KiB
Plaintext
Executable file
!!! 5
|
|
%html{ lang: I18n.locale }
|
|
%head
|
|
%meta{ charset: 'utf-8' }/
|
|
%meta{ name: 'viewport', content: 'width=device-width, initial-scale=1' }/
|
|
%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= content_for?(:page_title) ? safe_join([yield(:page_title).chomp.html_safe, title], ' - ') : title
|
|
|
|
= javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous'
|
|
- if @theme
|
|
- if @theme[:supported_locales].include? I18n.locale.to_s
|
|
= javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
|
|
- elsif @theme[:supported_locales].include? 'en'
|
|
= javascript_pack_tag "locales/#{@theme[:flavour]}/en", integrity: true, crossorigin: 'anonymous'
|
|
= csrf_meta_tags
|
|
|
|
- if Setting.custom_css.present?
|
|
= stylesheet_link_tag custom_css_path, media: 'all'
|
|
|
|
= yield :header_tags
|
|
|
|
-# 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: @theme
|
|
|
|
%body{ class: body_classes }
|
|
= content_for?(:content) ? yield(:content) : yield
|