summaryrefslogtreecommitdiff
path: root/client/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/lib')
-rw-r--r--client/src/lib/components/button.js2
-rw-r--r--client/src/lib/components/footer.js2
-rw-r--r--client/src/lib/components/htmlStyles.js8
-rw-r--r--client/src/lib/components/text.js2
-rw-r--r--client/src/lib/timeline/index.js2
-rw-r--r--client/src/lib/timeline/tickMarks.js2
-rw-r--r--client/src/lib/timeline/timelineEvent.js3
-rw-r--r--client/src/lib/timeline/timelineFull.js8
-rw-r--r--client/src/lib/timeline/timelineHeader.js29
-rw-r--r--client/src/lib/views/contact.js4
-rw-r--r--client/src/lib/views/home.js19
-rw-r--r--client/src/lib/views/privacy.js16
12 files changed, 42 insertions, 55 deletions
diff --git a/client/src/lib/components/button.js b/client/src/lib/components/button.js
index a5cf8ea..ca8388b 100644
--- a/client/src/lib/components/button.js
+++ b/client/src/lib/components/button.js
@@ -33,7 +33,7 @@ export default class Button extends Component {
const styles = StyleSheet.create({
text: {
color: '#000',
- fontFamily: 'Futura-Medium',
+ fontFamily: '"Futura-Medium", sans-serif',
textAlign: 'center',
padding: 0,
},
diff --git a/client/src/lib/components/footer.js b/client/src/lib/components/footer.js
index b389245..ffd157d 100644
--- a/client/src/lib/components/footer.js
+++ b/client/src/lib/components/footer.js
@@ -67,7 +67,7 @@ const styles = StyleSheet.create({
alignItems: 'center',
},
footerText: {
- fontFamily: 'Futura-Medium',
+ fontFamily: '"Futura-Medium", sans-serif',
color: 'white',
fontSize: 10,
flex: 1,
diff --git a/client/src/lib/components/htmlStyles.js b/client/src/lib/components/htmlStyles.js
index 4037f9d..a627884 100644
--- a/client/src/lib/components/htmlStyles.js
+++ b/client/src/lib/components/htmlStyles.js
@@ -5,26 +5,26 @@ import {
export default 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/components/text.js b/client/src/lib/components/text.js
index 17e3cb0..14641a0 100644
--- a/client/src/lib/components/text.js
+++ b/client/src/lib/components/text.js
@@ -22,7 +22,7 @@ export default class ClearText extends Component {
const styles = StyleSheet.create({
text: {
color: '#ffffff',
- fontFamily: 'Futura-Medium',
+ fontFamily: '"Futura-Medium", sans-serif',
textAlign: 'center',
fontSize: 16,
lineHeight: 30,
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,
- },
})
diff --git a/client/src/lib/views/contact.js b/client/src/lib/views/contact.js
index 74f79b5..19bec89 100644
--- a/client/src/lib/views/contact.js
+++ b/client/src/lib/views/contact.js
@@ -241,7 +241,7 @@ const styles = StyleSheet.create({
height: 40,
padding: 5,
fontSize: 15,
- fontFamily: 'Futura-Medium',
+ fontFamily: '"Futura-Medium", sans-serif',
backgroundColor: 'white',
borderColor: 'gray',
borderWidth: 1,
@@ -263,7 +263,7 @@ const styles = StyleSheet.create({
},
checkboxLabelStyle: {
color: '#ddd',
- fontFamily: 'Futura-Medium',
+ fontFamily: '"Futura-Medium", sans-serif',
},
keyboardAvoidingViewInner: {
alignItems: 'center',
diff --git a/client/src/lib/views/home.js b/client/src/lib/views/home.js
index 618ce64..6f117e5 100644
--- a/client/src/lib/views/home.js
+++ b/client/src/lib/views/home.js
@@ -42,11 +42,20 @@ export default class Home extends Component {
const label = labels[i]
return view(path, image, label)
})
- return (
- <FadeInView duration={500} style={styles.container}>
- {links}
- </FadeInView>
- )
+ if (navigator.userAgent.match('Firefox')) {
+ return (
+ <View style={styles.container}>
+ {links}
+ </View>
+ )
+ }
+ else {
+ return (
+ <FadeInView duration={500} style={styles.container}>
+ {links}
+ </FadeInView>
+ )
+ }
}
}
diff --git a/client/src/lib/views/privacy.js b/client/src/lib/views/privacy.js
index e2f6751..6cf8010 100644
--- a/client/src/lib/views/privacy.js
+++ b/client/src/lib/views/privacy.js
@@ -48,7 +48,7 @@ const styles = StyleSheet.create({
const htmlStyles = StyleSheet.create({
p: {
color: 'white',
- fontFamily: 'Futura-Medium',
+ fontFamily: '"Futura-Medium", sans-serif',
textAlign: 'justify',
fontSize: 16,
lineHeight: 30,
@@ -56,48 +56,48 @@ const htmlStyles = StyleSheet.create({
},
li: {
color: 'white',
- fontFamily: 'Futura-Medium',
+ fontFamily: '"Futura-Medium", sans-serif',
textAlign: 'justify',
fontSize: 16,
lineHeight: 30,
margin: 0,
},
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,
},
h1: {
color: 'white',
- fontFamily: 'Futura-Medium',
+ fontFamily: '"Futura-Medium", sans-serif',
fontSize: 24,
lineHeight: 40,
margin: 0,
},
h2: {
color: 'white',
- fontFamily: 'Futura-Medium',
+ fontFamily: '"Futura-Medium", sans-serif',
fontSize: 20,
lineHeight: 32,
margin: 0,
},
h3: {
color: 'white',
- fontFamily: 'Futura-Medium',
+ fontFamily: '"Futura-Medium", sans-serif',
fontSize: 16,
lineHeight: 30,
fontWeight: 'bold',
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-12-10 22:44:50 +0000