Merge pull request #561 from fedspendingtransparency/staging

Promote staging to master
fedspendingtransparency · Nov 29, 2017 · e73c4bc · e73c4bc
2 parents 11bcb4a + 5dd4d7c
commit e73c4bc
Show file tree

Hide file tree

Showing 107 changed files with 1,889 additions and 2,446 deletions.
diff --git a/package.json b/package.json
@@ -98,7 +98,7 @@
     "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-day-picker": "^7.0.2",
     "react-dnd": "^2.4.0",
     "react-dnd-html5-backend": "^2.4.1",
     "react-dom": "15.6.1",

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

diff --git a/src/_scss/components/datePicker/_datePicker.scss b/src/_scss/components/datePicker/_datePicker.scss
@@ -101,6 +101,10 @@
                 font-size: 1.3rem;
             }
         }
+        .DayPicker-Day--disabled {
+            opacity: 0.4;
+            pointer-events: none;
+        }
     }
 }
 

diff --git a/src/_scss/layouts/landingPage/landingPage.scss b/src/_scss/layouts/landingPage/landingPage.scss
@@ -1,30 +1,30 @@
 @import "../default/default";
 @import "../summary/summary";
-@import "mixins/fullSectionWrap";
 
 .landing-page-content {
-	padding: $global-pad;
-	.landing-page-overview {
-		@include span-columns(16);
-		@include shift(0);
+    padding: $global-pad;
+    .landing-page-overview {
+        @include span-columns(16);
+        @include shift(0);
 
-		text-align: center;
-		h3 {
-			margin-top: 0;
-		}
-		p {
-			color: $color-gray-medium;
-			margin-bottom: rem(30);
-		}
-	}
-	.landing-page-section {
-		@include span-columns(16);
-	}
-	@include media($medium-screen) {
-		padding: ($global-pad * 2);
-		.landing-page-overview {
-			@include span-columns(12);
-			@include shift(2);
-		}
-	}
+        text-align: center;
+        h3 {
+            margin-top: 0;
+        }
+        p {
+            color: $color-gray-medium;
+            margin-bottom: rem(30);
+        }
+    }
+    .landing-page-section {
+        @include span-columns(16);
+    }
+    @include media($medium-screen) {
+        padding: ($global-pad * 2);
+        .landing-page-overview {
+            width: 75%;
+            margin: auto;
+            float: none;
+        }
+    }
 }
