Merge pull request #522 from fedspendingtransparency/staging

Promote Staging to Master
fedspendingtransparency · Nov 17, 2017 · 1bb4dc3 · 1bb4dc3
2 parents 8144e51 + 49e10f1
commit 1bb4dc3
Show file tree

Hide file tree

Showing 302 changed files with 31,776 additions and 2,535 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,12 +1,11 @@
 {
   "presets": [
-    "es2015",
-    "react",
     ["env", {
         "targets": {
-            "node": "current"
+            "ie": 10
         }
-    }]
+    }],
+    "react"
   ],
   "plugins": [
     ["module-resolver", {

diff --git a/package.json b/package.json
@@ -34,12 +34,11 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "babel-core": "^6.25.0",
+    "babel-core": "^6.26.0",
     "babel-jest": "^20.0.3",
-    "babel-loader": "^7.1.0",
+    "babel-loader": "^7.1.2",
     "babel-plugin-module-resolver": "^2.7.1",
-    "babel-preset-env": "^1.6.0",
-    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-env": "^1.6.1",
     "babel-preset-react": "^6.24.1",
     "clean-webpack-plugin": "^0.1.16",
     "css-loader": "^0.28.4",
@@ -62,7 +61,7 @@
     "sass-loader": "^6.0.6",
     "sinon": "^2.3.8",
     "style-loader": "^0.18.2",
-    "webpack": "^2.6.1",
+    "webpack": "^2.7.0",
     "webpack-bundle-analyzer": "^2.8.2",
     "webpack-dev-server": "^2.5.0",
     "webpack-merge": "^4.1.0",
@@ -84,9 +83,8 @@
     "jest-cli": "^20.0.4",
     "js-cookie": "^2.1.0",
     "js-search": "^1.4.2",
-    "keyboardjs": "^2.3.3",
     "lodash": "^4.6.1",
-    "mapbox-gl": "^0.39.1",
+    "mapbox-gl": "^0.41.0",
     "moment": "2.18.1",
     "moment-timezone": "^0.5.4",
     "mousetrap": "^1.6.1",
@@ -98,6 +96,7 @@
     "react": "15.6.2",
     "react-addons-perf": "15.4.2",
     "react-aria-modal": "^2.7.0",
+    "react-copy-to-clipboard": "^5.0.1",
     "react-custom-scrollbars": "^4.1.2",
     "react-day-picker": "^6.1.0",
     "react-dnd": "^2.4.0",

diff --git a/src/_scss/all.scss b/src/_scss/all.scss
@@ -2,7 +2,7 @@
 @import 'lib/bourbon/bourbon';
 @import 'lib/neat/neat';
 @import 'lib/normalize';
-@import 'lib/mapbox/mapbox';
+// @import 'lib/mapbox/mapbox';
 
 // Core -------------- //
 @import 'core/defaults';

diff --git a/src/_scss/layouts/search/header/_downloadButton.scss b/src/_scss/layouts/search/header/_downloadButton.scss
@@ -1,10 +1,16 @@
 .download-wrap {
     position: relative;
-
-    .download-hover {
+    .download-hover-spacer {
+        // BODGE: add a wrapper that goes from the button to the edges of the hover in order to make it clickable
         position: absolute;
         top: rem(-18);
         left: rem(-290);
+        width: rem(290);
+        height: rem(90);
+        z-index: $z-modal - 2;
+    }
+    .download-hover {
+        margin-right: rem(20);
         z-index: $z-modal - 1;
 
         width: rem(270);
@@ -29,6 +35,7 @@
 
             .icon {
                 @include flex(0 0 auto);
+                @include align-self(flex-start);
                 width: rem(25);
                 height: rem(25);
                 margin-right: rem(10);
@@ -44,6 +51,16 @@
                 text-align: left;
                 color: $color-base;
                 font-size: $smallest-font-size;
+
+                a {
+                    text-decoration: underline;
+                    color: $color-primary;
+                    font-weight: $font-semibold;
+
+                    &:hover, &:active {
+                        text-decoration: none;
+                    }
+                }
             }
         }