Require stylesheets in common.js (#4152)
Require stylesheets in common.js because stylesheets are shared by the entry points.pull/64/head
parent
31366334cb
commit
8784bd79d0
|
@ -1,9 +1,5 @@
|
|||
const perf = require('./performance');
|
||||
|
||||
// import default stylesheet with variables
|
||||
require('font-awesome/css/font-awesome.css');
|
||||
require('mastodon-application-style');
|
||||
|
||||
function onDomContentLoaded(callback) {
|
||||
if (document.readyState !== 'loading') {
|
||||
callback();
|
||||
|
|
|
@ -1,2 +1,7 @@
|
|||
import { start } from 'rails-ujs';
|
||||
|
||||
// import default stylesheet with variables
|
||||
require('font-awesome/css/font-awesome.css');
|
||||
require('mastodon-application-style');
|
||||
|
||||
start();
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
= ' - '
|
||||
= title
|
||||
|
||||
= stylesheet_pack_tag 'application', media: 'all'
|
||||
= stylesheet_pack_tag 'common', media: 'all'
|
||||
= javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
|
||||
|
||||
= javascript_pack_tag 'features/getting_started', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
%html{ lang: I18n.locale }
|
||||
%head
|
||||
%meta{ charset: 'utf-8' }/
|
||||
= stylesheet_pack_tag 'application', media: 'all'
|
||||
= stylesheet_pack_tag 'common', media: 'all'
|
||||
= javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
|
||||
= javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
|
||||
= javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'
|
||||
|
|
Loading…
Reference in New Issue