From d32005d5f83e5a79cf8a832608c294d781704187 Mon Sep 17 00:00:00 2001 From: "I. Dan Calinescu" Date: Tue, 5 Feb 2019 04:41:07 -0500 Subject: [PATCH] updated web --- web/lib/components/BuyInfo.js | 12 +++++++++--- web/lib/components/Timer.js | 30 ++++++++++++++---------------- web/package.json | 2 +- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/web/lib/components/BuyInfo.js b/web/lib/components/BuyInfo.js index 4996db35..200e64ae 100644 --- a/web/lib/components/BuyInfo.js +++ b/web/lib/components/BuyInfo.js @@ -76,11 +76,17 @@ var BuyInfo = function (_Component) { return _react2.default.createElement( _antd.Button, - { href: path ? path : link, type: 'primary', style: { backgroundColor: this.state.hovered ? this.props.hoveredButtonColor : this.props.buttonColor, border: 0, marginBottom: '30px' }, onMouseEnter: function onMouseEnter() { + { + href: path ? path : link, + type: 'primary', + style: { backgroundColor: this.state.hovered ? this.props.hoveredButtonColor : this.props.buttonColor, border: 0, marginBottom: '30px', padding: '2px 15px' }, + onMouseEnter: function onMouseEnter() { _this2.setState({ hovered: true }); - }, onMouseLeave: function onMouseLeave() { + }, + onMouseLeave: function onMouseLeave() { _this2.setState({ hovered: false }); - } }, + } + }, this.props.action, _react2.default.createElement(_antd.Icon, { type: 'arrow-right', style: { marginLeft: this.state.hovered ? '30px' : '5px' } }) ); diff --git a/web/lib/components/Timer.js b/web/lib/components/Timer.js index f8ae96ff..583370b3 100644 --- a/web/lib/components/Timer.js +++ b/web/lib/components/Timer.js @@ -121,7 +121,7 @@ var Timer = function (_Component) { value: function renderSimpleText() { return _react2.default.createElement( _typography.Typography, - { use: 'headline4', style: { margin: '10px', textShadow: '2px 2px 5px #607D8B' } }, + { use: 'headline4', style: { margin: '10px', color: this.props.textColor } }, this.state.period.text ); } @@ -130,7 +130,7 @@ var Timer = function (_Component) { value: function renderInfo() { return _react2.default.createElement( _typography.Typography, - { use: 'headline5', style: { marginBottom: '10px', textShadow: '2px 2px 5px #607D8B' } }, + { use: 'headline5', style: { marginBottom: '10px', color: this.props.textColor } }, this.state.period.info ); } @@ -163,19 +163,19 @@ var Timer = function (_Component) { seconds = _ref.seconds, completed = _ref.completed; - var size = this.props.isSmallScreen ? 'headline4' : 'headline4'; + var size = this.props.isSmallScreen ? 'headline6' : 'headline6'; var margin = this.props.isSmallScreen ? '5' : '20'; - var width = this.props.isSmallScreen ? '40' : '90'; + var width = this.props.isSmallScreen ? '30' : '50'; var height = this.props.isSmallScreen ? '140' : '50'; - var typographyStyle = { margin: margin + 'px', color: '#fff', height: 40 }; + var typographyStyle = { margin: margin + 'px', color: '#fff' }; var style = { - border: '2px solid #ffffff', - color: this.props.textColor, - background: 'transparent', + border: '2px solid #4ebcd4', + backgroundColor: '#fff', + color: "#4ebcd4", padding: 2, width: width, - height: 60 + height: 40 }; return _react2.default.createElement( @@ -189,7 +189,7 @@ var Timer = function (_Component) { { use: size, style: typographyStyle }, _react2.default.createElement( _chip.ChipText, - { style: { marginLeft: 5 } }, + { style: { marginLeft: 5, color: '#4ebcd4' } }, days, 'd' ) @@ -203,7 +203,7 @@ var Timer = function (_Component) { { use: size, style: typographyStyle }, _react2.default.createElement( _chip.ChipText, - null, + { style: { color: '#4ebcd4' } }, hours, 'h' ) @@ -217,7 +217,7 @@ var Timer = function (_Component) { { use: size, style: typographyStyle }, _react2.default.createElement( _chip.ChipText, - null, + { style: { color: '#4ebcd4' } }, minutes, 'm' ) @@ -231,7 +231,7 @@ var Timer = function (_Component) { { use: size, style: typographyStyle }, _react2.default.createElement( _chip.ChipText, - null, + { style: { color: '#4ebcd4' } }, seconds, 's' ) @@ -283,7 +283,6 @@ var Timer = function (_Component) { display: 'flex', flex: 1, paddingTop: '20px', - paddingBottom: '50px', backgroundColor: this.props.backgroundColor, flexDirection: 'column', alignItems: 'center', @@ -291,8 +290,7 @@ var Timer = function (_Component) { } }, this.renderSimpleText(), this.renderClock(), - this.renderInfo(), - this.renderAction() + this.renderInfo() ); } }]); diff --git a/web/package.json b/web/package.json index 4d83744b..038ea549 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "react-dom-chunky", - "version": "1.0.16", + "version": "1.0.17", "description": "The Chunky Web Framework", "main": "lib/index.js", "scripts": {