Skip to content

Commit

Permalink
Merge pull request #668 from fedspendingtransparency/staging
Browse files Browse the repository at this point in the history
Promote staging to master
  • Loading branch information
nmonga91 authored Feb 22, 2018
2 parents ca9334c + f3c0d39 commit f3f89fb
Show file tree
Hide file tree
Showing 183 changed files with 3,274 additions and 1,754 deletions.
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@
"react-dnd": "^2.4.0",
"react-dnd-html5-backend": "^2.4.1",
"react-dom": "15.6.1",
"react-ga": "2.2.0",
"react-helmet": "^5.0.0",
"react-map-gl": "^2.0.2",
"react-markdown": "^2.5.0",
Expand Down
38 changes: 18 additions & 20 deletions src/_scss/components/_pagination.scss
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
.pagination {
margin: rem(15);
.results-text {
@include display(flex);
@include flex-direction(row);
float: left;
@include display(flex);
@include flex-direction(row);
@include align-items(center);
.pagination__totals {
@include flex(0 0 auto);
}
.pager {
list-style-type: none;
@include display(flex);
@include flex-direction(row);
float: right;
@include justify-content(flex-end);
@include flex(1 1 auto);
list-style-type: none;
margin: 0;
li {
button {
.pager__item {
@include flex(0 0 auto);
.pager__button {
padding: rem(7) rem(10);
background-color: $color-white;
color: $color-gray;
Expand All @@ -23,26 +25,22 @@
&:hover {
background-color: $color-primary-alt-lightest;
}
}
&.active {
button {
background-color: $color-primary-alt-dark;
color: $color-white;
border-color: $color-primary-alt-dark;
}
}
&.disabled {
button {
&.pager__button_disabled {
border-color: $color-gray-lighter;
color: $color-gray-light;
&:hover {
background-color: $color-white;
cursor: auto;
}
}
&.pager__button_active {
background-color: $color-primary-alt-dark;
color: $color-white;
border-color: $color-primary-alt-dark;
}
}
}
.pagination-ellipsis {
.pager__ellipsis {
font-weight: bold;
margin-top: 14px;
margin-right: 5px;
Expand Down
13 changes: 0 additions & 13 deletions src/_scss/components/pageTitleBar/_title.scss

This file was deleted.

24 changes: 0 additions & 24 deletions src/_scss/components/pageTitleBar/pageTitleBar.scss

This file was deleted.

50 changes: 50 additions & 0 deletions src/_scss/layouts/default/stickyHeader/header.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
.sticky-header {
$sticky-header-height: rem(66);

position: relative;
height: $sticky-header-height;

.sticky-header__container {
width: 100%;
background-color: #4a4a4a;
color: $color-white;
// bottom shadow cast on the content
box-shadow: 0 2px 2px rgba(0, 0, 0, .3);

&.sticky-header__container_sticky {
@include media($medium-screen) {
position: fixed;
top: 0;
z-index: $z-header;
}
}

.sticky-header__header {
@import "mixins/fullSectionWrap";
@include fullSectionWrap(0, 0);
@include display(flex);
@include justify-content(space-between);
@include flex-direction(row);
@include align-items(center);
@include align-self(stretch);
@include flex-flow(row wrap);
position: relative;
height: $sticky-header-height;

.sticky-header__title {
@include flex(1 1 auto);
h1 {
font-size: rem(24);
line-height: rem(31);
font-weight: $font-semibold;
margin: 0;
}
}

.sticky-header__options {
@include flex(0 0 auto);
@import "../../tabbedSearch/header/downloadButton";
}
}
}
}
13 changes: 3 additions & 10 deletions src/_scss/layouts/landingPage/landingPage.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
@import "../default/default";
@import "../summary/summary";

.landing-page-content {
.landing-page {
padding: $global-pad;
.landing-page-overview {
@include span-columns(16);
@include shift(0);

.landing-page__overview {
text-align: center;
h3 {
margin-top: 0;
Expand All @@ -16,12 +12,9 @@
margin-bottom: rem(30);
}
}
.landing-page-section {
@include span-columns(16);
}
@include media($medium-screen) {
padding: ($global-pad * 2);
.landing-page-overview {
.landing-page__overview {
width: 75%;
margin: auto;
float: none;
Expand Down
3 changes: 2 additions & 1 deletion src/_scss/layouts/summary/summary.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import "../default/default";
#main-content {

.main-content {
@include outer-container(100%);
padding: 0;
background-color: $color-white;
Expand Down
51 changes: 0 additions & 51 deletions src/_scss/layouts/tabbedSearch/header/header.scss

This file was deleted.

2 changes: 1 addition & 1 deletion src/_scss/layouts/tabbedSearch/tabbedSearch.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import "layouts/default/default";

#main-content {
@import "./header/header";
@import "../default/stickyHeader/header";

.search-contents {
@include outer-container(100%);
Expand Down
2 changes: 1 addition & 1 deletion src/_scss/pages/about/_sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.about-sidebar-content {
&.float-sidebar {
position: fixed;
top: rem(30);
top: rem(96);
}

background-color: $color-white;
Expand Down
4 changes: 2 additions & 2 deletions src/_scss/pages/about/aboutPage.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
.usa-da-about-page {
@import "all";
@import "layouts/default/default";
@import "layouts/default/stickyHeader/header";

$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));
Expand Down
3 changes: 2 additions & 1 deletion src/_scss/pages/account/accountPage.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.usa-da-account-page {
@import "all";
@import "layouts/search/search";
@import "layouts/default/stickyHeader/header";
@import "./header/options";

$color-gray-border: #D8D8D8;
$color-blue-background: #F5FBFC;
@import "./header/header";
.main-content {
@import "../../mixins/fullSectionWrap";
@include fullSectionWrap(($global-mrg * 4), ($global-mrg * 4));
Expand Down
5 changes: 0 additions & 5 deletions src/_scss/pages/account/header/header.scss

This file was deleted.

12 changes: 12 additions & 0 deletions src/_scss/pages/accountLanding/accountLandingPage.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.usa-da-account-landing {
@import "all";
@import "layouts/landingPage/landingPage";
@import "components/pagination";
@import "layouts/default/stickyHeader/header";
@import './searchSection';
@import './table/resultsSection';

.search-section {
display: none;
}
}
39 changes: 39 additions & 0 deletions src/_scss/pages/accountLanding/searchSection.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
.search-section {
background-color: $color-primary-alt-lightest;
padding: rem(10);
border: 1px solid $color-vis-lightest;
text-align: center;
@include media($medium-screen) {
padding: rem(38);
}
.search-section__form {
@include display(flex);
@include flex-direction(row);
@include align-items(center);
@include justify-content(flex-start);
background-color: $color-white;
.search-section__input {
@include flex(1 1 auto);
color: $color-gray-light;
font-weight: 300;
line-height: rem(28);
padding: rem(10) rem(15);
border: 0;
@include media($medium-screen) {
font-size: rem(22);
}
}
.search-section__button {
@include flex(0 0 auto);
@include button-unstyled;
padding: 0 rem(15);
.search-section__button-icon {
height: rem(24);
width: rem(24);
svg {
fill: $color-gray-light;
}
}
}
}
}
Loading

0 comments on commit f3f89fb

Please sign in to comment.