Merge pull request #448 from fedspendingtransparency/staging

Promote staging to master
fedspendingtransparency · Oct 4, 2017 · 64c36bc · 64c36bc
2 parents bf9dc6d + c7792a4
commit 64c36bc
Show file tree

Hide file tree

Showing 279 changed files with 10,474 additions and 5,846 deletions.
diff --git a/package.json b/package.json
@@ -8,6 +8,7 @@
     "start": "./node_modules/.bin/webpack-dev-server --progress --config ./webpack/webpack.dev.config.js",
     "test": "./node_modules/.bin/jest; exit 0;",
     "lint": "./node_modules/.bin/eslint --config .eslintrc --ext .jsx,.js \"src/js/**\"; exit 0;",
+    "errors": "./node_modules/.bin/eslint --config .eslintrc --ext .jsx,.js \"src/js/**\" --quiet; exit 0;",
     "dev": "./node_modules/.bin/webpack --progress --config ./webpack/webpack.dev.config.js",
     "prod": "./node_modules/.bin/webpack -p --progress --config ./webpack/webpack.prod.config.js",
     "travis": "./node_modules/.bin/eslint --config .eslintrc --ext .jsx,.js \"src/js/**\" && ./node_modules/.bin/jest --runInBand;",
@@ -80,7 +81,7 @@
     "js-search": "^1.4.2",
     "keyboardjs": "^2.3.3",
     "lodash": "^4.6.1",
-    "mapbox-gl": "^0.32.1",
+    "mapbox-gl": "^0.39.1",
     "moment": "^2.12.0",
     "moment-timezone": "^0.5.4",
     "mousetrap": "^1.6.1",

diff --git a/src/_scss/custom.scss b/src/_scss/custom.scss
@@ -5,6 +5,7 @@
 // ***** PAGES
 @import './pages/homepage/homePage';
 @import './pages/search/searchPage';
+@import './pages/explorer/explorerPage';
 @import './pages/award/awardPage';
 @import './pages/about/aboutPage';
 @import './pages/account/accountPage';

diff --git a/src/_scss/layouts/default/default.scss b/src/_scss/layouts/default/default.scss
@@ -1,3 +1,3 @@
 // Default Layout: The default layout only includes the header and footer styles
 @import "./header/header";
