Skip to content

Commit

Permalink
Merge pull request #627 from fedspendingtransparency/staging
Browse files Browse the repository at this point in the history
Sprint 56 Deploy
  • Loading branch information
nmonga91 authored Jan 24, 2018
2 parents 5537a40 + 6badb4d commit 25f4e9f
Show file tree
Hide file tree
Showing 199 changed files with 4,066 additions and 1,288 deletions.
5 changes: 1 addition & 4 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,6 @@
"jsx-a11y/label-has-for": [1],
// downgrade array index as React key to warning (though it should be higher, this would
// be an expensive refactor)
"react/no-array-index-key": [1],
// TEMPORARILY make keyboard equivalents for mouse events a warning instead of error
"jsx-a11y/click-events-have-key-events": [1],
"jsx-a11y/mouse-events-have-key-events": [1]
"react/no-array-index-key": [1]
}
}
33 changes: 25 additions & 8 deletions src/_scss/components/checkbox/_primaryCheckboxType.scss
Original file line number Diff line number Diff line change
@@ -1,30 +1,47 @@
.primary-checkbox-type {
@import "./_sharedCheckboxStyle";
@include sharedCheckboxStyle;

&.single-item {
padding-left: rem(19);
}
svg {
fill: $color-gray-dark;
height: rem(11);
width: rem(11);
position: relative;

.primary-checkbox-wrapper {
@include display(flex);
@include justify-content(center);
@include align-items(center);
}

.toggle {
@include button-unstyled;
display: inline-block;
@include flex(0 0 auto)
width: rem(11);
height: rem(28);
vertical-align: middle;
margin-right: rem(8);
float: left;

cursor: pointer;

&.hidden-button {
opacity: 0.3;
cursor: not-allowed;
}

span {
// this is for the animation group
margin: 0;
top: 0;
}

svg {
fill: $color-gray-dark;
height: rem(11);
width: rem(11);
position: relative;
pointer-events: none;
}
}

.checkbox-item-wrapper {
@include flex(1 1 auto);
}
}
24 changes: 17 additions & 7 deletions src/_scss/components/checkbox/_secondaryCheckboxType.scss
Original file line number Diff line number Diff line change
@@ -1,15 +1,25 @@
.secondary-checkbox-type {
@import "./_sharedCheckboxStyle";
@include sharedCheckboxStyle;
.checkbox-type-item-wrapper {
padding: 0 rem(10) 0 rem(40);

margin-left: rem(40);

.checkbox-item-wrapper {
@include display(flex);
@include justify-content(center);
@include align-items(center);

margin-right: rem(10);

input[type=checkbox] {
margin-top: rem(12);
vertical-align: top;
margin-top: rem(4);
@include flex(0 0 auto);
@include align-self(flex-start);

width: rem(14);
height: rem(14);
}
label {
vertical-align: middle;
.checkbox-item-label {
@include flex(1 1 auto);
}
}
}
40 changes: 14 additions & 26 deletions src/_scss/components/checkbox/_sharedCheckboxStyle.scss
Original file line number Diff line number Diff line change
@@ -1,34 +1,22 @@
@import "mixins/setText";
@mixin sharedCheckboxStyle {
display: table;
width: 100%;
.checkbox-type-item-wrapper {
display: table-cell;
clear: both;
overflow: hidden;
label.checkbox-item-wrapper {
cursor: pointer;

input[type=checkbox] {
float: left;
margin-right: rem(6);
margin-top: rem(6);
}
span {
@include usa-input-checkbox;
height: rem(14);
width: rem(14);

cursor: pointer;
margin-left: rem(10);
top: rem(10);
position: relative;
}
label {
@include usa-label;
display: inline-block;
@include setText(rem(14));
line-height: rem(20);
margin: 0;
width: 77%;
padding-left: 0;
&:before {
width: rem(14);
height: rem(14);
position: relative;
.checkbox-item-label {
margin-left: rem(6);
font-size: rem(12);
cursor: pointer;

@include media($large-screen) {
font-size: $small-font-size;
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/_scss/elements/_figure.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ img {
.media-link {
@include media-link();
}

figure {
margin: 0;
}
12 changes: 11 additions & 1 deletion src/_scss/elements/filters/_typeahead.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,17 @@
color: $color-gray-light;
}
}
.autocomplete ul {

.screen-reader-description {
position:absolute;
left:-10000px;
top:auto;
width:1px;
height:1px;
overflow:hidden;
}

ul.autocomplete {
background-color: $color-white;
border: 1px solid $color-gray-lighter;
cursor: default;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@
min-height: rem(28);
}

.program-activity-set {
@import "../../../search/filters/awardType/_sharedAwardStyle";
@include sharedAwardStyle;
}

div.account-program-activity-loading {
font-size: $small-font-size;
line-height: $small-font-size;
Expand Down
3 changes: 2 additions & 1 deletion src/_scss/pages/glossary/_searchList.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
.glossary-result-group {
margin-top: 20px;

h3.group-title {
h2.group-title {
@include h3;
font-size: 18px;
line-height: 26px;
font-weight: 600;
Expand Down
2 changes: 2 additions & 0 deletions src/_scss/pages/homepage/_searchSection.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
padding-top: rem(100);
text-align: center;
.search-section-links-primary-text {
@include h1;
color: $color-white;
font-size: rem(55);
line-height: rem(60);
margin: 0;
}
.search-section-links-sub-text {
@include h2;
color: $color-gray-lighter;
font-size: rem(34);
line-height: rem(40);
Expand Down
3 changes: 2 additions & 1 deletion src/_scss/pages/homepage/_searchSectionItems.scss
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@

margin-top: rem(30);

h3 {
h5 {
@include h3;
font-weight: $font-semibold;
font-size: rem(28);
line-height: rem(36);
Expand Down
67 changes: 35 additions & 32 deletions src/_scss/pages/homepage/_treeMapIntroMQ.scss
Original file line number Diff line number Diff line change
@@ -1,47 +1,50 @@
//MEDIA QUERIES FOR THE TREEMAP LANDING SECTION OF THE HOMEPAGE
@mixin treeMapLangingMQ () {
@include media($tablet-screen) {
width: $site-max-width;
background: url(#{$image-path}/treasury_building.png) no-repeat center bottom;
& h3 {
@include span-columns(4);
@include setText(rem(35));
text-align: right;
}
& h5 {
@include span-columns(4);
@include setText(rem(18));
text-align: right;
margin-left: rem(20);
width: 45%;
.treemap-intro-text {
.treemap-intro-bottom {
@include setText(rem(35));
text-align: right;
}
.treemap-intro-top {
@include setText(rem(18));
text-align: right;
}
}
}
@include media($medium-screen) {
& h3 {
@include span-columns(5.4);
@include setText(rem(35)) letter-spacing: rem(-1);
}
& h5 {
@include span-columns(5.4);
@include setText(rem(18))
width: 35%;
.treemap-intro-text {
.treemap-intro-bottom {
@include setText(rem(35)) letter-spacing: rem(-1);
}
.treemap-intro-top {
@include setText(rem(18))
}
}
}
@include media($large-screen) {
& h3 {
@include span-columns(6.5);
@include setText(rem(50))
}
& h5 {
@include span-columns(6.5);
@include setText(rem(24))
width: 40%;
.treemap-intro-text {
.treemap-intro-bottom {
@include setText(rem(50))
}
.treemap-intro-top {
@include setText(rem(24))
}
}
}
@include media($x-large-screen) {
& h3 {
@include span-columns(7.5);
@include setText(rem(55))
}
& h5 {
@include span-columns(7.5);
@include setText(rem(28))
width: 40%;
.treemap-intro-text {
.treemap-intro-bottom {
@include setText(rem(55))
}
.treemap-intro-top {
@include setText(rem(28))
}
}
}
}
6 changes: 4 additions & 2 deletions src/_scss/pages/homepage/landingSection.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
min-height: rem(325);
text-align: center;
z-index: 2;
& h2 {
& h1 {
@include h2;
color: $color-white;
font-size: rem(45);
margin: 0;
Expand All @@ -60,7 +61,8 @@
font-weight: $font-normal;
}
}
h5 {
& h2 {
@include h5;
color: $color-gold-lighter;
font-size: rem(20);
font-weight: $font-normal;
Expand Down
Loading

0 comments on commit 25f4e9f

Please sign in to comment.