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

1 files changed, 44 insertions, 16 deletions

diff --git a/site/assets/css/css.css b/site/assets/css/css.css
index 276280b1..12b059ef 100644
--- a/site/assets/css/css.css
+++ b/site/assets/css/css.css
@@ -118,20 +118,20 @@ header .links a {
   margin-right: 32px;
   transition: color 0.1s cubic-bezier(0,0,1,1), border-color 0.05s cubic-bezier(0,0,1,1);
   border-bottom: 1px solid rgba(255,255,255,0);
-  padding: 3px;
+  padding-bottom: 3px;
   font-weight: 400;
 }
 header .links a.active {
   color: #fff;
-  border-bottom: 1px solid rgba(255,255,255,255);
+  border-bottom: 2px solid rgba(255,255,255,255);
 }
 .desktop header .links a:hover {
   color: #fff;
-  border-bottom: 1px solid rgba(255,255,255,255);
+  border-bottom: 2px solid rgba(255,255,255,255);
 }
 .desktop header .links a.active:hover {
   color: #fff;
-  border-bottom: 1px solid rgba(255,255,255,255);
+  border-bottom: 2px solid rgba(255,255,255,255);
 }
 header .links.splash{
   font-size:22px;
@@ -146,10 +146,10 @@ footer {
   display: flex;
   flex-direction: row;
   justify-content: space-between;
-  color: #888;
-  font-size: 9pt;
+  color: #666;
+  font-size: 11px;
   line-height: 17px;
-  padding: 20px 20px;
+  padding: 15px;
   font-family: "Roboto", sans-serif;
 }
 footer > div {
@@ -164,14 +164,40 @@ footer > div:nth-child(2) {
 }
 footer a {
   display: inline-block;
-  color: #888;
+  color: #ccc;
   transition: color 0.1s cubic-bezier(0,0,1,1);
-  margin-right: 5px;
+  border-bottom:1px solid #555;
+  padding-bottom: 1px;
+  text-decoration: none;
+}
+
+footer a:hover{
+  color: #ccc;
+  border-bottom:1px solid #999;
+}
+footer ul{
+  margin:0;
+}
+footer ul li{
+  color: #bbb;
+  margin: 0 5px 0 0;
+  font-size: 12px;
+  display: inline-block;
+}
+footer ul li:last-child{
+  margin-right:0px;
+}
+footer ul.footer-left{
+  float:left;
+  margin-left:40px;
+}
+footer ul.footer-right{
+  float:right;
+  margin-right:40px;
 }
 .desktop footer a:hover {
   color: #ddd;
 }
-
 /* headings */
 
 h1 {
@@ -293,7 +319,7 @@ p.subp{
   font-size: 14px;
 }
 .content a {
-  color: #fff;
+  color: #dedede;
   text-decoration: none;
   border-bottom: 2px solid #666;
   padding-bottom: 1px;
@@ -746,6 +772,7 @@ section.fullwidth .image {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
+  margin:0;
 }
 .dataset-list a {
   text-decoration: none;
@@ -1080,18 +1107,19 @@ ul.map-legend li.source:before {
 /* footnotes */
 
 a.footnote {
-  font-size: 10px;
+  font-size: 9px;
+  line-height: 0px;
   position: relative;
-  display: inline-block;
-  bottom: 10px;
+  /*display: inline-block;*/
+  bottom: 7px;
   text-decoration: none;
   color: #ff8;
   border: 0;
-  left: 2px;
+  left: -1px;
   transition-duration: 0s;
 }
 a.footnote_shim {
-  display: inline-block;
+  /*display: inline-block;*/
   width: 1px; height: 1px;
   overflow: hidden;
   position: relative;