Skip to content

Commit

Permalink
Merge pull request #71 from joshbruce/header-footer-logo-update
Browse files Browse the repository at this point in the history 
[Website]: Header footer logo update
  • Loading branch information
@jenbesergsa
jenbesergsa authored Aug 18, 2016
2 parents b866554 + 90f4e08 commit ef3221b
Show file tree
Hide file tree
Showing 12 changed files with 318 additions and 292 deletions.
194 changes: 2 additions & 192 deletions _includes/code/components/footers-code.html
View file
Original file line number Diff line number Diff line change
@@ -1,195 +1,5 @@
{% capture code_preview %}
<h6 class="usa-heading-alt" id="big-footer">Big footer</h6>

<footer class="usa-footer usa-footer-big" role="contentinfo">
<div class="usa-grid usa-footer-return-to-top">
<a href="#">Return to top</a>
</div>
<div class="usa-footer-primary-section">
<div class="usa-grid-full">
<nav class="usa-footer-nav usa-width-two-thirds">
<ul class="usa-unstyled-list usa-width-one-fourth usa-footer-primary-content">
<li class="usa-footer-primary-link">
<h4>Topic</h4>
</li>
<li><a href="#">Secondary link</a></li>
<li><a href="#">Secondary link</a></li>
<li><a href="#">Secondary link</a></li>
<li><a href="#">Secondary link</a></li>
</ul>
<ul class="usa-unstyled-list usa-width-one-fourth usa-footer-primary-content">
<li class="usa-footer-primary-link">
<h4>Topic</h4>
</li>
<li><a href="#">Secondary link</a></li>
<li><a href="#">Secondary link</a></li>
<li><a href="#">Secondary link</a></li>
<li><a href="#">Secondary link</a></li>
</ul>
<ul class="usa-unstyled-list usa-width-one-fourth usa-footer-primary-content">
<li class="usa-footer-primary-link">
<h4>Topic</h4>
</li>
<li><a href="#">Secondary link</a></li>
<li><a href="#">Secondary link</a></li>
<li><a href="#">Secondary link</a></li>
<li><a href="#">Secondary link</a></li>
</ul>
<ul class="usa-unstyled-list usa-width-one-fourth usa-footer-primary-content">
<li class="usa-footer-primary-link">
<h4>Topic</h4>
</li>
<li><a href="#">Secondary link</a></li>
<li><a href="#">Secondary link</a></li>
<li><a href="#">Secondary link</a></li>
<li><a href="#">Secondary link</a></li>
</ul>
</nav>

<div class="usa-sign_up-block usa-width-one-third">
<h3 class="usa-sign_up-header">Sign up</h3>

<label class="" for="email" id="">Your email address</label>
<input id="email" name="email" type="email">

<button type="submit">Sign up</button>
</div>
</div>
</div>

<div class="usa-footer-secondary_section usa-footer-big-secondary-section">
<div class="usa-grid">
<div class="usa-footer-logo usa-width-one-half">
<img class="usa-footer-logo-img" src="{{ site.baseurl }}/assets/img/logo-img.png" alt="Logo image">
<h3 class="usa-footer-logo-heading">Name of Agency</h3>
</div>
<div class="usa-footer-contact-links usa-width-one-half">
<a class="usa-link-facebook" href="#">
<span>Facebook</span>
</a>
<a class="usa-link-twitter" href="#">
<span>Twitter</span>
</a>
<a class="usa-link-youtube" href="#">
<span>YouTube</span>
</a>
<a class="usa-link-rss" href="#">
<span>RSS</span>
</a>
<address>
<h3 class="usa-footer-contact-heading">Agency Contact Center</h3>
<p>(800) CALL-GOVT</p>
<a href="mailto:[email protected]">[email protected]</a>
</address>
</div>
</div>
</div>
</footer>

<h6 class="usa-heading-alt" id="medium-footer">Medium footer</h6>

<footer class="usa-footer usa-footer-medium" role="contentinfo">
<div class="usa-grid usa-footer-return-to-top">
<a href="#">Return to top</a>
</div>
<div class="usa-footer-primary-section">
<div class="usa-grid-full">
<nav class="usa-footer-nav">
<ul class="usa-unstyled-list">
<li class="usa-width-one-sixth usa-footer-primary-content">
<a class="usa-footer-primary-link" href="#">Primary link</a>
</li>
<li class="usa-width-one-sixth usa-footer-primary-content">
<a class="usa-footer-primary-link" href="#">Primary link</a>
</li>
<li class="usa-width-one-sixth usa-footer-primary-content">
<a class="usa-footer-primary-link" href="#">Primary link</a>
</li>
<li class="usa-width-one-sixth usa-footer-primary-content">
<a class="usa-footer-primary-link" href="#">Primary link</a>
</li>
<li class="usa-width-one-sixth usa-footer-primary-content">
<a class="usa-footer-primary-link" href="#">Primary link</a>
</li>
</ul>
</nav>
</div>
</div>

