Skip to content

Commit

Permalink
Merge pull request #4415 from fedspendingtransparency/staging
Browse files Browse the repository at this point in the history
Sprint 195: Merge to master for PROD deploy
  • Loading branch information
nick-torres authored Dec 12, 2024
2 parents c9f94c1 + 7f4af5c commit 8e7149f
Show file tree
Hide file tree
Showing 55 changed files with 1,196 additions and 853 deletions.
122 changes: 61 additions & 61 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions src/_scss/elements/filters/_selectedFilterBtn.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@
.shown-filter-button {
background-color: $color-white;
border: 1px solid $color-gray-lighter;
border-radius: rem(4);
border-radius: rem(2);
color: $color-gray;
font-size: $smallest-font-size;
font-weight: normal;
min-height: rem(31);
font-weight: $font-semibold;
min-height: rem(22);
height: auto;
padding: rem(6) rem(10);
padding: rem(2) rem(4);
text-align: left;
width: auto;
max-width: 90%;
line-height: 1.3;
margin-bottom: rem(2);
margin-top: rem(2);
margin-bottom: 0;
margin-right: rem(8);
@include display(flex);
@include align-items(center);

Expand All @@ -30,7 +31,7 @@
.close {
@include display(flex);
font-size: $small-font-size;
padding: 0 rem(5) rem(1) rem(15);
padding: 0 0 0 rem(4);
}
&:hover {
background: lighten($color-cool-blue-lightest, 10%);
Expand Down
8 changes: 5 additions & 3 deletions src/_scss/pages/recipient/_contentWrap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
color: $color-base;

.recipient-section {
padding: rem(30);

h3.recipient-section__title {
margin: 0;
font-size: $h3-font-size;
Expand Down Expand Up @@ -79,7 +77,7 @@
@include media($tablet-screen) {
@include flex(1 1 50%);
}

// this is all to make the borders gray and not doubled
// it's not ideal, but here we are
.recipient-section__details-table {
Expand Down Expand Up @@ -140,6 +138,10 @@
}
}
}

.recipient-section__viz.details {
margin-left: 0;
}
}
}

Expand Down
1 change: 1 addition & 0 deletions src/_scss/pages/recipient/_overview.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
}
}
.recipient-overview__content {
width:100%;
h3.recipient-overview__heading {
@include h4;
font-size: rem(19);
Expand Down
21 changes: 6 additions & 15 deletions src/_scss/pages/recipient/_positioning.scss
Original file line number Diff line number Diff line change
@@ -1,23 +1,14 @@
.recipient-content-wrapper {
@include display(flex);
@include align-items(flex-start);
width: 100%;

.recipient-sidebar {
display: none;
margin-top: 0;
// Evenly distribute the 30px space between the sidebar & content
margin-right: rem(15);
@include media($medium-screen) {
display: block;
@include flex(0 0 25%);
}
padding: ($global-spacing-unit * 5) ($global-spacing-unit * 4) ($global-spacing-unit * 4) ($global-spacing-unit * 4);

@media (max-width: $tablet-screen) {
padding: ($global-spacing-unit * 5) ($global-spacing-unit * 2) ($global-spacing-unit * 2) ($global-spacing-unit * 2);
}

.recipient-content {
width: 100%;
@include media($medium-screen) {
@include flex(1 1 75%);
}
max-width: rem(1400);
margin: auto;
}
}
2 changes: 0 additions & 2 deletions src/_scss/pages/recipient/recipientPage.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
}

.main-content {
@import "../../mixins/fullSectionWrap";
@include fullSectionWrap(0,0);
padding: 0;
@import "./_positioning";
@import "../../components/pageLoading";
Expand Down
Loading

0 comments on commit 8e7149f

Please sign in to comment.