diff --git a/src/components/CanvasItem.jsx b/src/components/CanvasItem.jsx index 118f86f..629f3ee 100644 --- a/src/components/CanvasItem.jsx +++ b/src/components/CanvasItem.jsx @@ -14,12 +14,12 @@ const textStyle = { color: 'hsla(218, 5%, 47%, .6)', fontSize: 14, fontWeight: 500, - position: 'relative', - textAlign: 'inherit', - float: 'none', - margin: 2, padding: 0, - overflow: 'auto', + display: 'inline-block', + verticalAlign: 'middle', + marginTop: 3, + marginBottom: 3, + width: '75%', }; const infoStyle = { @@ -35,25 +35,30 @@ const infoStyle = { const titleStyle = { color: '#4f545c', - marginLeft: 0, - marginRight: 10, overflow: 'hidden', wordWrap: 'break-word', - lineHeight: '24px', + lineHeight: '26px', fontSize: 16, - marginTop: 5, - marginBottom: 0, fontWeight: 'bold', }; const buttonStyle = { - marginTop: 10, - marginBottom: 10, + marginTop: 8, + marginBottom: 8, border: '#c5c5c5', borderStyle: 'solid', + borderRadius: 8, cursor: 'pointer', }; +const imageStyle = { + maxWidth: '20%', + opacity: 0.3, + padding: 2, + display: 'inline-block', + verticalAlign: 'middle', +}; + const CanvasItem = ({ canvasId, canvas, changeCanvas }) => (
( role="button" tabIndex={0} > + preview

- preview {canvas.title}
{canvas.desc}
Cooldown: @@ -83,7 +86,8 @@ const CanvasItem = ({ canvasId, canvas, changeCanvas }) => ( {(canvas.req !== -1) ? User Account : null} {(canvas.req > 0) ? and {canvas.req} Pixels set : null} -
+ + {(canvas.req !== -1) ?
: null} Dimensions: {canvas.size} x {canvas.size} {(canvas.v) diff --git a/src/components/Menu.jsx b/src/components/Menu.jsx index 64bc672..31158f3 100644 --- a/src/components/Menu.jsx +++ b/src/components/Menu.jsx @@ -1,5 +1,7 @@ /* * Menu with Buttons on the top left + * + * @flow */ import React from 'react'; @@ -21,7 +23,8 @@ const Menu = ({ {(menuOpen) ? : null} {(menuOpen) ? : null} {(menuOpen) ? : null} - {(minecraftname && !messages.includes('not_mc_verified') && canvasId == 0) ? : null} + {(minecraftname && !messages.includes('not_mc_verified') && canvasId === 0) + ? : null}

); diff --git a/src/components/UI.jsx b/src/components/UI.jsx index 653790c..d5c4d1a 100644 --- a/src/components/UI.jsx +++ b/src/components/UI.jsx @@ -15,7 +15,7 @@ import Palette from './Palette'; import HistorySelect from './HistorySelect'; -const UI = ({ isHistoricalView }) => { +const UI = ({ isHistoricalView, is3D }) => { if (isHistoricalView) { return ; } @@ -23,7 +23,7 @@ const UI = ({ isHistoricalView }) => {
- + {(is3D) ? null : }
@@ -33,9 +33,11 @@ const UI = ({ isHistoricalView }) => { function mapStateToProps(state: State) { const { isHistoricalView, + is3D, } = state.canvas; return { isHistoricalView, + is3D, }; }