<div class="usa-footer-secondary_section">
<div class="usa-grid">
<div class="usa-footer-logo usa-width-one-half">
<img class="usa-footer-logo-img" src="{{ site.baseurl }}/assets/img/logo-img.png" alt="Logo image">
<h3 class="usa-footer-logo-heading">Name of Agency</h3>
</div>
<div class="usa-footer-contact-links usa-width-one-half">
<a class="usa-link-facebook" href="#">
<span>Facebook</span>
</a>
<a class="usa-link-twitter" href="#">
<span>Twitter</span>
</a>
<a class="usa-link-youtube" href="#">
<span>YouTube</span>
</a>
<a class="usa-link-rss" href="#">
<span>RSS</span>
</a>
<address>
<h3 class="usa-footer-contact-heading">Agency Contact Center</h3>
<p>(800) CALL-GOVT</p>
<a href="mailto:[email protected]">[email protected]</a>
</address>
</div>
</div>
</div>
</footer>

<h6 class="usa-heading-alt" id="slim-footer">Slim footer</h6>

<footer class="usa-footer usa-footer-slim" role="contentinfo">
<div class="usa-grid usa-footer-return-to-top">
<a href="#">Return to top</a>
</div>
<div class="usa-footer-primary-section">
<div class="usa-grid-full">
<nav class="usa-footer-nav usa-width-two-thirds">
<ul class="usa-unstyled-list">
<li class="usa-width-one-fourth usa-footer-primary-content">
<a class="usa-footer-primary-link" href="#">Primary link</a>
</li>
<li class="usa-width-one-fourth usa-footer-primary-content">
<a class="usa-footer-primary-link" href="#">Primary link</a>
</li>
<li class="usa-width-one-fourth usa-footer-primary-content">
<a class="usa-footer-primary-link" href="#">Primary link</a>
</li>
<li class="usa-width-one-fourth usa-footer-primary-content">
<a class="usa-footer-primary-link" href="#">Primary link</a>
</li>
</ul>
</nav>
<div class="usa-width-one-third">
<div class="usa-footer-primary-content usa-footer-contact_info">
<p>(800) CALL-GOVT</p>
</div>
<div class="usa-footer-primary-content usa-footer-contact_info">
<a href="mailto:[email protected]">[email protected]</a>
</div>
</div>
</div>
</div>

<div class="usa-footer-secondary_section">
<div class="usa-grid">
<div class="usa-footer-logo">
<img class="usa-footer-slim-logo-img" src="{{ site.baseurl }}/assets/img/logo-img.png" alt="Logo image">
<h3 class="usa-footer-slim-logo-heading">Name of Agency</h3>
</div>
</div>
</div>
</footer>

<h6 class="usa-heading-alt" id="big-footer">SAM footer</h6>
<section id="iae-footer">
<footer>
<div class="usa-grid usa-footer-return-to-top">
Expand All @@ -199,7 +9,7 @@ <h3 class="usa-footer-slim-logo-heading">Name of Agency</h3>
<div class="iae-footer-body usa-grid">
<div class="iae-footer-logo usa-width-one-sixth">
<a class="image-wrap" href="http://www.gsa.gov" target="_blank">
<img alt="GSA logo" src="assets/img/logo-gsa.png">
<img alt="GSA logo" src="{{ site.baseurl }}/assets/img/logos/gsa-reverse.png">
</a>
</div>
<ul class="iae-footer-links usa-unstyled-list usa-width-five-sixths">
Expand Down
33 changes: 32 additions & 1 deletion _includes/code/components/header-code.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{% capture code_preview %}
<h6>Unauthenticated</h6>
<section id="iae-header">
<header>
<div class="iae-header">
Expand All @@ -12,7 +13,7 @@
</div>
<div class="iae-header-logo">
<a class="image-wrap" href="#">
<img alt="Transtion SAM.gov Logo" src="{{ site.baseurl }}/assets/img/transition-sam-logo.png">
<img width="250" alt="Transtion SAM.gov Logo" src="{{ site.baseurl }}/assets/img/logos/tsg-reverse.png">
</a>
</div>
</div>
Expand All @@ -31,4 +32,34 @@
</div>
</header>
</section>