diff --git a/src/_scss/pages/about/_contentWrap.scss b/src/_scss/pages/about/_contentWrap.scss
@@ -0,0 +1,18 @@
+.about-content {
+    background-color: $color-white;
+    box-shadow: $container-shadow;
+    color: $color-base;
+    border-top: 1px solid $color-gray-border;
+    border-right: 1px solid $color-gray-border;
+    border-bottom: 1px solid $color-gray-border;
+
+    .about-padded-content {
+        padding: rem(35);
+    }
+
+    @include media($large-screen) {
+        .about-padded-content {
+            padding: rem(38) rem(288) rem(22) rem(88);
+        }
+    }
+}
diff --git a/src/_scss/pages/about/_positioning.scss b/src/_scss/pages/about/_positioning.scss
@@ -0,0 +1,18 @@
+.about-content-wrapper {
+    @include span-columns(16);
+
+    .about-sidebar {
+        display: none;
+        margin-top: 0;
+        @include media($medium-screen) {
+            @include span-columns(4);
+        }
+    }
+
+    .about-content {
+        @include span-columns(16);
+        @include media($medium-screen) {
+            @include span-columns(12);
+        }
+    }
+}
diff --git a/src/_scss/pages/about/_section.scss b/src/_scss/pages/about/_section.scss
@@ -0,0 +1,88 @@
+.about-section-wrapper {
+    margin-bottom: rem(55);
+
+    .about-section-title {
+        h2 {
+            @include h4();
+
+            font-size: rem(47);
+            line-height: rem(59);
+            color: $color-gray;
+            font-weight: 300;
+            margin: 0 0 rem(20);
+        }
+    }
+
+    .about-subtitle {
+        h3 {
+            @include h5();
+
+            color: $color-gray;
+            padding-left: rem(3);
+            margin: 0 0 rem(5);
+        }
+    }
+
+    .about-section-content {
+        margin-bottom: rem(25);
+
+        p {
+            font-size: rem(18);
+            line-height: rem(28);
+            color: $color-gray;
+            padding-left: rem(3);
+            margin: rem(20) 0;
+        }
+
+        ul {
+            margin: rem(28) 0;
+            padding-left: rem(31);
+
+            li {
+                font-size: rem(18);
+                line-height: rem(28);
+                margin-left: rem(10);
+                margin-bottom: rem(20);
+                padding-left: rem(18);
+
+                span.about-section-list-item-title {
+                    display: block;
+                    font-weight: $font-semibold;
+                }
+            }
+        }
+
+        button {
+            display: block;
+            margin: rem(19) 0 rem(38);
+            padding: rem(16) rem(32);
+            text-decoration: none;
+        }
+
+        .about-section-content-inline-buttons {
+            margin-bottom: rem(38);
+            @include span-columns(16);
+
+            .button-holder {
+                @include span-columns(16);
+
+                button {
+                    display: block;
+                    margin-bottom: rem(19);
+                    width: 100%;
+                }
+            }
+
+            @include media($large-screen) {
+                .button-holder {
+                    @include span-columns(8);
+                    padding-right: rem(18);
+
+                    button {
+                        display: inline-block;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/_scss/pages/about/_sidebar.scss b/src/_scss/pages/about/_sidebar.scss
@@ -0,0 +1,53 @@
+.about-sidebar-reference {
+    display: none;
+
+    &.float-sidebar {
+        display: block;
+    }
+}
+.about-sidebar-content {
+    &.float-sidebar {
+        position: fixed;
+        top: rem(30);
+    }
+
+    background-color: $color-white;
+    box-shadow: $container-shadow;
+    color: $color-base;
+    border-top: 1px solid $color-gray-border;
+    border-right: 1px solid $color-gray-border;
+    border-bottom: 1px solid $color-gray-border;
+    padding: rem(40) rem(46);
+
+    ul {
+        @include unstyled-list;
+
+        li {
+            margin-bottom: rem(24);
+
+            &:last-child {
+                margin-bottom: rem(0);
+            }
+        }
+
+        a.sidebar-link {
+            color: $color-base;
+            font-size: rem(19);
+            line-height: rem(20);
+            padding-bottom: rem(5);
+
+            text-decoration: none;
+            border-bottom: 5px solid transparent;
+            @include transition(all 0.15s ease-in-out);
+
+            &:hover {
+                border-bottom: 5px solid $color-gold;
+            }
+
+            &.active {
+                font-weight: $font-bold;
+                border-bottom: 5px solid $color-gold;
+            }
+        }
+    }
+}
diff --git a/src/_scss/pages/about/aboutData.scss b/src/_scss/pages/about/aboutData.scss
diff --git a/src/_scss/pages/about/aboutPage.scss b/src/_scss/pages/about/aboutPage.scss
@@ -1,19 +1,22 @@
 .usa-da-about-page {
     @import "all";
-    @import "mixins/fullSectionWrap";
     @import "layouts/default/default";
-    @import "./mastHead";
-    @import "./introduction";
-    @import "./overview";
-    @import "./aboutData";
-    @import "./nextSteps";
-    @import "./aboutTopicsPreviews";
-
-    & .usa-da-about-inner {
-        @include clearfix;
-        background: $color-white;
-        margin: 0 auto;
-        padding: rem(50) 0;
-        @include row();
+    $color-gray-border: #D8D8D8;
+    $color-blue-background: #F5FBFC;
+
+    @import "components/pageTitleBar/pageTitleBar";
+
+    .main-content {
+        @import "../../mixins/fullSectionWrap";
+        @include fullSectionWrap(($global-mrg * 2), ($global-mrg * 2));
+        padding:  0;
+
+        @import "./_positioning";
+        @import "./_contentWrap";
+        @import "elements/_divider";
+
+        @import "./_sidebar";
+
+        @import "./_section";
     }
-}
+}