-@import "./footer/footer";
+@import "./footer/footer";
diff --git a/src/_scss/layouts/default/header/_logo.scss b/src/_scss/layouts/default/header/_logo.scss
@@ -1,15 +1,16 @@
 .logo {
     .usa-logo {
         @include fill-parent();
+        position: relative;
         a {
-            height: rem(39);
             width: rem(280);
+            height: rem(26);
             display: block;
             @include background-image(url("#{$image-path}/logo-small.png"));
             background-position: left center;
             background-repeat: no-repeat;
             background-size: contain;
-            @include media($medium-screen) {
+            @include media($large-screen) {
                 @include background-image(url("#{$image-path}/logo.png"));
             }
             // handle retina images
@@ -19,13 +20,14 @@
             (min-device-pixel-ratio: 1.3),
             (min-resolution: 1.3dppx) {
                 @include background-image(url("#{$image-path}/logo-small@2x.png"));
-                @include media($medium-screen) {
+                @include media($large-screen) {
                     @include background-image(url("#{$image-path}/logo@2x.png"));
                 }
             }
-            @include media($medium-screen) {
+            @include media($large-screen) {
                 @include fill-parent();
-                width: 40.6rem;
+                height: rem(32);
+                width: rem(309);
             }
             .logo-sr {
                 @include sr-only();
@@ -37,17 +39,17 @@
             color: $color-white;
             font-size: rem(8);
             font-weight: $font-semibold;
-            left: rem(254);
+            left: rem(228);
             letter-spacing: 0.14rem;
             padding: rem(2) rem(4);
             position: absolute;
             text-align: center;
-            top: rem(5);
+            top: rem(-2);
             @include border-radius(2px);
-            @include media($medium-screen) {
+            @include media($large-screen) {
                 font-size: rem(10);
-                left: rem(368);
-                top: 0;
+                left: rem(280);
+                top: rem(-2);
             }
         }
     }

diff --git a/src/_scss/layouts/default/header/_positioning.scss b/src/_scss/layouts/default/header/_positioning.scss
@@ -5,21 +5,19 @@
     @include justify-content(space-between);
     @include flex-direction(row);
     @include align-items(center);
-    height: rem(105);
-    @include media($tablet-screen) {
-    height: rem(110);
+    height: rem(80);
+    @include media($medium-screen) {
+        height: rem(80);
     }
     .logo {
-        flex-grow: 2;
+        @include flex(0 0 auto);
         position: relative;
     }
-    nav {
-        display: none;
-        @include media($tablet-screen) {
-            display: block;
-        }
-    }
+
     .mobile-menu {
+        @include flex(1 1 auto);
+        position: relative;
+        height: rem(45);
         display: none;
     }
 }
diff --git a/src/_scss/layouts/default/header/nav/_menuButton.scss b/src/_scss/layouts/default/header/nav/_menuButton.scss
@@ -1,3 +1,7 @@
+.mobile-button-wrapper {
+    position: absolute;
+    right: 0;
+}
 .usa-menu-btn {
     @include button-unstyled;
     @include transition(all 0.75s $ease-in-out-sine);
@@ -7,13 +11,12 @@
     height: rem(45);
     position: relative;
     width: rem(48);
-    @include media($tablet-screen) {
-        display: none;
-    }
+
     &:hover {
         @include transition(all 0.25s $ease-in-out-sine);
         background: $color-primary;
     }
+
     .nav-lines {
         @include transition(all 0.75s $ease-in-out-sine);
         background: $color-primary;
@@ -55,4 +58,28 @@
             }
         }
     }
+
+     &.homepage {
+        border: 1px solid $color-white;
+
+        .nav-lines {
+            background: $color-white;
+            &::before,
+            &::after {
+                background: $color-white;
+            }
+        }
+
+        &:hover {
+            background: $color-white;
+
+            .nav-lines {
+                background: $color-primary-darkest;
+                &::before,
+                &::after {
+                    background: $color-primary-darkest;
+                }
+            }
+        }
+    }
 }
diff --git a/src/_scss/layouts/default/header/nav/_menuItem.scss b/src/_scss/layouts/default/header/nav/_menuItem.scss
@@ -1,13 +1,31 @@
 li.menu-item {
+    @include display(flex);
+    @include align-items(center);
+    @include justify-content(center);
+    position: relative;
+
     height: rem(48);
     margin: 0;
-    padding: 0 rem(10);
+    padding: 0 rem(5);
     @include media($large-screen) {
         padding: 0 rem(15);
     }
     a {
+        @include flex(1 1 auto);
         color: $color-gray;
-        font-size: $base-font-size;
+        font-size: rem(20);
+        line-height: rem(25);
+        font-weight: $font-semibold;
+        opacity: 0.60;
+
+        &:hover, &:active {
+            text-decoration: none;
+            opacity: 1;
+        }
+
+        &.homepage {
+            color: $color-white;
+        }
     }
     &.search-item {
         padding: 0;
@@ -36,8 +54,4 @@ li.menu-item {
             }
         }
     }
-
-    &.profile-item {
-        padding: 0;
-    }
 }
diff --git a/src/_scss/layouts/default/header/nav/_menuSearchBar.scss b/src/_scss/layouts/default/header/nav/_menuSearchBar.scss
@@ -1,9 +1,10 @@
 .header-search-bar {
+    display: none;
+    @include flex(0 1 auto);
     position: relative;
-    width: rem(185);
-    @include media($medium-screen) {
-        width: rem(250);
-    }
+    width: rem(60);
+    height: rem(48);
+
     input.header-search-field {
         position: absolute;
         top: rem(5);
@@ -23,10 +24,18 @@
         right: rem(10);
         top: rem(14);
         @include button-unstyled;
-        width: rem(14);
-        height: rem(14);
+        width: rem(20);
+        height: rem(20);
         svg {
             fill: $color-gray;
         }
     }
+
+    &.homepage {
+        .header-search-button {
+            svg {
+                fill: $color-white;
+            }
+        }
+    }
 }
diff --git a/...ayouts/default/header/nav/_lowerMenu.scss → ...outs/default/header/nav/_primaryMenu.scss b/...ayouts/default/header/nav/_lowerMenu.scss → ...outs/default/header/nav/_primaryMenu.scss
@@ -1,4 +1,10 @@
-.lower-menu {
+.primary-menu {
+    display: none;
+    @include media($medium-screen) {
+        display: block;
+        @include flex(1 1 auto);    
+    }
+
     ul.nav-menu {
         @include clearfix;
         @include unstyled-list;
@@ -10,12 +16,12 @@
         margin-top: rem(5);
         @import "./_menuItem";
         li.menu-item {
-            @include flex(1 1 auto);
+            @include flex(0 0 auto);
             position: relative;
-            margin-left: rem(5);
+            margin-left: rem(15);
             text-align: center;
             line-height: rem(45);
-            @include media($medium-screen) {
+            @include media($large-screen) {
                 margin-left: rem(30);
             }
             &:first-child {
@@ -27,6 +33,5 @@
             }
         }
         @import "./_profileMenu";
-        @import "./_menuSearchBar";
     }
 }