Merge pull request #511 from mrfelton/refactor/consolidate-styles

refactor: move styles to styles directory

.stylelintignore

@@ -1 +1 @@
-app/reset.scss
+app/styles/reset.scss

app/components/Activity/ActivityModal.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: relative;

app/components/Activity/Countdown.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   display: block;

app/components/Activity/InvoiceModal.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   color: $white;

app/components/Activity/PaymentModal.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   color: $white;

app/components/Activity/TransactionModal.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   color: $white;

app/components/Contacts/AddChannel.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: relative;

app/components/Contacts/ChannelForm.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: absolute;

app/components/Contacts/ConnectManually.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: absolute;

app/components/Contacts/ContactModal.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .header {
   display: flex;

app/components/Contacts/ContactsForm.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .modal {
   position: absolute;

app/components/Contacts/Network.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .network {
   position: relative;

app/components/Contacts/SubmitChannelForm.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .content {
   padding: 0 40px;

app/components/Contacts/SuggestedNodes.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   color: $white;

app/components/Form/Form.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: absolute;

app/components/Form/Pay.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   padding: 0 40px;

app/components/Form/Request.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   padding: 0 40px;

app/components/GlobalError/GlobalError.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: absolute;

app/components/LoadingBolt/LoadingBolt.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   z-index: 1000;

app/components/Onboarding/Alias.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .alias {
   background: transparent;

app/components/Onboarding/Autopilot.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   color: $white;

app/components/Onboarding/ConnectionDetails.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   color: $white;

app/components/Onboarding/ConnectionType.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   color: $white;

app/components/Onboarding/FormContainer.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: relative;

app/components/Onboarding/InitWallet.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: relative;

app/components/Onboarding/Login.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: relative;

app/components/Onboarding/NewAezeedPassword.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .input:nth-child(2) {
   margin-top: 30px;

app/components/Onboarding/NewWalletPassword.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .input:nth-child(2) {
   margin-top: 30px;

app/components/Onboarding/NewWalletSeed.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   font-size: 14px;

app/components/Onboarding/ReEnterSeed.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .seedContainer {
   display: flex;

app/components/Onboarding/RecoverForm.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .seedContainer {
   position: relative;

app/components/Onboarding/Signup.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   color: $white;

app/components/Onboarding/Syncing.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: relative;

app/components/Wallet/ReceiveModal.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .container {
   position: relative;

app/components/Wallet/Wallet.scss

@@ -1,4 +1,4 @@
-@import '../../variables.scss';
+@import '../../styles/variables.scss';
 
 .wallet {
   background: $bluegrey;

app/index.js

@@ -3,7 +3,7 @@ import { render } from 'react-dom'
 import { AppContainer } from 'react-hot-loader'
 import Root from './containers/Root'
 import { configureStore, history } from './store/configureStore'
-import './app.global.scss'
+import './styles/app.global.scss'
 
 const store = configureStore()
 

app/routes/activity/components/Activity.scss

@@ -1,4 +1,4 @@
-@import '../../../variables.scss';
+@import '../../../styles/variables.scss';
 
 .search {
 	height: 55px;

app/routes/activity/components/components/Activity.scss

@@ -1,4 +1,4 @@
-@import '../../../../variables.scss';
+@import '../../../../styles/variables.scss';
 
 .container {
   display: flex;

app/routes/activity/components/components/Transaction/Transaction.scss

@@ -1,4 +1,4 @@
-@import '../../../../../variables.scss';
+@import '../../../../../styles/variables.scss';
 
 .container {
   display: flex;

app/routes/app/components/App.scss

@@ -1,4 +1,4 @@
-@import '../../../variables.scss';
+@import '../../../styles/variables.scss';
 
 .content {
 	position: relative;

package.json

@@ -16,9 +16,9 @@
     "lint-fix-base": "npm run lint-base -- --fix",
     "lint-fix": "npm run lint-fix-base -- \"./**/*.{js,json,md}\"",
     "lint-styles-base": "stylelint --custom-formatter=node_modules/stylelint-formatter-pretty",
-    "lint-styles": "npm run lint-styles-base -- app/*.scss app/components/**/*.scss",
+    "lint-styles": "npm run lint-styles-base -- $npm_package_config_style_paths",
     "lint-styles-fix-base": "npm run lint-styles-base -- --fix",
-    "lint-styles-fix": "npm run lint-styles-fix-base -- app/*.scss app/components/**/*.scss",
+    "lint-styles-fix": "npm run lint-styles-fix-base -- $npm_package_config_style_paths",
     "lint-check": "eslint --print-config .eslintrc.js | eslint-config-prettier-check",
     "lint-ci": "npm run lint && npm run lint-styles && npm run flow",
     "package": "npm run build && build --publish never",
@@ -36,6 +36,9 @@
     "test-e2e": "cross-env NODE_ENV=test BABEL_DISABLE_CACHE=1 node --trace-warnings ./test/runTests.js e2e",
     "test-watch": "npm test -- --watch"
   },
+  "config": {
+    "style_paths": "app/styles/*.scss app/components/**/*.scss"
+  },
   "browserslist": "electron 2.0",
   "engines": {
     "node": ">=8.2.1",