diff --git a/src/components/Apple/style.scss b/src/components/Apple/style.scss index 835da79..8543154 100644 --- a/src/components/Apple/style.scss +++ b/src/components/Apple/style.scss @@ -1,5 +1,4 @@ -@import '../../app.scss'; - +@import '../../style/mixins.scss'; .apple-out { visibility: hidden; diff --git a/src/components/Button/style.scss b/src/components/Button/style.scss index da70d84..e698ee4 100644 --- a/src/components/Button/style.scss +++ b/src/components/Button/style.scss @@ -1,4 +1,4 @@ -@import '../../app.scss'; +@import '../../style/mixins.scss'; $shake-color: #a77600; diff --git a/src/components/Tree/style.scss b/src/components/Tree/style.scss index 9f57338..1d8d57f 100644 --- a/src/components/Tree/style.scss +++ b/src/components/Tree/style.scss @@ -1,4 +1,4 @@ -@import '../../app.scss'; +@import '../../style/mixins.scss'; .shake-tree { animation: shake 1s cubic-bezier(0.36, 0.07, 0.19, 0.97) both; diff --git a/src/index.js b/src/index.js index 4f97cb2..86864fc 100755 --- a/src/index.js +++ b/src/index.js @@ -5,6 +5,8 @@ import { Provider } from 'react-redux'; import App from './containers/App'; import configureStore from './configureStore'; +import './style/global.scss'; + const store = configureStore(); const MOUNT_NODE = document.getElementById('app'); diff --git a/src/style/global.scss b/src/style/global.scss new file mode 100644 index 0000000..e3de422 --- /dev/null +++ b/src/style/global.scss @@ -0,0 +1,11 @@ +html, +body { + margin: 0; + padding: 0; + overflow: hidden; +} + +svg { + width: 100%; + height: 100%; +} \ No newline at end of file diff --git a/src/app.scss b/src/style/mixins.scss similarity index 93% rename from src/app.scss rename to src/style/mixins.scss index fe65689..aac62f8 100644 --- a/src/app.scss +++ b/src/style/mixins.scss @@ -1,10 +1,3 @@ -html, -body { - margin: 0; - padding: 0; - overflow: hidden; -} - // translate3d @mixin translate3d($x, $y, $z) { -webkit-transform: translate3d($x, $y, $z);