From 176b60be89a42128f9fb23855cf0d8b668633be6 Mon Sep 17 00:00:00 2001 From: MariaZ Date: Sun, 14 Feb 2021 14:52:03 +0100 Subject: [PATCH 1/3] Update stats layout --- components/stats.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/components/stats.js b/components/stats.js index 1cdcf1b..c71d979 100644 --- a/components/stats.js +++ b/components/stats.js @@ -89,6 +89,7 @@ const styles = StyleSheet.create({ alignItems: 'center', flexDirection: 'row', justifyContent: 'space-between', + paddingTop: Spacing.base, }, columnLeft: { ...column, @@ -100,8 +101,6 @@ const styles = StyleSheet.create({ paddingTop: Spacing.small, }, image: { - marginLeft: Spacing.large, - marginTop: Spacing.large, resizeMode: 'contain', }, @@ -110,8 +109,8 @@ const styles = StyleSheet.create({ marginBottom: Spacing.large, }, pageContainer: { - marginVertical: Spacing.base, + marginTop: Spacing.base * 2, } }) -export default Stats \ No newline at end of file +export default Stats From a261154889ea67f1700798f28eaa30643e87be2b Mon Sep 17 00:00:00 2001 From: MariaZ Date: Sun, 14 Feb 2021 14:55:47 +0100 Subject: [PATCH 2/3] Fixes SymptomEditView centering --- components/cycle-day/symptom-edit-view.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/cycle-day/symptom-edit-view.js b/components/cycle-day/symptom-edit-view.js index b6e4195..a6e0de9 100644 --- a/components/cycle-day/symptom-edit-view.js +++ b/components/cycle-day/symptom-edit-view.js @@ -256,10 +256,10 @@ const styles = StyleSheet.create({ }, modalContainer: { flex: 1, - padding: Spacing.small, - paddingBottom: Spacing.base + padding: Spacing.base, }, modalWindow: { + alignSelf: 'center', backgroundColor: 'white', borderRadius: 10, marginVertical: Sizes.huge * 2, @@ -284,4 +284,4 @@ const mapStateToProps = (state) => { export default connect( mapStateToProps, null, -)(SymptomEditView) \ No newline at end of file +)(SymptomEditView) From 5325f071bd62f999c27ed64c8bf6599866061cbd Mon Sep 17 00:00:00 2001 From: MariaZ Date: Sun, 14 Feb 2021 20:07:45 +0100 Subject: [PATCH 3/3] Remove detox for now to fix npm i errors --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 66ea4ab..61e106b 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,6 @@ "babel-jest": "^24.8.0", "basic-changelog": "gitlab:bloodyhealth/basic-changelog", "chai": "^4.1.2", - "detox": "^13.1.1", "dirty-chai": "^2.0.1", "eslint": "^5.16.0", "eslint-plugin-react": "^7.8.2", @@ -121,4 +120,4 @@ }, "test-runner": "mocha" } -} \ No newline at end of file +}