diff --git a/src/achievements/AchievementItem.js b/src/achievements/AchievementItem.js index 4c699a0..7ba99b4 100644 --- a/src/achievements/AchievementItem.js +++ b/src/achievements/AchievementItem.js @@ -24,7 +24,7 @@ class AchievementItem extends Component { Description: {this.props.description} {this.props.completedDate ? Completed: {this.props.completedDate.replace('T', ' ')} : ''} -
{this.props.progress} of {this.props.completeCondition}
+
{this.props.progress} of {this.props.completeCondition}
diff --git a/src/diary/Diary.css b/src/diary/Diary.css index f4e39f4..0bba654 100644 --- a/src/diary/Diary.css +++ b/src/diary/Diary.css @@ -122,15 +122,7 @@ } .main_diary_card { - min-height: 500px; - min-width: 300px; - display: inline-block; - align-self: center; - align-items: center; - align-content: center; - width: 80%; - display: table; - margin: 0 auto; + } .datepicker_card_container { @@ -153,6 +145,7 @@ } .card-container { + background-color: #424242; flex-direction: row; align-content: center; } diff --git a/src/start/Start.css b/src/start/Start.css index 3038b7d..a00df0f 100755 --- a/src/start/Start.css +++ b/src/start/Start.css @@ -18,6 +18,11 @@ h1 + p { align-items: center; } +@media screen and (max-width: 600px) { + .update { + font-size: 5vw !important; + } +} .wrap { margin: 2rem; } @@ -534,3 +539,27 @@ h1 + p { .select-css:disabled:hover, .select-css[aria-disabled=true] .field-css{ border-color: #aaa; } + +.white-color{ + color: white; +} +.fat-label-bot { + position: fixed; + bottom: 50px; + right: 30px; + font-size: 2rem; + font-weight: lighter; + color: #fff; + + +} + +.carbs-label-bot { + position: fixed; + bottom: 50px; + left: 30px; + font-size: 2rem; + font-weight: lighter; + color: #fff; + +} \ No newline at end of file diff --git a/src/start/Start.js b/src/start/Start.js index bcb32db..ab01b32 100755 --- a/src/start/Start.js +++ b/src/start/Start.js @@ -4,8 +4,19 @@ import './Start.css' import 'react-datepicker/dist/react-datepicker.css' import '@shwilliam/react-rubber-slider/dist/styles.css' import StartForm from './StartForm' +import $ from 'jquery' class Start extends Component { + componentDidMount () { + if (this.props.currentUser.userPlan == undefined ) { + $('li').addClass('hide') + $('.logo').click(function(e) { + e.preventDefault(); + }); + } + } + + constructor (props) { super(props) this.state = { @@ -43,7 +54,7 @@ class Start extends Component { let formGreeting = this.props.currentUser.userPlan == undefined ? (

Fill up starter form!

- ): (

Fill form to update your plan!

+ ): (

Fill form to update plan!

); let backgroundForm = this.props.currentUser.userPlan == undefined ? "bottom_background": "bottom_background_update" diff --git a/src/start/StartForm.js b/src/start/StartForm.js index 724db46..b367c20 100644 --- a/src/start/StartForm.js +++ b/src/start/StartForm.js @@ -129,6 +129,8 @@ class StartForm extends Component { Alert.error('Something went wrong with saving your user plan') }) .finally(() => { + $('.logo').prop('disabled', false); + $('li').removeClass('hide') setSubmitting(false) }) } @@ -353,10 +355,10 @@ class StartForm extends Component { -
+
Carbs
-
+
Fats