improvements: restyling design

This commit is contained in:
Francesco Esposito 2020-05-12 15:25:33 +02:00
parent 1585c44d3e
commit 096560c3d9
12 changed files with 3705 additions and 3226 deletions

View File

@ -16,4 +16,6 @@ Try tomadoro: https://franjsco.github.io/tomadoro/
GPLv3 GPLv3
--- ---
Photo by Zoltan Tasi on Unsplash
Made with ❤️ by Francesco Esposito ([@franjsco](https://github.com/franjsco)) Made with ❤️ by Francesco Esposito ([@franjsco](https://github.com/franjsco))

6855
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,18 +1,18 @@
{ {
"name": "tomadoro", "name": "tomadoro",
"description": "tomadoro", "description": "tomadoro",
"version": "1.6.0", "version": "1.7.0",
"private": true, "private": true,
"engines": { "engines": {
"npm": "6.4.1", "npm": "6.4.1",
"node": "10.15.0" "node": "10.15.0"
}, },
"dependencies": { "dependencies": {
"bootstrap": "^4.3.1", "bootstrap": "^4.4.1",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
"react": "^16.11.0", "react": "^16.13.1",
"react-dom": "^16.11.0", "react-dom": "^16.13.1",
"react-scripts": "^3.2.0", "react-scripts": "^3.4.1",
"react-web-notification": "^0.5.0", "react-web-notification": "^0.5.0",
"reactstrap": "^7.1.0" "reactstrap": "^7.1.0"
}, },
@ -41,6 +41,6 @@
"author": "franjsco", "author": "franjsco",
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"devDependencies": { "devDependencies": {
"gh-pages": "^2.1.1" "gh-pages": "^2.2.0"
} }
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 1.8 MiB

BIN
src/assets/bg.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 879 KiB

View File

@ -1,29 +1,28 @@
import React from 'react'; import React from 'react';
import { Button, Row, Col } from 'reactstrap'; import { Button, Row, Col, Card, CardBody } from 'reactstrap';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
const box = props => { const box = props => {
const buttonStyle = { const buttonStyle = {
fontSize: '16px', fontSize: '20px',
fontWeight: 'lighter', height: '54px',
height: '50px', borderRadius: '24px',
borderRadius: '30px',
width: '100%', width: '100%',
margin: '4px 0px 4px 0px' margin: '4px 0px 4px 0px'
}; };
const boxStyle = { const boxStyle = {
padding: '6px', padding: '2px',
backgroundColor: 'white', borderRadius: '14px',
borderRadius: '6px', background: 'rgb(0,0,0, 0.4)'
borderBottom: '16px solid #c84132',
boxShadow: '0 2px 3px #8a8888'
}; };
return ( return (
<div style={boxStyle}> <Card style={boxStyle}>
<Row> <CardBody>
<Row>
<Col xs="12"> <Col xs="12">
<Button <Button
style={buttonStyle} style={buttonStyle}
@ -32,7 +31,7 @@ const box = props => {
color="success" color="success"
onClick={props.startButton} onClick={props.startButton}
disabled={props.isStarted || props.seconds===0}> disabled={props.isStarted || props.seconds===0}>
START Start
</Button> </Button>
</Col> </Col>
</Row> </Row>
@ -44,7 +43,7 @@ const box = props => {
size="lg" size="lg"
onClick={props.stopButton} onClick={props.stopButton}
disabled={!props.isStarted}> disabled={!props.isStarted}>
STOP Stop
</Button> </Button>
</Col> </Col>
<Col xs="6"> <Col xs="6">
@ -54,11 +53,12 @@ const box = props => {
size="lg" size="lg"
onClick={props.resetButton} onClick={props.resetButton}
disabled={props.isStarted}> disabled={props.isStarted}>
RESET Reset
</Button> </Button>
</Col> </Col>
</Row> </Row>
</div> </CardBody>
</Card>
); );
} }

View File

@ -2,10 +2,7 @@ import React from 'react';
const footer = () => { const footer = () => {
const style = { const style = {
fontFamily: 'Arial, Helvetica, sans-serif', marginTop: '2px'
marginTop: '8px',
color: '#ffffff',
textShadow: '0 2px 3px #a3a3a3'
}; };
return ( return (

View File

@ -3,15 +3,15 @@ import React from 'react';
const headbar = () => { const headbar = () => {
const style = { const style = {
display: 'flex', display: 'flex',
minHeight: '5vh', minHeight: '4vh',
flexDirection: 'column', flexDirection: 'column',
textAlign: 'left', textAlign: 'left',
alignItems: 'center', alignItems: 'center',
justifyContent: 'center', justifyContent: 'center',
fontSize: '44px', fontSize: '44px',
color: 'white', color: 'white',
textShadow: '0 2px 4px #909090', textShadow: '0 2px 2px #1f1f1f',
marginBottom: '6px' marginBottom: '2px'
}; };
return ( return (

View File

@ -1,6 +1,6 @@
.App-logo { .App-logo {
height: 160px; height: 140px;
filter: drop-shadow(0 0 0.28rem #e7d8786b); filter: drop-shadow(0 0 0.58rem #1f1f1f);
align-items: center; align-items: center;
justify-content: center; justify-content: center;
text-align: center; text-align: center;

View File

@ -15,7 +15,7 @@ const logo = props => {
title="Click on the tomato to change modes" title="Click on the tomato to change modes"
onClick={props.click} onClick={props.click}
></img> ></img>
) );
} }
logo.propTypes = { logo.propTypes = {

View File

@ -5,10 +5,9 @@ import { formatMinute } from '../utils';
const timer = props => { const timer = props => {
const style = { const style = {
fontSize: "110px", fontSize: "120px",
fontWeight: "normal", fontWeight: "normal",
color: "white", textShadow: "0 2px 2px #1f1f1f"
textShadow: "0 2px 3px #8a8888"
}; };
return ( return (

View File

@ -1,9 +1,11 @@
@import url('https://fonts.googleapis.com/css?family=Fredoka+One'); @import url('https://fonts.googleapis.com/css?family=Fredoka+One');
body { body {
background-image: url('../assets/bg.jpg');
background-position: 'center';
background-size: cover;
background-color: #2e2e2e; background-color: #2e2e2e;
text-align: center; text-align: center;
color: #131313;
user-select: none; user-select: none;
font-family: 'Fredoka One', cursive; font-family: 'Fredoka One', cursive;
color: white; color: white;
@ -14,9 +16,9 @@ body {
} }
a { a {
color: #f1fb61; color: #d45a45;
} }
a:hover { a:hover {
color: #fddec0; color: #f6f6f3;
} }