LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

Fix SCSS overrides for site/custom

Browse source
This commit is contained in:
Shawn 2018-12-03 15:32:57 -06:00
parent c1b5d521b9
commit 7288b1f541
3 changed files with 45 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
client/scss/all.scss
View file

@ -1,44 +1,44 @@
@import '_variables'; @import '~scss/_variables';
@import '_reset'; @import '~scss/_reset';
@import 'font/_font.scss'; @import '~scss/font/_font.scss';
@import '_html'; @import '~scss/_html';
@import '_body'; @import '~scss/_body';
@import '_react-app'; @import '~scss/_react-app';
@import '_text'; @import '~scss/_text';
@import '_link'; @import '~scss/_link';
@import '_input'; @import '~scss/_input';
@import '_select'; @import '~scss/_select';
@import '_textarea'; @import '~scss/_textarea';
@import '_video'; @import '~scss/_video';
@import '_form'; @import '~scss/_form';
@import '_asset-display'; @import '~scss/_asset-display';
@import '_asset-preview'; @import '~scss/_asset-preview';
@import '_button'; @import '~scss/_button';
@import '_button-primary'; @import '~scss/_button-primary';
@import '_button-secondary'; @import '~scss/_button-secondary';
@import '_click-to-copy'; @import '~scss/_click-to-copy';
@import '_form-feedback'; @import '~scss/_form-feedback';
@import '_horizontal-split'; @import '~scss/_horizontal-split';
@import '_label'; @import '~scss/_label';
@import '_nav-bar'; @import '~scss/_nav-bar';
@import '_page-layout'; @import '~scss/_page-layout';
@import '_page-layout-show-lite'; @import '~scss/_page-layout-show-lite';
@import '_page-content'; @import '~scss/_page-content';
@import '_progress-bar'; @import '~scss/_progress-bar';
@import '_publish-preview'; @import '~scss/_publish-preview';
@import '_share-buttons'; @import '~scss/_share-buttons';
@import '_space-between'; @import '~scss/_space-between';
@import '_space-around'; @import '~scss/_space-around';
@import '_row'; @import '~scss/_row';
@import '_tooltip'; @import '~scss/_tooltip';
@import '_social-share-link'; @import '~scss/_social-share-link';
@import '_channel-claims-display'; @import '~scss/_channel-claims-display';
@import '_dropzone'; @import '~scss/_dropzone';
@import '_publish-url-input'; @import '~scss/_publish-url-input';
@import '_publish-status'; @import '~scss/_publish-status';
@import '_publish-disabled-message'; @import '~scss/_publish-disabled-message';
@import '_media-queries'; @import '~scss/_media-queries';

15
utils/createModuleAliases.js
View file

@ -2,6 +2,7 @@ const { statSync, existsSync, readdirSync } = require('fs');
const { join, resolve } = require('path'); const { join, resolve } = require('path');
const DEFAULT_ROOT = 'client/build'; const DEFAULT_ROOT = 'client/build';
const CUSTOM_ROOT = 'site/custom/build'; const CUSTOM_ROOT = 'site/custom/build';
const DEFAULT_SCSS_ROOT = 'client/scss';
const CUSTOM_SCSS_ROOT = 'site/custom/scss'; const CUSTOM_SCSS_ROOT = 'site/custom/scss';
const getFolders = path => { const getFolders = path => {
@ -23,17 +24,6 @@ const addAliasesForCustomComponentFolder = (name, aliasObject) => {
return aliasObject; return aliasObject;
}; };
const addAlliasesForSCSS = (aliasObject) => { // scss
// creates an alias for every folder found in the custom scss folder
const customScssRoot = resolve(`${CUSTOM_SCSS_ROOT}`);
const customFolders = getFolders(customScssRoot);
for (let i = 0; i < customFolders.length; i++) {
let folderName = customFolders[i];
aliasObject[folderName] = resolve(`${CUSTOM_SCSS_ROOT}/${folderName}`);
}
return aliasObject;
};
module.exports = () => { module.exports = () => {
let moduleAliases = {}; let moduleAliases = {};
@ -58,9 +48,6 @@ module.exports = () => {
moduleAliases['@sagas'] = resolve(`${DEFAULT_ROOT}/sagas`); moduleAliases['@sagas'] = resolve(`${DEFAULT_ROOT}/sagas`);
moduleAliases['@app'] = resolve(`${DEFAULT_ROOT}/app.js`); moduleAliases['@app'] = resolve(`${DEFAULT_ROOT}/app.js`);
// scss aliases
moduleAliases = addAlliasesForSCSS(moduleAliases);
// return finished aliases // return finished aliases
return moduleAliases; return moduleAliases;
}; };

4
webpack.config.js
View file

@ -2,6 +2,8 @@ const Path = require('path');
const ExtractTextPlugin = require('extract-text-webpack-plugin'); const ExtractTextPlugin = require('extract-text-webpack-plugin');
const createModuleAliases = require('./utils/createModuleAliases.js'); const createModuleAliases = require('./utils/createModuleAliases.js');
const SCSS_ROOT = Path.join(__dirname, 'client/scss/'); const SCSS_ROOT = Path.join(__dirname, 'client/scss/');
const CLIENT_ROOT = Path.join(__dirname, 'client/');
const CUSTOM_CLIENT_ROOT = Path.join(__dirname, 'site/custom/');
const customAliases = createModuleAliases(); const customAliases = createModuleAliases();
@ -38,6 +40,8 @@ module.exports = {
}, },
resolve: { resolve: {
modules: [ modules: [
CUSTOM_CLIENT_ROOT,
CLIENT_ROOT,
SCSS_ROOT, SCSS_ROOT,
'node_modules', 'node_modules',
__dirname, __dirname,