From c5043f692d3b531d68ddc6709a316085f601e177 Mon Sep 17 00:00:00 2001 From: Mattias Date: Fri, 24 Nov 2017 20:20:45 -0500 Subject: [PATCH] fixed scss not updating --- .gitignore | 1 + package.json | 2 +- src/index.js | 2 +- src/styles/components/favoriteButton.scss | 2 ++ src/styles/components/sidebar.scss | 3 +++ src/styles/containers/facilityCard.scss | 2 ++ 6 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fc65e15..77b69b2 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ yarn-error.log* /.storybook /src/stories /src/styles/whatsOpen.css +/src/styles/build diff --git a/package.json b/package.json index 7fa0996..a5840c0 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ }, "proxy": "http://localhost:3001", "scripts": { - "build-css": "node-sass-chokidar src/styles/whatsOpen.scss -o src/styles/", + "build-css": "node-sass-chokidar src/styles/ -o src/styles/build", "watch-css": "npm run build-css --watch --recursive", "start-js": "react-scripts start", "start": "npm-run-all -p watch-css start-js", diff --git a/src/index.js b/src/index.js index 8d01c4b..e15ac3a 100644 --- a/src/index.js +++ b/src/index.js @@ -11,7 +11,7 @@ import ReduxThunk from 'redux-thunk'; import reducers from './reducers/index'; import {MuiThemeProvider} from 'material-ui/styles'; import theme from './theme'; -import './styles/whatsOpen.css'; +import './styles/build/whatsOpen.css'; // Create a history of your choosing (we're using a browser history in this case) const history = createHistory(); diff --git a/src/styles/components/favoriteButton.scss b/src/styles/components/favoriteButton.scss index 8ca98ce..03256d6 100644 --- a/src/styles/components/favoriteButton.scss +++ b/src/styles/components/favoriteButton.scss @@ -1,3 +1,5 @@ +@import '../_variables.scss'; + .favorite-button-heart { position: absolute; top: 0; diff --git a/src/styles/components/sidebar.scss b/src/styles/components/sidebar.scss index 389c979..f4ddc45 100644 --- a/src/styles/components/sidebar.scss +++ b/src/styles/components/sidebar.scss @@ -1,3 +1,6 @@ +@import '../_variables.scss'; +@import '../_mixins.scss'; + .sidebar-label-row { display: flex; } diff --git a/src/styles/containers/facilityCard.scss b/src/styles/containers/facilityCard.scss index 517f8fb..fede8ab 100644 --- a/src/styles/containers/facilityCard.scss +++ b/src/styles/containers/facilityCard.scss @@ -1,3 +1,5 @@ +@import '../_variables.scss'; + .fc-root { width: 250px; border-radius: 5px !important; -- GitLab