diff options
Diffstat (limited to 'client/src/lib/timeline')
| -rw-r--r-- | client/src/lib/timeline/index.js | 2 | ||||
| -rw-r--r-- | client/src/lib/timeline/tickMarks.js | 2 | ||||
| -rw-r--r-- | client/src/lib/timeline/timelineEvent.js | 3 | ||||
| -rw-r--r-- | client/src/lib/timeline/timelineFull.js | 8 | ||||
| -rw-r--r-- | client/src/lib/timeline/timelineHeader.js | 29 |
5 files changed, 11 insertions, 33 deletions
diff --git a/client/src/lib/timeline/index.js b/client/src/lib/timeline/index.js index ff29fe9..09d2d1b 100644 --- a/client/src/lib/timeline/index.js +++ b/client/src/lib/timeline/index.js @@ -135,8 +135,6 @@ const styles = StyleSheet.create({ flexDirection: 'row', height: 840, }, - flatList: { - }, container: { flex: 1, justifyContent: 'flex-start', diff --git a/client/src/lib/timeline/tickMarks.js b/client/src/lib/timeline/tickMarks.js index c8bda29..629411c 100644 --- a/client/src/lib/timeline/tickMarks.js +++ b/client/src/lib/timeline/tickMarks.js @@ -58,7 +58,7 @@ export default class TickMarks extends Component { this.years.push( <text key={'label_' + year} - fontFamily="Futura-Medium" + fontFamily="'Futura-Medium', sans-serif" fill={fontStyle.fill} fontSize={fontStyle.fontSize} x={1} diff --git a/client/src/lib/timeline/timelineEvent.js b/client/src/lib/timeline/timelineEvent.js index 903ceed..3888fc2 100644 --- a/client/src/lib/timeline/timelineEvent.js +++ b/client/src/lib/timeline/timelineEvent.js @@ -13,6 +13,7 @@ const isIpad = (navigator.userAgent.match(/iPad/i)) const isAndroid = (navigator.userAgent.match(/Android/i)) const isMobile = isIphone || isIpad || isAndroid const isDesktop = ! isMobile +const isFirefox = navigator.userAgent.match('Firefox') const imageHeight = isMobile ? 70 : 100 const imageWidth = isMobile ? 100 : 150 @@ -47,7 +48,7 @@ export default class TimelineEvent extends Component { } return ( <TouchableOpacity style={styles.item} activeOpacity={0.8} onPress={() => this.props.onPress(this.props.item) }> - <div ref={(ref) => this.ref = ref} style={{flex: 0}}></div> + <div ref={(ref) => this.ref = ref}></div> <View style={styles.item}> <View style={styles.dateContainer}> <ClearText style={styles.date}>{item.date}</ClearText> diff --git a/client/src/lib/timeline/timelineFull.js b/client/src/lib/timeline/timelineFull.js index a004987..9fb8179 100644 --- a/client/src/lib/timeline/timelineFull.js +++ b/client/src/lib/timeline/timelineFull.js @@ -199,26 +199,26 @@ const styles = StyleSheet.create({ const tagHTMLStyles = StyleSheet.create({ p: { color: 'white', - fontFamily: 'Futura-Medium', + fontFamily: '"Futura-Medium", sans-serif', textAlign: 'justify', fontSize: 16, lineHeight: 30, }, b: { - fontFamily: 'Futura-MediumItalic', + fontFamily: '"Futura-MediumItalic", sans-serif', color: 'white', fontSize: 16, lineHeight: 30, }, i: { - fontFamily: 'Futura-MediumItalic', + fontFamily: '"Futura-MediumItalic", sans-serif', color: 'white', fontSize: 16, lineHeight: 30, }, a: { color: 'white', - fontFamily: 'Futura-Medium', + fontFamily: '"Futura-Medium", sans-serif', textDecorationLine: 'underline', fontSize: 16, lineHeight: 30, diff --git a/client/src/lib/timeline/timelineHeader.js b/client/src/lib/timeline/timelineHeader.js index 559ace9..26cac31 100644 --- a/client/src/lib/timeline/timelineHeader.js +++ b/client/src/lib/timeline/timelineHeader.js @@ -62,50 +62,29 @@ const styles = StyleSheet.create({ const timelineHTMLStyles = StyleSheet.create({ p: { color: 'white', - fontFamily: 'Futura-Medium', + fontFamily: '"Futura-Medium", sans-serif', textAlign: 'justify', fontSize: 16, lineHeight: 30, }, b: { - fontFamily: 'Futura-MediumItalic', + fontFamily: '"Futura-MediumItalic", sans-serif', color: 'white', fontSize: 16, lineHeight: 30, }, i: { color: 'white', - fontFamily: 'Futura-MediumItalic', + fontFamily: '"Futura-MediumItalic", sans-serif', fontSize: 16, lineHeight: 30, }, a: { color: 'white', - fontFamily: 'Futura-Medium', + fontFamily: '"Futura-Medium", sans-serif', textDecorationLine: 'underline', fontSize: 16, lineHeight: 30, }, - red: { - color: '#f00', - fontWeight: 'bold', - fontFamily: 'Futura-MediumItalic', - fontSize: 16, - lineHeight: 24, - }, - green: { - color: '#0f0', - fontWeight: 'bold', - fontFamily: 'Futura-MediumItalic', - fontSize: 16, - lineHeight: 24, - }, - blue: { - color: '#08f', - fontWeight: 'bold', - fontFamily: 'Futura-MediumItalic', - fontSize: 16, - lineHeight: 24, - }, }) |
