Commit 3af35f48 authored by mgabdev's avatar mgabdev

Updating css webpack integration

parent deb9ed29
......@@ -16,29 +16,6 @@ import initialState from '../initial_state';
import { me } from '../initial_state';
import ErrorBoundary from '../components/error_boundary';
import '../../styles/gabsocial/components.scss';
import '../../styles/gabsocial/components/buttons.scss';
import '../../styles/gabsocial/components/inputs.scss';
import '../../styles/gabsocial/components/tabs-bar.scss';
import '../../styles/gabsocial/components/dropdown-menu.scss';
import '../../styles/gabsocial/components/modal.scss';
import '../../styles/gabsocial/components/account-header.scss';
import '../../styles/gabsocial/components/user-panel.scss';
import '../../styles/gabsocial/components/compose-form.scss';
import '../../styles/gabsocial/components/group-card.scss';
import '../../styles/gabsocial/components/group-detail.scss';
import '../../styles/gabsocial/components/group-form.scss';
import '../../styles/gabsocial/components/group-sidebar-panel.scss';
import '../../styles/gabsocial/polls.scss';
import '../../styles/gabsocial/introduction.scss';
import '../../styles/gabsocial/emoji_picker.scss';
import '../../styles/gabsocial/about.scss';
import '../../styles/gabsocial/tables.scss';
import '../../styles/gabsocial/admin.scss';
import '../../styles/gabsocial/dashboard.scss';
import '../../styles/gabsocial/rtl.scss';
import '../../styles/gabsocial/accessibility.scss';
const { localeData, messages } = getLocale();
addLocaleData(localeData);
......
@import 'gabsocial/mixins';
@import './_variables';
@import './_colors';
@import './_themes';
@import './_font_families';
@import './_mixins';
@import './variables';
@import './colors';
@import './themes';
@import './font_families';
@import './mixins';
@import '_variables';
@import '_colors';
@import '_themes';
@import '_font_families';
@import '_mixins';
@import 'variables';
@import 'colors';
@import 'themes';
@import 'font_families';
@import 'mixins';
@import 'gabsocial/variables';
@import 'gabsocial/fonts';
@import 'gabsocial/reset';
@import 'gabsocial/scrollbars';
@import 'gabsocial/basics';
@import 'gabsocial/containers';
@import 'gabsocial/lists';
@import 'gabsocial/footer';
@import 'gabsocial/compact_header';
@import 'gabsocial/widgets';
@import 'gabsocial/forms';
@import 'gabsocial/accounts';
@import 'gabsocial/stream_entries';
@import 'gabsocial/boost';
@import './gabsocial/variables';
// @import 'gabsocial/fonts';
// @import 'gabsocial/reset';
// @import 'gabsocial/scrollbars';
// @import 'gabsocial/basics';
// @import 'gabsocial/containers';
// @import 'gabsocial/lists';
// @import 'gabsocial/footer';
// @import 'gabsocial/compact_header';
// @import 'gabsocial/widgets';
// @import 'gabsocial/forms';
// @import 'gabsocial/accounts';
// @import 'gabsocial/stream_entries';
// @import 'gabsocial/boost';
// NOTE - In the process of stripping this giant file into individual components (below)
@import 'gabsocial/components';
// @import 'gabsocial/components';
// COMPONENTS
@import 'gabsocial/components/buttons';
@import 'gabsocial/components/inputs';
@import 'gabsocial/components/tabs-bar';
@import 'gabsocial/components/dropdown-menu';
@import 'gabsocial/components/modal';
@import 'gabsocial/components/account-header';
@import 'gabsocial/components/user-panel';
@import 'gabsocial/components/compose-form';
@import 'gabsocial/components/group-card';
@import 'gabsocial/components/group-detail';
@import 'gabsocial/components/group-form';
@import 'gabsocial/components/group-sidebar-panel';
@import 'gabsocial/polls';
@import 'gabsocial/introduction';
@import 'gabsocial/emoji_picker';
@import 'gabsocial/about';
@import 'gabsocial/tables';
@import 'gabsocial/admin';
@import 'gabsocial/dashboard';
@import 'gabsocial/rtl';
@import 'gabsocial/accessibility';
\ No newline at end of file
// @import 'gabsocial/components/buttons';
// @import 'gabsocial/components/inputs';
// @import 'gabsocial/components/tabs-bar';
// @import 'gabsocial/components/dropdown-menu';
// @import 'gabsocial/components/modal';
// @import 'gabsocial/components/account-header';
// @import 'gabsocial/components/user-panel';
// @import 'gabsocial/components/compose-form';
// @import 'gabsocial/components/group-card';
// @import 'gabsocial/components/group-detail';
// @import 'gabsocial/components/group-form';
// @import 'gabsocial/components/group-sidebar-panel';
// @import 'gabsocial/polls';
// @import 'gabsocial/introduction';
// @import 'gabsocial/emoji_picker';
// @import 'gabsocial/about';
// @import 'gabsocial/tables';
// @import 'gabsocial/admin';
// @import 'gabsocial/dashboard';
// @import 'gabsocial/rtl';
// @import 'gabsocial/accessibility';
\ No newline at end of file
@import 'contrast/variables';
@import 'application';
@import 'contrast/diff';
// @import 'contrast/variables';
// @import 'application';
// @import 'contrast/diff';
@import 'gabsocial-light/variables';
@import 'application';
@import 'gabsocial-light/diff';
// @import 'gabsocial-light/variables';
// @import 'application';
// @import 'gabsocial-light/diff';
......@@ -320,7 +320,6 @@
border-color: transparent transparent $white;
}
.hero-widget,
.box-widget,
.contact-widget,
.landing-page__information.contact-widget,
......
......@@ -20,8 +20,8 @@
%title= content_for?(:page_title) ? safe_join([yield(:page_title).chomp.html_safe, title], ' - ') : title
-# = stylesheet_pack_tag 'common', media: 'all'
-# = stylesheet_pack_tag current_theme, media: 'all'
= stylesheet_pack_tag 'common', media: 'all'
= stylesheet_pack_tag current_theme, media: 'all'
= javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
= javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
= csrf_meta_tags
......
default: styles/application.scss
contrast: styles/contrast.scss
gabsocial-light: styles/gabsocial-light.scss
default: styles/application.scss
\ No newline at end of file
const { join, resolve } = require('path');
const MiniCssExtractPlugin = require('mini-css-extract-plugin');
const { settings, themes } = require('../configuration');
console.log("themes", themes);
let pathy = resolve(join(settings.source_path, themes.default));
console.log("pathy:", pathy);
module.exports = {
test: /\.s?css$/i,
use: [
// 'style-loader',
MiniCssExtractPlugin.loader,
{
loader: 'css-loader',
options: {
sourceMap: true,
importLoaders: 2,
localIdentName: '[name]__[local]___[hash:base64:5]',
// modules: true,
// localIdentName: '[name]',
},
},
{
......@@ -23,12 +33,18 @@ module.exports = {
options: {
implementation: require('sass'),
sourceMap: true,
includePaths: [pathy],
sassOptions: {
includePaths: [pathy],
}
},
},
{
loader: 'sass-resources-loader',
options: {
resources: `${process.cwd()}/app/javascript/styles/base.scss`,
resources: [
pathy,
]
},
},
],
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment