astrid
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Require stylesheets in common.js (#4152) 

Require stylesheets in common.js because stylesheets are shared by the
entry points.
pull/4155/head
Akihiko Odaki (@fn_aki@pawoo.net) 2017-07-11 22:15:42 +09:00 committed by Eugen Rochko
parent 31366334cb
commit 8784bd79d0
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/main.js
View File

@ -1,9 +1,5 @@
const perf = require('./performance'); const perf = require('./performance');
// import default stylesheet with variables
require('font-awesome/css/font-awesome.css');
require('mastodon-application-style');
function onDomContentLoaded(callback) { function onDomContentLoaded(callback) {
if (document.readyState !== 'loading') { if (document.readyState !== 'loading') {
callback(); callback();

5
app/javascript/packs/common.js
View File

@ -1,2 +1,7 @@
import { start } from 'rails-ujs'; import { start } from 'rails-ujs';
// import default stylesheet with variables
require('font-awesome/css/font-awesome.css');
require('mastodon-application-style');
start(); start();

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

@ -18,7 +18,7 @@
= ' - ' = ' - '
= title = title
= stylesheet_pack_tag 'application', media: 'all' = stylesheet_pack_tag 'common', media: 'all'
= javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous' = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
= javascript_pack_tag 'features/getting_started', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script' = javascript_pack_tag 'features/getting_started', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'

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

@ -2,7 +2,7 @@
%html{ lang: I18n.locale } %html{ lang: I18n.locale }
%head %head
%meta{ charset: 'utf-8' }/ %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 'common', integrity: true, crossorigin: 'anonymous'
= javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous' = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
= javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous' = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'