diff --git a/src/components/Cards/ImageCard.css b/src/components/Cards/ImageCard.css new file mode 100644 index 00000000..398cfdda --- /dev/null +++ b/src/components/Cards/ImageCard.css @@ -0,0 +1,13 @@ +.root { + cursor: pointer; +} + +.root h1 { + font-weight: 500; + font-size: 18px; +} + +.root h2 { + font-weight: 400; + font-size: 16px; +} diff --git a/src/components/Cards/ImageCard.js b/src/components/Cards/ImageCard.js index 9dbe971d..1d09aa16 100644 --- a/src/components/Cards/ImageCard.js +++ b/src/components/Cards/ImageCard.js @@ -1,5 +1,6 @@ import React, { PropTypes } from 'react'; import { Card } from '../UI'; +import styles from './ImageCard.css' export default class ImageCard extends React.Component { constructor(props) { @@ -34,16 +35,16 @@ export default class ImageCard extends React.Component { render() { const { onClick, image, text } = this.props; return ( - - -

{text}

+ + {image ? : null} +

{text}

); } } ImageCard.propTypes = { - image: PropTypes.string.isRequired, + image: PropTypes.string, onClick: PropTypes.func, onImageLoaded: PropTypes.func, text: PropTypes.string.isRequired diff --git a/src/components/EntryListing.js b/src/components/EntryListing.js index 0a08f48a..130f1cd2 100644 --- a/src/components/EntryListing.js +++ b/src/components/EntryListing.js @@ -12,12 +12,13 @@ export default class EntryListing extends React.Component { this.bricksConfig = { packed: 'data-packed', sizes: [ - { columns: 2, gutter: 15 }, - { mq: '780px', columns: 3, gutter: 15 }, - { mq: '1035px', columns: 4, gutter: 15 }, - { mq: '1290px', columns: 5, gutter: 15 }, - { mq: '1545px', columns: 6, gutter: 15 }, - { mq: '1800px', columns: 7, gutter: 15 }, + { columns: 1, gutter: 15 }, + { mq: '495px', columns: 2, gutter: 15 }, + { mq: '750px', columns: 3, gutter: 15 }, + { mq: '1005px', columns: 4, gutter: 15 }, + { mq: '1260px', columns: 5, gutter: 15 }, + { mq: '1515px', columns: 6, gutter: 15 }, + { mq: '1770px', columns: 7, gutter: 15 }, ] }; } diff --git a/src/containers/App.css b/src/containers/App.css new file mode 100644 index 00000000..ad6bef11 --- /dev/null +++ b/src/containers/App.css @@ -0,0 +1,43 @@ +.alignable { + margin: 0px auto; +} + +@media (max-width: 749px) and (min-width: 495px) { + .alignable { + width: 495px; + } +} + +@media (max-width: 1004px) and (min-width: 750px) { + .alignable { + width: 750px; + } +} + +@media (max-width: 1259px) and (min-width: 1005px) { + .alignable { + width: 1005px; + } +} + +@media (max-width: 1514px) and (min-width: 1260px) { + .alignable { + width: 1260px; + } +} + +@media (max-width: 1769px) and (min-width: 1515px) { + .alignable { + width: 1515px; + } +} + +@media (min-width: 1770px) { + .alignable { + width: 1770px; + } +} + +.main { + padding-top: 60px; +} diff --git a/src/containers/App.js b/src/containers/App.js index 290a6d4a..2e0a00ef 100644 --- a/src/containers/App.js +++ b/src/containers/App.js @@ -5,6 +5,7 @@ import { loginUser } from '../actions/auth'; import { currentBackend } from '../backends/backend'; import { LIST_POSTS, LIST_FAQ, HELP, MORE_COMMANDS } from '../actions/findbar'; import FindBar from './FindBar'; +import styles from './App.css'; class App extends React.Component { componentDidMount() { @@ -70,12 +71,18 @@ class App extends React.Component { return (
- - {children} +
+
+ +
+
+
+ {children} +
); } diff --git a/src/containers/FindBar.css b/src/containers/FindBar.css index c520bfbb..5f31c520 100644 --- a/src/containers/FindBar.css +++ b/src/containers/FindBar.css @@ -10,9 +10,8 @@ position: relative; background-color: var(--backgroundColor); padding: 1px 0; - margin-bottom: 50px; + margin: 4px auto; } - .inputArea { display: table; width: calc(100% - 10px); diff --git a/src/index.css b/src/index.css index d1c6f90d..7d136634 100644 --- a/src/index.css +++ b/src/index.css @@ -2,6 +2,7 @@ html { box-sizing: border-box; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; + margin: 0; } *, *:before, *:after { box-sizing: inherit; @@ -10,8 +11,23 @@ html { body { font-family: 'Roboto', sans-serif; height: 100%; + background-color: #fafafa; + margin: 0; +} + +header { + background-color: #fff; + box-shadow: 0 1px 2px 0 rgba(0,0,0,0.22); + height: 54px; + position: fixed; + width: 100%; + z-index: 999; } :global #root, :global #root > * { height: 100%; } + +h1, h2, h3, h4, h5, h6 { + margin: 0; +}