Skip to content

Commit

Permalink
Addressing feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
@rfultz
rfultz committed Nov 23, 2022
1 parent b9a6896 commit 226f52f
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 21 deletions.
8 changes: 4 additions & 4 deletions fec/data/templates/house-senate-overview.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
<div class="js-sticky-side" data-sticky-container="options">
<nav class="sidebar sidebar--neutral side-nav js-toc">
<ul class="sidebar__content">
<li role="side-nav__item">
<li class="side-nav__item">
<a class="side-nav__link" href="#summary">Election summary</a>
</li>
<li role="side-nav__item">
<li class="side-nav__item">
<a class="side-nav__link" href="#contributions-over-time">{{ office|title }} candidate contributions over time</a>
</li>
{% if FEATURES.house_senate_overview_totals %}
<li role="side-nav__item">
<li class="side-nav__item">
<a class="side-nav__link" href="#totals">Totals for all {{ office | title }} elections</a></li>
</li>
{% endif %}
Expand All @@ -43,7 +43,7 @@
{% set other_office = "house"%}
{% endif %}
</nav>
<a class="button button--cta u-margin--top t-left-aligned button--disbursements u-full-width" href="/data/elections/{{ other_office }}">Explore U.S. {{ other_office|title }} charts</a>
<a class="button button--cta u-margin--top t-left-aligned button--disbursements u-full-width" href="/data/elections/{{ other_office }}">Explore U.S. {{ other_office|title }} election data</a>
</div>
</div>
<div class="main__content--right">
Expand Down
2 changes: 1 addition & 1 deletion fec/data/templates/partials/house-senate-overview/section-contributions-across-time.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
</aside>
</section>

<div class="content__section--ruled-responsive u-margin--top t-serif">
<div class="content__section--ruled-responsive methodology-block u-margin--top t-serif">
<div class="row">
<ul class="list--buttons u-float-right">
<li><a class="button button--alt js-ga-event" data-a11y-dialog-show="contributions-over-time-modal" data-ga-event="Totals for all elections methodology modal clicked" aria-controls="totals-for-all-elections-modal">Methodology</a></li>
Expand Down
10 changes: 5 additions & 5 deletions fec/data/templates/partials/house-senate-overview/section-summary.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
<h2>Election summary</h2>
<div id="election-summary">
{# <h2 class="heading__left">{{ office | title }} election summary</h2> #}
<p class="t-sans t-low-height">Comparing total money raised, spent and remaining cash on hand, by party.</p>
<p class="t-sans t-low-height">Comparing total money raised, spent and cash on hand, by party.</p>
{{ select.two_year_select(cycles, cycle, id="cycle-summary") }}
<div class="grid--flex grid--3-wide">
<div class="grid__item">
<figure class="js-party-money-bars" id="summary-total-raised" data-event-field-id="total_receipts">
<div class="total-wrapper">
<h1 class="value js-value-large">$1,234,567,890</h1>
<h2 class="description js-value-large-desc">raised by {{ office | title }} candidates</h2>
<h2 class="description js-value-large-desc">raised by candidates</h2>
</div>
<div class="visual-divider" role="presentation"></div>
<div class="parties-wrapper"></div>
Expand All @@ -24,7 +24,7 @@
<figure class="js-party-money-bars" id="summary-total-spent" data-event-field-id="total_disbursements">
<div class="total-wrapper">
<h1 class="value js-value-large">$1,234,567,890</h1>
<h2 class="description js-value-large-desc">spent by {{ office | title }} candidates</h2>
<h2 class="description js-value-large-desc">spent by candidates</h2>
</div>
<div class="visual-divider" role="presentation"></div>
<div class="parties-wrapper"></div>
Expand All @@ -34,7 +34,7 @@
<figure class="js-party-money-bars" id="summary-remaining-coh" data-event-field-id="total_cash_on_hand_end_period">
<div class="total-wrapper">
<h1 class="value js-value-large">$1,234,567,890</h1>
<h2 class="description js-value-large-desc">cash on hand for {{ office | title }} candidates</h2>
<h2 class="description js-value-large-desc">cash on hand for candidates</h2>
</div>
<div class="visual-divider" role="presentation"></div>
<div class="parties-wrapper"></div>
Expand All @@ -44,7 +44,7 @@



<div class="content__section--ruled-responsive t-serif">
<div class="content__section--ruled-responsive methodology-block t-serif">
<div class="heading--with-action t-small t-serif">
<i class="data-disclaimer">Newly filed summary data may not appear for up to 48 hours.</i>
<div class="heading__right">
Expand Down
18 changes: 9 additions & 9 deletions fec/data/templates/partials/house-senate-overview/section-totals-for-all-elections.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
<th role="col">Debts</th>
</thead>
</table>
<div class="content__section u-margin--top t-serif">
<div class="row">
<ul class="list--buttons u-float-right">
<li><a class="button button--alt js-ga-event" data-a11y-dialog-show="totals-for-all-elections-modal" data-ga-event="Totals for all elections methodology modal clicked" aria-controls="totals-for-all-elections-modal">Methodology</a></li>
</ul>
<p class="u-no-margin"><i class="data-disclaimer">Each two-year period includes financial activity from January 1 of the nonelection year through December 31 of the election year. Newly filed summary data may not appear for up to 48 hours.</i></p>
</div>
<div class="js-modal modal" id="totals-for-all-elections-modal" aria-hidden="true">
<div tabindex="-1" class="modal__overlay" data-a11y-dialog-hide=""></div>
<div class="content__section methodology-block u-margin--top t-serif">
<div class="row">
<ul class="list--buttons u-float-right">
<li><a class="button button--alt js-ga-event" data-a11y-dialog-show="totals-for-all-elections-modal" data-ga-event="Totals for all elections methodology modal clicked" aria-controls="totals-for-all-elections-modal">Methodology</a></li>
</ul>
<p class="u-no-margin"><i class="data-disclaimer">Each two-year period includes financial activity from January 1 of the nonelection year through December 31 of the election year. Newly filed summary data may not appear for up to 48 hours.</i></p>
</div>
<div class="js-modal modal" id="totals-for-all-elections-modal" aria-hidden="true">
<div tabindex="-1" class="modal__overlay" data-a11y-dialog-hide=""></div>
<div role="dialog" class="modal__content" aria-labelledby="totals-for-all-elections-modal-title">
<div role="document">
<button type="button" class="modal__close button--close--primary" data-a11y-dialog-hide="" title="Close this dialog window"></button>
Expand Down
4 changes: 2 additions & 2 deletions fec/fec/static/js/modules/party-money-bars.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,10 @@ const partiesHolderTemplate = `<div class="js-parties-holder" role="grid"></div>
*/
const meterRowTemplate = `
<div class="js-meter-row" role="row">
<label for="" role="cell" class=" js-party-title">Rep.</label>
<label for="" role="cell" class=" js-party-title"></label>
<label for="" role="cell" class=" js-party-value t-mono-stacked-currency">$0</label>
<div>
<meter id="" min="0" max="0" value="0" title="" data-party="REP"></meter>
<meter id="" min="0" max="0" value="0" title="" data-party=""></meter>
</div>
</div>`;

Expand Down
4 changes: 4 additions & 0 deletions fec/fec/static/scss/widgets/house-senate-overview.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,3 +149,7 @@ meter:-moz-meter-optimum::-moz-meter-bar {
}
}
}

.methodology-block ul {
margin-left: 1rem;
}

0 comments on commit 226f52f

Please sign in to comment.