Merge branch 'master' of https://github.com/as6730/Weekender

Author: briemcnally

client/frontend/components/ShowPage.js

@@ -178,15 +178,16 @@ class ShowPage extends React.Component {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    height: "100%",
+    height: "95%",
+    marginTop: '5%',
   },
   title: {
     fontSize: 24,
     fontWeight: 'bold',
     marginBottom: 10,
   },
   info: {
-    padding: 25,
+    padding: 15,
     height: '30%',
     borderBottomWidth: 1,
     borderTopWidth: 1,
@@ -200,7 +201,7 @@ const styles = StyleSheet.create({
     width: '100%',
   },
   mapContainer: {
-    height: '45%',
+    height: '48%',
     zIndex: -10,
   },
   map: {
@@ -230,7 +231,7 @@ const styles = StyleSheet.create({
     borderColor: '#FE5D26',
     height: 30,
     width: '40%',
-    marginTop: 260,
+    marginTop: 240,
   },
   textStyle: {
     alignSelf: 'center',

client/frontend/components/common/BigButton.js

@@ -31,7 +31,7 @@ const BigButton = ({ onPress, children, isPressed, color, imgUrl}) => {
         source={imgUrl}/>
       <View style={{
           position: 'absolute',
-          backgroundColor: (isPressed ? 'transparent' : 'rgba(236, 236, 236, 0.75)'),
+          backgroundColor: (isPressed ? 'transparent' : 'rgba(236, 236, 236, 0.5)'),
           height: '100%',
           width: "100%"}}
           transform={[{translateY: -0.5}]}/>

client/frontend/components/common/Button.js

@@ -20,7 +20,7 @@ const styles = {
     borderColor: '#FE5D26',
     height: 30,
     width: '40%',
-    marginTop: 260,
+    marginTop: 240,
   },
   textStyle: {
     alignSelf: 'center',