luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-22 05:08:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix for stylesheet split

Browse source
This commit is contained in:
kibigo! 2017-07-18 11:21:04 -07:00
parent 7a77f7b3bb
commit 0a678cf377
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/javascript/glitch/components/settings/index.js
View file

@ -1,14 +1,15 @@
// Package imports // // Package imports
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import { injectIntl, defineMessages, FormattedMessage } from 'react-intl'; import { injectIntl, defineMessages, FormattedMessage } from 'react-intl';
import './stylesheet'; // Our imports
// Our imports //
import SettingsItem from './item'; import SettingsItem from './item';
// Stylesheet imports
import './style';
const messages = defineMessages({ const messages = defineMessages({
layout_auto: { id: 'layout.auto', defaultMessage: 'Auto' }, layout_auto: { id: 'layout.auto', defaultMessage: 'Auto' },
layout_desktop: { id: 'layout.desktop', defaultMessage: 'Desktop' }, layout_desktop: { id: 'layout.desktop', defaultMessage: 'Desktop' },

0
app/javascript/glitch/components/settings/stylesheet.scss → app/javascript/glitch/components/settings/style.scss
View file

1
app/views/home/index.html.haml
View file

@ -3,6 +3,7 @@
%script#initial-state{ type: 'application/json' }!= json_escape(@initial_state_json) %script#initial-state{ type: 'application/json' }!= json_escape(@initial_state_json)
= javascript_pack_tag 'application', integrity: true, crossorigin: 'anonymous' = javascript_pack_tag 'application', integrity: true, crossorigin: 'anonymous'
= stylesheet_pack_tag 'application', media: 'all'
.app-holder#mastodon{ data: { props: Oj.dump(default_props) } } .app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
%noscript %noscript

5
config/webpack/shared.js
View file

@ -44,7 +44,10 @@ module.exports = {
plugins: [ plugins: [
new webpack.EnvironmentPlugin(JSON.parse(JSON.stringify(env))), new webpack.EnvironmentPlugin(JSON.parse(JSON.stringify(env))),
new ExtractTextPlugin(env.NODE_ENV === 'production' ? '[name]-[hash].css' : '[name].css'), new ExtractTextPlugin({
filename: env.NODE_ENV === 'production' ? '[name]-[hash].css' : '[name].css',
allChunks: true,
}),
new ManifestPlugin({ new ManifestPlugin({
publicPath: output.publicPath, publicPath: output.publicPath,
writeToFileEmit: true, writeToFileEmit: true,