bonkers scroll bugs

2 files changed, 14 insertions, 6 deletions

diff --git a/client/src/lib/timeline/timelineEvent.js b/client/src/lib/timeline/timelineEvent.js
index 3888fc2..d8165fa 100644
--- a/client/src/lib/timeline/timelineEvent.js
+++ b/client/src/lib/timeline/timelineEvent.js
@@ -46,6 +46,14 @@ export default class TimelineEvent extends Component {
     } else {
       image = <View></View>
     }
+    
+    let imageContainer;
+    if (isMobile) {
+      imageContainer = null
+    }
+    else {
+      imageContainer = ( <View style={styles.imageContainer}>{image}</View> )
+    }
     return (
       <TouchableOpacity style={styles.item} activeOpacity={0.8} onPress={() => this.props.onPress(this.props.item) }>
         <div ref={(ref) => this.ref = ref}></div>
@@ -53,7 +61,7 @@ export default class TimelineEvent extends Component {
           <View style={styles.dateContainer}>
             <ClearText style={styles.date}>{item.date}</ClearText>
           </View>
-          <View style={styles.imageContainer}>{image}</View>
+          {imageContainer}
           <View style={styles.titleContainer}>
             <ClearText style={styles.title}>{item.title}</ClearText>
           </View>
@@ -75,7 +83,7 @@ const styles = StyleSheet.create({
     minHeight: 100,
   },
   dateContainer: {
-    width: '30%',
+    width: isMobile ? '50%' : '30%',
     justifyContent: 'flex-start',
     alignItems: 'center',
     paddingRight: 10,
@@ -88,7 +96,7 @@ const styles = StyleSheet.create({
     marginRight: 10,
   },
   titleContainer: {
-    width: '30%',
+    width: isMobile ? '50%' : '30%',
     justifyContent: 'flex-start',
     alignItems: 'center',
     paddingLeft: 10,
diff --git a/client/src/lib/timeline/timelineFull.js b/client/src/lib/timeline/timelineFull.js
index 8490ce2..bc359c1 100644
--- a/client/src/lib/timeline/timelineFull.js
+++ b/client/src/lib/timeline/timelineFull.js
@@ -49,10 +49,10 @@ export default class TimelineFull extends Component {
         <View style={styles.imageContainer}>
           <View style={styles.imageWrapper}>
             <img src={item.image.uri}
-              style={[styles.image, {
+              style={{
                 width: width,
                 height: height,
-              }]} />
+              }} />
           </View>
           {caption}
         </View>
@@ -83,7 +83,7 @@ export default class TimelineFull extends Component {
       return `<a href='${tag}'>${tag}</a>`
     }).join(', ')
     
-    const description = '<p>' + item.description + '</p>'
+    const description = '<p>' + item.description.replace(/\n+/g,'\n\n') + '</p>'
 
     return (
       <View style={styles.container}>