merge

4 files changed, 16 insertions, 7 deletions

diff --git a/client/index.js b/client/index.js
index c72fd02c..e0f7d270 100644
--- a/client/index.js
+++ b/client/index.js
@@ -125,7 +125,7 @@ function buildWaypoints() {
   if (!element) return null
   let waypoint = new Waypoint({
     element,
-    handler: function(direction) {
+    handler: direction => {
       if (direction === 'down') {
         document.body.classList.add('scrolled')
       } else {
@@ -151,6 +151,8 @@ function main() {
     active = 'about'
   } else if (href.match('datasets')) {
     active = 'datasets'
+  } else if (href.match('research')) {
+    active = 'research'
   } else {
     active = href
   }
diff --git a/megapixels/app/site/parser.py b/megapixels/app/site/parser.py
index 92d950f8..1e35e977 100644
--- a/megapixels/app/site/parser.py
+++ b/megapixels/app/site/parser.py
@@ -244,8 +244,8 @@ def format_metadata(section):
     if ': ' not in line:
       continue
     key, value = line[2:].split(': ', 1)
-    meta.append("<div><div class='gray'>{}</div><div>{}</div></div>".format(key, value))
-  return "<div class='meta'>{}</div>".format(''.join(meta)) 
+    meta.append("<div class='meta'><div class='gray'>{}</div><div>{}</div></div>".format(key, value))
+  return ''.join(meta)
 
 def format_footnotes(footnotes, s3_path):
   """
diff --git a/site/assets/css/css.css b/site/assets/css/css.css
index 4a16f171..adc1a2fa 100644
--- a/site/assets/css/css.css
+++ b/site/assets/css/css.css
@@ -433,11 +433,13 @@ p.subp{
   font-weight: 400;
   clear:left;
 }
-.left-sidebar .meta, .right-sidebar .meta {
+.left-sidebar .meta,
+.right-sidebar .meta {
   flex-direction: column;
 }
-.mobile .left-sidebar .meta, .right-sidebar .meta {
-  display: inline-block;
+.mobile .left-sidebar .meta,
+.right-sidebar .meta {
+  display: block;
   border-bottom: 1px solid #333;
   padding:10px 10px 10px 0;
   margin: 0 4px 4px 0;
diff --git a/site/content/pages/research/munich_security_conference/index.md b/site/content/pages/research/munich_security_conference/index.md
index 37f69e00..b361f84b 100644
--- a/site/content/pages/research/munich_security_conference/index.md
+++ b/site/content/pages/research/munich_security_conference/index.md
@@ -16,8 +16,13 @@ authors: Adam Harvey
 ## 5,000 Embassy Flickr Photos Were used to Train Face Recognition
 
 ### sidebar
+
++ Test: ok
++ Foo: bar
+
 ### end sidebar
-+ more: again
+
+[page under devlopment]
 
 Intro paragraph.