<h6>Authenticated</h6>
<section id="iae-header">
<header>
<div class="iae-header">
<div class="usa-grid">
<div class="iae-header-menu">
<div class="iae-header-nav">
<i class="fa fa-bars" aria-hidden="true"></i>
<div class="m_T-1x">
MENU
</div>
</div>
<div class="iae-header-logo">
<a class="image-wrap" href="#">
<img width="250" alt="Transtion SAM.gov Logo" src="{{ site.baseurl }}/assets/img/logos/tsg-reverse.png">
</a>
</div>
</div>
<div class="iae-sign-in">
<i class="fa fa-search" aria-hidden="true"></i>
<i class="fa fa-bell" aria-hidden="true"></i>
<div class="pull-right m_L-3x">
[email protected]
</div>
</div>
</div>
</div>
</header>
</section>
{% endcapture %}
88 changes: 88 additions & 0 deletions _includes/code/elements/tables-code.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
{% capture code_preview %}
<h6>Bordered Table</h6>

<table>
<thead>
<tr>
<th scope='col'>Document title</th>
<th scope='col'>Description</th>
<th scope='col'>Year</th>
</tr>
</thead>
<tbody>
<tr>
<th scope='row'>Declaration of Independence</th>
<td>Statement adopted by the Continental Congress declaring independence from the British Empire.</td>
<td>1776</td>
</tr>
<tr>
<th scope='row'>Bill of Rights</th>
<td>The first ten amendments of the U.S. Constitution guaranteeing rights and freedoms.</td>
<td>1791</td>
</tr>
<tr>
<th scope='row'>Declaration of Sentiments</th>
<td>A document written during the Seneca Falls Convention outlining the rights that American women should be entitled to as citizens.</td>
<td>1848</td>
</tr>
<tr>
<th scope='row'>Emancipation Proclamation</th>
<td>An executive order granting freedom to slaves in designated southern states.</td>
<td>1863</td>
</tr>
</tbody>
</table>

<h6>Borderless Table</h6>

<table class="usa-table-borderless">
<thead>
<tr>
<th scope='col'>Document Title</th>
<th scope='col'>Description</th>
<th scope='col'>Year</th>
</tr>
</thead>
<tbody>
<tr>
<th scope='row'>Declaration of Independence</th>
<td>Statement adopted by the Continental Congress declaring independence from the British Empire.</td>
<td>1776</td>
</tr>
<tr>
<th scope='row'>Bill of Rights</th>
<td>The first ten amendments of the U.S. Constitution guaranteeing rights and freedoms.</td>
<td>1791</td>
</tr>
<tr>
<th scope='row'>Declaration of Sentiments</th>
<td>MadeA document written during the Seneca Falls Convention outlining the rights that American women should be entitled to as citizens.</td>
<td>1848</td>
</tr>
<tr>
<th scope='row'>Emancipation Proclamation</th>
<td>An executive order granting freedom to slaves in designated southern states.</td>
<td>1863</td>
</tr>
</tbody>
</table>
{% endcapture %}

{% capture uikit-php %}

...

{% endcapture %}

{% capture uikit-js %}

...

{% endcapture %}

{% capture uikit-docs %}
<h4 class="usa-heading">Tables</h4>
<h5>Required keys</h5>

<h5>Optional keys</h5>
{% endcapture %}
7 changes: 7 additions & 0 deletions _includes/components/footers.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
<h2 class="usa-heading" id="footers">Footers</h2>

<div class="usa-alert usa-alert-info">
<div class="usa-alert-body">
<h3 class="usa-alert-heading">Extension of the US Web Design Standards</h3>
<p class="usa-alert-text">The US Web Design Standards does not define this component.</p>
</div>
</div>

{% include code/components/footers-code.html %}
{% include code/main.html %}

Expand Down
1 change: 1 addition & 0 deletions _includes/components/inlinefeedbackform_quick.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<h2 class="usa-heading" id="inline-feedback-form-quick">Inline feedback form (quick)</h2>


<p class="usa-font-lead">The quick inline feedback form allows users to give feedback by quickly responding to a yes-no question.</p>

<div class="usa-alert usa-alert-info">
Expand Down
Loading

0 comments on commit ef3221b

Please sign in to comment.