diff --git a/app/actions/counter.js b/app/actions/counter.js deleted file mode 100644 index bd35b3c2..00000000 --- a/app/actions/counter.js +++ /dev/null @@ -1,41 +0,0 @@ -// @flow -import type { counterStateType } from '../reducers/counter'; - -type actionType = { - +type: string -}; - -export const INCREMENT_COUNTER = 'INCREMENT_COUNTER'; -export const DECREMENT_COUNTER = 'DECREMENT_COUNTER'; - -export function increment() { - return { - type: INCREMENT_COUNTER - }; -} - -export function decrement() { - return { - type: DECREMENT_COUNTER - }; -} - -export function incrementIfOdd() { - return (dispatch: (action: actionType) => void, getState: () => counterStateType) => { - const { counter } = getState(); - - if (counter % 2 === 0) { - return; - } - - dispatch(increment()); - }; -} - -export function incrementAsync(delay: number = 1000) { - return (dispatch: (action: actionType) => void) => { - setTimeout(() => { - dispatch(increment()); - }, delay); - }; -} diff --git a/app/app.global.css b/app/app.global.css deleted file mode 100644 index 7238f732..00000000 --- a/app/app.global.css +++ /dev/null @@ -1,39 +0,0 @@ -@import "~font-awesome/css/font-awesome.css"; - -body { - position: relative; - color: white; - height: 100vh; - background-color: #000; - background-image: linear-gradient(45deg, rgba(29, 29, 29, 0.5) 10%, rgba(235, 184, 100, 0.7)); - font-family: Arial, Helvetica, Helvetica Neue, serif; - overflow-y: hidden; -} - -h2 { - margin: 0; - font-size: 2.25rem; - font-weight: bold; - letter-spacing: -0.025em; - color: #fff; -} - -p { - font-size: 24px; -} - -li { - list-style: none; -} - -a { - color: white; - opacity: 0.75; - text-decoration: none; -} - -a:hover { - opacity: 1; - text-decoration: none; - cursor: pointer; -} diff --git a/app/app.global.scss b/app/app.global.scss new file mode 100644 index 00000000..2e58bf57 --- /dev/null +++ b/app/app.global.scss @@ -0,0 +1,24 @@ +@import "~font-awesome/css/font-awesome.css"; +@import 'reset.scss'; +@import 'variables.scss'; + +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url(http://fonts.gstatic.com/s/roboto/v15/Fl4y0QdOxyyTHEGMXX8kcaCWcynf_cDxXwCLxiixG1c.ttf) format('truetype'); +} + +body { + position: relative; + overflow-y: hidden; + margin: 0; + padding: 0; + // background: linear-gradient(to bottom, $grey 0%, $black 100%); + color: $white; + height: 100vh; + box-sizing: border-box; + -webkit-font-smoothing: antialiased; + -webkit-tap-highlight-color: rgba(255,255,255,0); + font-family: 'Roboto'; +} \ No newline at end of file diff --git a/app/app.html b/app/app.html index 9c75d758..4d3e1389 100644 --- a/app/app.html +++ b/app/app.html @@ -3,6 +3,10 @@ Hello Electron React! + + + +