merge

53 files changed, 8 insertions, 0 deletions

diff --git a/client/src/img/afghanistan.png b/client/src/img/afghanistan.png
new file mode 100644
index 0000000..0e94a27
--- /dev/null
+++ b/client/src/img/afghanistan.png
diff --git a/client/src/img/aiweiwei.png b/client/src/img/aiweiwei.png
new file mode 100644
index 0000000..4d6a346
--- /dev/null
+++ b/client/src/img/aiweiwei.png
diff --git a/client/src/img/armory.png b/client/src/img/armory.png
new file mode 100644
index 0000000..bf881a0
--- /dev/null
+++ b/client/src/img/armory.png
diff --git a/client/src/img/arrow-right.png b/client/src/img/arrow-right.png
new file mode 100644
index 0000000..0cb2588
--- /dev/null
+++ b/client/src/img/arrow-right.png
diff --git a/client/src/img/aww.png b/client/src/img/aww.png
new file mode 100644
index 0000000..d24bb47
--- /dev/null
+++ b/client/src/img/aww.png
diff --git a/client/src/img/checkbox-off.png b/client/src/img/checkbox-off.png
new file mode 100644
index 0000000..a089c3d
--- /dev/null
+++ b/client/src/img/checkbox-off.png
diff --git a/client/src/img/checkbox-on.png b/client/src/img/checkbox-on.png
new file mode 100644
index 0000000..c5957c5
--- /dev/null
+++ b/client/src/img/checkbox-on.png
diff --git a/client/src/img/close.png b/client/src/img/close.png
new file mode 100644
index 0000000..2f78485
--- /dev/null
+++ b/client/src/img/close.png
diff --git a/client/src/img/drone.jpg b/client/src/img/drone.jpg
new file mode 100644
index 0000000..905d9ce
--- /dev/null
+++ b/client/src/img/drone.jpg
diff --git a/client/src/img/herzogDeMeuron.png b/client/src/img/herzogDeMeuron.png
new file mode 100644
index 0000000..8f7a8a4
--- /dev/null
+++ b/client/src/img/herzogDeMeuron.png
diff --git a/client/src/img/icon/icon.png b/client/src/img/icon/icon.png
new file mode 100644
index 0000000..83c0bdd
--- /dev/null
+++ b/client/src/img/icon/icon.png
diff --git a/client/src/img/icon/splash.png b/client/src/img/icon/splash.png
new file mode 100644
index 0000000..8390abe
--- /dev/null
+++ b/client/src/img/icon/splash.png
diff --git a/client/src/img/logo.png b/client/src/img/logo.png
new file mode 100644
index 0000000..14a9922
--- /dev/null
+++ b/client/src/img/logo.png
diff --git a/client/src/img/nav/home/contact.png b/client/src/img/nav/home/contact.png
new file mode 100644
index 0000000..b912c22
--- /dev/null
+++ b/client/src/img/nav/home/contact.png
diff --git a/client/src/img/nav/home/drones.png b/client/src/img/nav/home/drones.png
new file mode 100644
index 0000000..af9b454
--- /dev/null
+++ b/client/src/img/nav/home/drones.png
diff --git a/client/src/img/nav/home/findyourface.png b/client/src/img/nav/home/findyourface.png
new file mode 100644
index 0000000..870df1c
--- /dev/null
+++ b/client/src/img/nav/home/findyourface.png
diff --git a/client/src/img/nav/home/home.png b/client/src/img/nav/home/home.png
new file mode 100644
index 0000000..3fb947e
--- /dev/null
+++ b/client/src/img/nav/home/home.png
diff --git a/client/src/img/nav/home/information.png b/client/src/img/nav/home/information.png
new file mode 100644
index 0000000..e5350b6
--- /dev/null
+++ b/client/src/img/nav/home/information.png
diff --git a/client/src/img/nav/home/livestream.png b/client/src/img/nav/home/livestream.png
new file mode 100644
index 0000000..8d5f9ae
--- /dev/null
+++ b/client/src/img/nav/home/livestream.png
diff --git a/client/src/img/nav/home/timeline.png b/client/src/img/nav/home/timeline.png
new file mode 100644
index 0000000..5ad6792
--- /dev/null
+++ b/client/src/img/nav/home/timeline.png
diff --git a/client/src/img/nav/old/contact.png b/client/src/img/nav/old/contact.png
new file mode 100644
index 0000000..7242391
--- /dev/null
+++ b/client/src/img/nav/old/contact.png
diff --git a/client/src/img/nav/old/drones.png b/client/src/img/nav/old/drones.png
new file mode 100644
index 0000000..b2f9b28
--- /dev/null
+++ b/client/src/img/nav/old/drones.png
diff --git a/client/src/img/nav/old/findyourface.png b/client/src/img/nav/old/findyourface.png
new file mode 100644
index 0000000..a4b6be6
--- /dev/null
+++ b/client/src/img/nav/old/findyourface.png
diff --git a/client/src/img/nav/old/home.png b/client/src/img/nav/old/home.png
new file mode 100644
index 0000000..18c09e5
--- /dev/null
+++ b/client/src/img/nav/old/home.png
diff --git a/client/src/img/nav/old/information.png b/client/src/img/nav/old/information.png
new file mode 100644
index 0000000..0dcec4f
--- /dev/null
+++ b/client/src/img/nav/old/information.png
diff --git a/client/src/img/nav/old/livestream.png b/client/src/img/nav/old/livestream.png
new file mode 100644
index 0000000..9c5f20f
--- /dev/null
+++ b/client/src/img/nav/old/livestream.png
diff --git a/client/src/img/nav/old/timeline.png b/client/src/img/nav/old/timeline.png
new file mode 100644
index 0000000..3fb0ce4
--- /dev/null
+++ b/client/src/img/nav/old/timeline.png
diff --git a/client/src/img/nav/original/contact.png b/client/src/img/nav/original/contact.png
new file mode 100644
index 0000000..39529aa
--- /dev/null
+++ b/client/src/img/nav/original/contact.png
diff --git a/client/src/img/nav/original/drones.png b/client/src/img/nav/original/drones.png
new file mode 100644
index 0000000..9a9b489
--- /dev/null
+++ b/client/src/img/nav/original/drones.png
diff --git a/client/src/img/nav/original/findyourface.png b/client/src/img/nav/original/findyourface.png
new file mode 100644
index 0000000..fcfa493
--- /dev/null
+++ b/client/src/img/nav/original/findyourface.png
diff --git a/client/src/img/nav/original/home.png b/client/src/img/nav/original/home.png
new file mode 100644
index 0000000..2ca5596
--- /dev/null
+++ b/client/src/img/nav/original/home.png
diff --git a/client/src/img/nav/original/information.png b/client/src/img/nav/original/information.png
new file mode 100644
index 0000000..d45c43d
--- /dev/null
+++ b/client/src/img/nav/original/information.png
diff --git a/client/src/img/nav/original/livestream.png b/client/src/img/nav/original/livestream.png
new file mode 100644
index 0000000..742996b
--- /dev/null
+++ b/client/src/img/nav/original/livestream.png
diff --git a/client/src/img/nav/original/timeline.png b/client/src/img/nav/original/timeline.png
new file mode 100644
index 0000000..49e2d83
--- /dev/null
+++ b/client/src/img/nav/original/timeline.png
diff --git a/client/src/img/nav/selected/contact.png b/client/src/img/nav/selected/contact.png
new file mode 100644
index 0000000..90f1faf
--- /dev/null
+++ b/client/src/img/nav/selected/contact.png
diff --git a/client/src/img/nav/selected/drones.png b/client/src/img/nav/selected/drones.png
new file mode 100644
index 0000000..25122a9
--- /dev/null
+++ b/client/src/img/nav/selected/drones.png
diff --git a/client/src/img/nav/selected/findyourface.png b/client/src/img/nav/selected/findyourface.png
new file mode 100644
index 0000000..8db3405
--- /dev/null
+++ b/client/src/img/nav/selected/findyourface.png
diff --git a/client/src/img/nav/selected/home.png b/client/src/img/nav/selected/home.png
new file mode 100644
index 0000000..0073474
--- /dev/null
+++ b/client/src/img/nav/selected/home.png
diff --git a/client/src/img/nav/selected/information.png b/client/src/img/nav/selected/information.png
new file mode 100644
index 0000000..30bd546
--- /dev/null
+++ b/client/src/img/nav/selected/information.png
diff --git a/client/src/img/nav/selected/livestream.png b/client/src/img/nav/selected/livestream.png
new file mode 100644
index 0000000..c570591
--- /dev/null
+++ b/client/src/img/nav/selected/livestream.png
diff --git a/client/src/img/nav/selected/timeline.png b/client/src/img/nav/selected/timeline.png
new file mode 100644
index 0000000..7f37591
--- /dev/null
+++ b/client/src/img/nav/selected/timeline.png
diff --git a/client/src/img/nav/sidebar/contact.png b/client/src/img/nav/sidebar/contact.png
new file mode 100644
index 0000000..01eda6b
--- /dev/null
+++ b/client/src/img/nav/sidebar/contact.png
diff --git a/client/src/img/nav/sidebar/drones.png b/client/src/img/nav/sidebar/drones.png
new file mode 100644
index 0000000..0c455bc
--- /dev/null
+++ b/client/src/img/nav/sidebar/drones.png
diff --git a/client/src/img/nav/sidebar/findyourface.png b/client/src/img/nav/sidebar/findyourface.png
new file mode 100644
index 0000000..bfedb5f
--- /dev/null
+++ b/client/src/img/nav/sidebar/findyourface.png
diff --git a/client/src/img/nav/sidebar/home.png b/client/src/img/nav/sidebar/home.png
new file mode 100644
index 0000000..c0313d6
--- /dev/null
+++ b/client/src/img/nav/sidebar/home.png
diff --git a/client/src/img/nav/sidebar/information.png b/client/src/img/nav/sidebar/information.png
new file mode 100644
index 0000000..184c8f5
--- /dev/null
+++ b/client/src/img/nav/sidebar/information.png
diff --git a/client/src/img/nav/sidebar/livestream.png b/client/src/img/nav/sidebar/livestream.png
new file mode 100644
index 0000000..04c75c5
--- /dev/null
+++ b/client/src/img/nav/sidebar/livestream.png
diff --git a/client/src/img/nav/sidebar/timeline.png b/client/src/img/nav/sidebar/timeline.png
new file mode 100644
index 0000000..a022e9a
--- /dev/null
+++ b/client/src/img/nav/sidebar/timeline.png
diff --git a/client/src/img/pakistan.png b/client/src/img/pakistan.png
new file mode 100644
index 0000000..fb5a677
--- /dev/null
+++ b/client/src/img/pakistan.png
diff --git a/client/src/img/resize.sh b/client/src/img/resize.sh
new file mode 100755
index 0000000..caacfa9
--- /dev/null
+++ b/client/src/img/resize.sh
@@ -0,0 +1,8 @@
+for i in nav/original/*
+do
+echo $i
+convert -background black -gravity center $i -resize 140x140 -extent 140x140 ${i/original/home}
+convert -background black -gravity center $i -resize 80x80 -extent 100x100 ${i/original/sidebar}
+convert -background white -negate -gravity center $i -resize 80x80 -extent 100x100 ${i/original/selected}
+done
+
diff --git a/client/src/img/show-banner.jpg b/client/src/img/show-banner.jpg
new file mode 100644
index 0000000..0648dca
--- /dev/null
+++ b/client/src/img/show-banner.jpg
diff --git a/client/src/img/somalia.png b/client/src/img/somalia.png
new file mode 100644
index 0000000..556ee8f
--- /dev/null
+++ b/client/src/img/somalia.png
diff --git a/client/src/img/yemen.png b/client/src/img/yemen.png
new file mode 100644
index 0000000..93d7d86
--- /dev/null
+++ b/client/src/img/yemen.png