Merge branch 'master' of github.com:adamhrv/megapixels_dev

2 files changed, 58 insertions, 10 deletions

diff --git a/site/assets/css/css.css b/site/assets/css/css.css
index c0218b94..7b89905c 100644
--- a/site/assets/css/css.css
+++ b/site/assets/css/css.css
@@ -179,16 +179,19 @@ footer a {
 }
 footer ul {
   margin: 0;
-}
-footer div {
+  display: flex;
+  flex-direction: row;
   color: #888;
-  font-size: 12px;
+  font-size: 11px;
 }
 footer ul li:last-child {
   margin-right: 0px;
 }
-footer div:first-child > a {
-  margin-right: 5px;
+footer ul:first-child li {
+  margin-right: 8px;
+}
+footer ul:last-child li {
+  margin-left: 8px;
 }
 .desktop footer a:hover {
   color: #fff;
diff --git a/site/assets/css/mobile.css b/site/assets/css/mobile.css
index d6ded8d6..70f2ca05 100644
--- a/site/assets/css/mobile.css
+++ b/site/assets/css/mobile.css
@@ -12,16 +12,44 @@ softbr {
 
   /* header / footer */
 
-  .slogan {
+  header .slogan {
     padding-left: 10px;
   }
   header .splash {
     display: none;
   }
+  .home header .links a {
+    margin-right: 0;
+  }
   header .links a {
+    padding-right: 0;
     margin-right: 14px;
     font-size: 14px;
   }
+  footer {
+    font-size: 14px;
+    line-height: 1.6;
+  }
+  footer > div:nth-child(1) {
+    padding: 0;
+    color: #ccc;
+    margin-bottom: 15px;
+  }
+  footer > div:nth-child(2) {
+    padding: 0;
+    color: #ccc;
+    margin-bottom: 15px;
+  }
+  footer a {
+    color: #fff;
+    border-color: white;
+  }
+  footer ul {
+    flex-wrap: wrap;
+  }
+  h1 {
+    font-size: 34px;
+  }
 
   /* MOBILE content */
 
@@ -48,6 +76,13 @@ softbr {
     width: 100%;
     padding: 0 10px;
   }
+  section.about-menu {
+    padding: 0;
+  }
+  .content-about section:first-of-type > p:first-of-type {
+    font-size: 18px;
+    line-height: 30px;
+  }
   .meta {
     margin-right: 0px;
     margin-bottom: 10px;
@@ -59,16 +94,21 @@ softbr {
     overflow: hidden;
     text-overflow: ellipsis;
   }
-  .citationHeader {
-
-  }
   section.wide {
     width: 100%;
   }
   .map, .map .applet {
     height: 360px;
   }
-
+  .dataset-heading section {
+    padding: 0;
+  }
+  .dataset-list .dataset {
+    width: 100%;
+  }
+  .dataset-list a {
+    width: 100%;
+  }
 
   .content td a {
     text-overflow: ellipsis;
@@ -76,6 +116,11 @@ softbr {
     overflow: hidden;
     display: inline-block;
   }
+
+  .content-about .team-member {
+    margin: 0 0 10px 0;
+    padding: 10px;
+  }
 }
 
 /* iphone-specific */