Skip to content
This repository has been archived by the owner on Dec 23, 2017. It is now read-only.

Feature/various cleanup #144

Merged
merged 3 commits into from
May 8, 2015
Merged

Feature/various cleanup #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d794278
Ignoring compiled css
May 7, 2015
94a984d
New glossary image
May 7, 2015
cca7e4e
New layout for cards on home
May 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ openfecwebapp/local_config.py
static/styles/styles.css.map
app/
/.env

static/styles/styles.css
Binary file added static/img/glossary.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 12 additions & 1 deletion static/styles/_components/_cards.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,23 @@
// If we're showing a grid of cards. Default is 2 across
.card-grid {
@include clearfix();
@include display(flex);
@include flex-direction(column);
padding: 2rem 0;
clear: both;

@include media($medium) {
@include flex-direction(row);

.card {
@include span-columns(6);
margin-bottom: 0;
}
}

@include media($large) {
.card {
@include span-columns(6);
@include span-columns(12);
}
}
}
Expand Down
9 changes: 4 additions & 5 deletions static/styles/_components/_images.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Styles for various images

.image--framed__container {
padding: 10px;
background-color: #fff;
border: 1px solid $light-blue-gray;
.image--framed {
display: inline-block;
border: 10px solid #fff;
box-shadow: 0 0 0 1px #d8d8d8;
}
8 changes: 4 additions & 4 deletions static/styles/_layout/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ body {
// These are common grouping sizes, described by their desktop size

.chunk--half {
@include media($medium) {
@include span-columns(6);
}

@include media($large) {
@include span-columns(12);

&:nth-child(even) {
@include omega();
}
}
}

Expand Down
26 changes: 11 additions & 15 deletions templates/search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,16 @@ <h2 id="browse-heading">Get to Know the Data</h2>
<p class="text--lead">OpenFEC currently has financial data for all candidates for federal office and profile information for other committees involved in federal races, and we will be adding more soon.</p>
</div>
<div class="card-grid">
<div class="row">
<div class="card">
<h3><img src="/static/img/icon-candidate.svg" class="category-icon" alt="Icon representing candidates">Candidates</h3>
<p>Candidates are people who have are running or have run for office. Active candidates have at least one committee they have authorized to raise and spend money in elections. If a person has been a candidate for multiple offices (for example, they ran for senate one year and president another year), they will have a candidate page for each office sought.</p>
<p><a href="/candidates">Browse all candidates &raquo;</a></p>
</div>
<div class="card card--icon">
<h3><img class="category-icon" src="/static/img/icon-committee.svg" alt="Icon representing committees">Committees</h3>
<p>Committees are legal entities created to raise and spend money in federal elections. There are many different types of committees involved in federal elections, and different types of committees have different fundraising and spending limitations and different requirements for reporting their activity.</p>
<p><a href="/committees">Browse all committees &raquo;</a></p>
</div>
</div>
<div class="card">
<h3><img src="/static/img/icon-candidate.svg" class="category-icon" alt="Icon representing candidates">Candidates</h3>
<p>Candidates are people who have are running or have run for office. Active candidates have at least one committee they have authorized to raise and spend money in elections. If a person has been a candidate for multiple offices (for example, they ran for senate one year and president another year), they will have a candidate page for each office sought.</p>
<p><a href="/candidates">Browse all candidates &raquo;</a></p>
</div>
<div class="card card--icon">
<h3><img class="category-icon" src="/static/img/icon-committee.svg" alt="Icon representing committees">Committees</h3>
<p>Committees are legal entities created to raise and spend money in federal elections. There are many different types of committees involved in federal elections, and different types of committees have different fundraising and spending limitations and different requirements for reporting their activity.</p>
<p><a href="/committees">Browse all committees &raquo;</a></p>
</div>
</div>
</div>
</section>
Expand All @@ -34,9 +32,7 @@ <h2 id="help-heading">Need Help Understanding the Terms?</h2>
<p class="text--lead">For example, click on this term to see its definition: <span class="term" data-term="principal campaign committee">Principal Campaign Committee</span></p>
</div>
<div class="chunk--half">
<div class="image--framed__container">
<img class="img--framed u-not-responsive" src="/static/img/glossary-example.gif" alt="To use the glossary, click on the question mark icon in the menu.">
</div>
<img class="image--framed" src="/static/img/glossary.jpg" alt="To use the glossary, click on the question mark icon in the menu.">
</div>
</div>
</section>
Expand Down