Skip to content

Commit

Permalink
Merge branch 'patch/2.7.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
francisrupert committed Jan 11, 2022
2 parents 2fd380f + bcb2ee5 commit 47ea65a
Show file tree
Hide file tree
Showing 25 changed files with 736 additions and 632 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Lastly, refer to [Using the Boilerplate](#using-the-boilerplate) for basic guida

If you don't have Node or the ability to incorporate source files into a build process (Grunt, Gulp, Webpack, etc), follow these steps to manually use the FSA Style.

Download the latest assets: **https://github.com/usda-fsa/fsa-style/releases/download/2.7.0/fsa-style-2.7.0.zip**
Download the latest assets: **https://github.com/usda-fsa/fsa-style/releases/download/2.7.1/fsa-style-2.7.1.zip**

#### 1. Visual Index

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fsa-style",
"description": "Open Source CSS Framework of the USDA's FPAC Design System",
"version": "2.7.0",
"version": "2.7.1",
"main": "index.js",
"license": "SEE LICENSE in LICENSE.md",
"repository": {
Expand Down
38 changes: 19 additions & 19 deletions src/boilerplate.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
Brandon Christopher Reuben
</button>
</span>
<a href="link.html" class="fsa-header-app__profile-link">
<a href="/link.html" class="fsa-header-app__profile-link">
<span class="fsa-level fsa-level--inline fsa-level--gutter-xs">
<svg class="fsa-icon fsa-icon--size-1" aria-hidden="true" focusable="false" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"> <path d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"></path> </svg>
<span>Log out</span>
Expand All @@ -82,31 +82,31 @@
<div class="fsa-nav-global__bd">
<ul class="fsa-nav-global__list" aria-label="Primary Navigation" id="primary-navigation-07">
<li class="fsa-nav-global__list-item">
<a class="fsa-nav-global__link" href="link.html">
<a class="fsa-nav-global__link" href="/link.html">
<span class="fsa-nav-global__text">
<svg class="fsa-icon fsa-icon--size-2" aria-hidden="true" focusable="false" role="img" fill="#494440" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M3 13h8V3H3v10zm0 8h8v-6H3v6zm10 0h8V11h-8v10zm0-18v6h8V3h-8z"></path></svg>
Dashboard
</span>
</a>
</li>
<li class="fsa-nav-global__list-item">
<a class="fsa-nav-global__link fsa-nav-global__link--active" href="link.html">
<a class="fsa-nav-global__link fsa-nav-global__link--active" href="/link.html">
<span class="fsa-nav-global__text">
<svg class="fsa-icon fsa-icon--size-2" aria-hidden="true" focusable="false" role="img" fill="#494440" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M13 7h-2v4H7v2h4v4h2v-4h4v-2h-4V7zm-1-5C6.49 2 2 6.49 2 12s4.49 10 10 10h8c1.1 0 2-.9 2-2v-8c0-5.51-4.49-10-10-10zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"></path></svg>
Inspections
</span>
</a>
</li>
<li class="fsa-nav-global__list-item">
<a class="fsa-nav-global__link" href="link.html">
<a class="fsa-nav-global__link" href="/link.html">
<span class="fsa-nav-global__text">
<svg class="fsa-icon fsa-icon--size-2" aria-hidden="true" focusable="false" role="img" fill="#494440" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M16 11c1.66 0 2.99-1.34 2.99-3S17.66 5 16 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm-8 0c1.66 0 2.99-1.34 2.99-3S9.66 5 8 5C6.34 5 5 6.34 5 8s1.34 3 3 3zm0 2c-2.33 0-7 1.17-7 3.5V19h14v-2.5c0-2.33-4.67-3.5-7-3.5zm8 0c-.29 0-.62.02-.97.05 1.16.84 1.97 1.97 1.97 3.45V19h6v-2.5c0-2.33-4.67-3.5-7-3.5z"></path></svg>
Inspectors
</span>
</a>
</li>
<li class="fsa-nav-global__list-item">
<a class="fsa-nav-global__link" href="link.html">
<a class="fsa-nav-global__link" href="/link.html">
<span class="fsa-nav-global__text">
<svg class="fsa-icon fsa-icon--size-2" aria-hidden="true" focusable="false" role="img" fill="#494440" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M13 3c-4.97 0-9 4.03-9 9H1l3.89 3.89.07.14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7 7-3.13 7-7 7c-1.93 0-3.68-.79-4.94-2.06l-1.42 1.42C8.27 19.99 10.51 21 13 21c4.97 0 9-4.03 9-9s-4.03-9-9-9zm-1 5v5l4.28 2.54.72-1.21-3.5-2.08V8H12z"></path></svg>
Recent
Expand All @@ -121,8 +121,8 @@
<svg class="fsa-icon fsa-icon--size-1" aria-hidden="true" focusable="false" role="img" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19.35 10.04C18.67 6.59 15.64 4 12 4c-1.48 0-2.85.43-4.01 1.17l1.46 1.46C10.21 6.23 11.08 6 12 6c3.04 0 5.5 2.46 5.5 5.5v.5H19c1.66 0 3 1.34 3 3 0 1.13-.64 2.11-1.56 2.62l1.45 1.45C23.16 18.16 24 16.68 24 15c0-2.64-2.05-4.78-4.65-4.96zM3 5.27l2.75 2.74C2.56 8.15 0 10.77 0 14c0 3.31 2.69 6 6 6h11.73l2 2L21 20.73 4.27 4 3 5.27zM7.73 10l8 8H6c-2.21 0-4-1.79-4-4s1.79-4 4-4h1.73z"/></svg>
Offline
</span>
<a href="link.html" class="fsa-level__item--split">Settings</a>
<a href="link.html">About</a>
<a href="/link.html" class="fsa-level__item--split">Settings</a>
<a href="/link.html">About</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -159,16 +159,16 @@
<nav class="fsa-breadcrumb__nav" aria-label="Breadcrumbs">
<ol class="fsa-breadcrumb__list">
<li class="fsa-breadcrumb__item">
<a href="link/to/level-0/" class="fsa-breadcrumb__link">Level 0</a>
<a href="/link.html" class="fsa-breadcrumb__link">Level 0</a>
</li>
<li class="fsa-breadcrumb__item">
<a href="link/to/level-0/level-1/" class="fsa-breadcrumb__link">Level 1</a>
<a href="/link.html" class="fsa-breadcrumb__link">Level 1</a>
</li>
<li class="fsa-breadcrumb__item">
<a href="link/to/level-0/level-1/level-2/" class="fsa-breadcrumb__link">Level 2</a>
<a href="/link.html" class="fsa-breadcrumb__link">Level 2</a>
</li>
<li class="fsa-breadcrumb__item" aria-current="page">
<a href="link/to/level-0/level-1/level-2/level-3/" class="fsa-breadcrumb__link">Level 3</a>
<a href="/link.html" class="fsa-breadcrumb__link">Level 3</a>
</li>
</ol>
</nav>
Expand Down Expand Up @@ -326,7 +326,7 @@ <h1 class="fsa-m-t--none">Hello FPAC Design System</h1>
<td aria-label="State">Kansas</td>
<td aria-label="County">Cowley</td>
<td aria-label="Farm Number">3510</td>
<td aria-label="Assigned to"><a href="link.html">Norm Peterson</a></td>
<td aria-label="Assigned to"><a href="/link.html">Norm Peterson</a></td>
<td aria-label="Due Date">
<time datetime="2018-12-11">12/11/2018</time>
</td>
Expand All @@ -349,7 +349,7 @@ <h1 class="fsa-m-t--none">Hello FPAC Design System</h1>
<td aria-label="State">Kansas</td>
<td aria-label="County">Johnson</td>
<td aria-label="Farm Number">8787</td>
<td aria-label="Assigned to"><a href="link.html">Carla Tortelli</a></td>
<td aria-label="Assigned to"><a href="/link.html">Carla Tortelli</a></td>
<td aria-label="Due Date">
<time datetime="2018-08-05">08/05/2018</time>
</td>
Expand All @@ -372,7 +372,7 @@ <h1 class="fsa-m-t--none">Hello FPAC Design System</h1>
<td aria-label="State">Missouri</td>
<td aria-label="County">Jackson</td>
<td aria-label="Farm Number">8080</td>
<td aria-label="Assigned to"><a href="link.html">Ernie Pantusso</a></td>
<td aria-label="Assigned to"><a href="/link.html">Ernie Pantusso</a></td>
<td aria-label="Due Date">
<time datetime="2018-10-01">10/01/2018</time>
</td>
Expand Down Expand Up @@ -418,7 +418,7 @@ <h1 class="fsa-m-t--none">Hello FPAC Design System</h1>
<td aria-label="State">California</td>
<td aria-label="County">Los Angeles</td>
<td aria-label="Farm Number">6662</td>
<td aria-label="Assigned to"><a href="link.html">Diane Chambers</a></td>
<td aria-label="Assigned to"><a href="/link.html">Diane Chambers</a></td>
<td aria-label="Due Date">
<time datetime="2018-11-16">11/16/2018</time>
</td>
Expand Down Expand Up @@ -464,7 +464,7 @@ <h1 class="fsa-m-t--none">Hello FPAC Design System</h1>
<td aria-label="State">Kansas</td>
<td aria-label="County">Miami</td>
<td aria-label="Farm Number">7510</td>
<td aria-label="Assigned to"><a href="link.html">Woody Boyd</a></td>
<td aria-label="Assigned to"><a href="/link.html">Woody Boyd</a></td>
<td aria-label="Due Date">
<time datetime="2018-10-05">10/05/2018</time>
</td>
Expand All @@ -487,7 +487,7 @@ <h1 class="fsa-m-t--none">Hello FPAC Design System</h1>
<td aria-label="State">Maryland</td>
<td aria-label="County">Anne Arundel</td>
<td aria-label="Farm Number">1325</td>
<td aria-label="Assigned to"><a href="link.html">Woody Boyd</a></td>
<td aria-label="Assigned to"><a href="/link.html">Woody Boyd</a></td>
<td aria-label="Due Date">
<time datetime="2019-05-05">05/05/2019</time>
</td>
Expand Down Expand Up @@ -591,7 +591,7 @@ <h1 class="fsa-m-t--none">Hello FPAC Design System</h1>
<h2 class="fsa-growl__title">Inspection #1234 Deleted</h2>
</div>
<div class="fsa-growl__bd">
<p>Message goes here if you like or something, <a href="link.html">with a link</a> if necessary.</p>
<p>Message goes here if you like or something, <a href="/link.html">with a link</a> if necessary.</p>
<p>And another line here for kicks.</p>
<p>
<button data-behavior="growl-dismiss" class="fsa-btn fsa-btn--small fsa-btn--secondary" type="button">Button</button>
Expand Down Expand Up @@ -654,7 +654,7 @@ <h2 class="fsa-text--h3 fsa-m-t--none">Brandon Christopher Reuben</h2>
<li><a href="preferences.html">Link</a></li>
<li><a href="preferences.html">Another useful link</a></li>
</ul>
<a class="fsa-btn fsa-btn--primary fsa-btn--fill" href="link.html">
<a class="fsa-btn fsa-btn--primary fsa-btn--fill" href="/link.html">
<svg class="fsa-icon fsa-icon--size-1" aria-hidden="true" focusable="false" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"> <path d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"></path> </svg>
Log out
</a>
Expand Down
10 changes: 5 additions & 5 deletions src/demo/rwd__content-tabs.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,27 @@
<div class="fsa-content-tabs">
<ul class="fsa-content-tabs__list">
<li class="fsa-content-tabs__item">
<a class="fsa-content-tabs__label fsa-content-tabs__label--active" href="link.html" aria-current="tab">
<a class="fsa-content-tabs__label fsa-content-tabs__label--active" href="/link.html" aria-current="tab">
<span class="fsa-content-tabs__label-text">Lorem</span>
</a>
</li>
<li class="fsa-content-tabs__item">
<a class="fsa-content-tabs__label" href="link.html">
<a class="fsa-content-tabs__label" href="/link.html">
<span class="fsa-content-tabs__label-text">Ipsum dolor sit amet</span>
</a>
</li>
<li class="fsa-content-tabs__item">
<a class="fsa-content-tabs__label" href="link.html">
<a class="fsa-content-tabs__label" href="/link.html">
<span class="fsa-content-tabs__label-text">Consectetur adipiscing</span>
</a>
</li>
<li class="fsa-content-tabs__item">
<a class="fsa-content-tabs__label" href="link.html">
<a class="fsa-content-tabs__label" href="/link.html">
<span class="fsa-content-tabs__label-text">Elit sed do</span>
</a>
</li>
<li class="fsa-content-tabs__item">
<a class="fsa-content-tabs__label" href="link.html">
<a class="fsa-content-tabs__label" href="/link.html">
<span class="fsa-content-tabs__label-text">Eiusmod tempor</span>
</a>
</li>
Expand Down
2 changes: 1 addition & 1 deletion src/demo/rwd__font.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<div class="fsa-section">
<div class="fsa-section__bd fsa-p-t--s">
<div class="fsa-font--sans-light@s fsa-font--sans@m fsa-font--sans-bold@l fsa-text-size--5">
Yosemite National Park is set within California’s <a href="https://en.wikipedia.org/wiki/Sierra_Nevada">Sierra Nevada</a> mountains.
Yosemite National Park is set within California’s <a href="/link.html">Sierra Nevada</a> mountains.
</div>
<p class="fsa-level fsa-level--justify-center fsa-m--s">
<code>
Expand Down
26 changes: 13 additions & 13 deletions src/demo/rwd__footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,38 +31,38 @@
<div class="fsa-grid__1/1 fsa-grid__1/3@m">
<h3 class="fsa-footer__cat-header">Program Information</h3>
<ul class="fsa-footer__list">
<li class="fsa-footer__list-item"><a href="link.html" target="_blank">About XMPL</a></li>
<li class="fsa-footer__list-item"><a href="link.html" target="_blank">XMPL - Handbook 1</a></li>
<li class="fsa-footer__list-item"><a href="link.html" target="_blank">XMPL - Handbook 2</a></li>
<li class="fsa-footer__list-item"><a href="/link.html" target="_blank">About XMPL</a></li>
<li class="fsa-footer__list-item"><a href="/link.html" target="_blank">XMPL - Handbook 1</a></li>
<li class="fsa-footer__list-item"><a href="/link.html" target="_blank">XMPL - Handbook 2</a></li>
</ul>
</div>
<div class="fsa-grid__1/1 fsa-grid__1/3@m">
<h3 class="fsa-footer__cat-header">Agency Guidelines</h3>
<ul class="fsa-footer__list">
<li class="fsa-footer__list-item"><a href="link.html" target="_blank">Publications</a></li>
<li class="fsa-footer__list-item"><a href="link.html" target="_blank">Handbooks</a></li>
<li class="fsa-footer__list-item"><a href="link.html" target="_blank">Notices</a></li>
<li class="fsa-footer__list-item"><a href="link.html" target="_blank">FFAS Employee Forms</a></li>
<li class="fsa-footer__list-item"><a href="link.html" target="_blank">Software Transmittals</a></li>
<li class="fsa-footer__list-item"><a href="/link.html" target="_blank">Publications</a></li>
<li class="fsa-footer__list-item"><a href="/link.html" target="_blank">Handbooks</a></li>
<li class="fsa-footer__list-item"><a href="/link.html" target="_blank">Notices</a></li>
<li class="fsa-footer__list-item"><a href="/link.html" target="_blank">FFAS Employee Forms</a></li>
<li class="fsa-footer__list-item"><a href="/link.html" target="_blank">Software Transmittals</a></li>
</ul>
</div>
<div class="fsa-grid__1/1 fsa-grid__1/3@m">
<h3 class="fsa-footer__cat-header">Resources</h3>
<ul class="fsa-footer__list">
<li class="fsa-footer__list-item"><a href="link.html" target="_blank">Inside FSA</a></li>
<li class="fsa-footer__list-item"><a href="link.html" target="_blank">Policies and Links</a></li>
<li class="fsa-footer__list-item"><a href="/link.html" target="_blank">Inside FSA</a></li>
<li class="fsa-footer__list-item"><a href="/link.html" target="_blank">Policies and Links</a></li>
</ul>
</div>
</div>
</div>
<div class="fsa-footer__secondary fsa-grid__1/1 fsa-grid__3/12@l">
<ul class="fsa-footer__list fsa-footer__secondary-list">
<li class="fsa-footer__list-item fsa-footer__secondary-list-item">
<a class="fsa-btn fsa-footer__btn" href="link.html" target="_blank">Contact Us</a>
<a class="fsa-btn fsa-footer__btn" href="/link.html" target="_blank">Contact Us</a>
</li>
<li class="fsa-footer__list-item fsa-footer__secondary-list-item"><a href="tel:+8005551234" target="_blank">1-800-555-1234</a></li>
<li class="fsa-footer__list-item fsa-footer__secondary-list-item"><a href="//www.fsa.usda.gov/" target="_blank">FSA Website</a></li>
<li class="fsa-footer__list-item fsa-footer__secondary-list-item"><a href="//www.usda.gov/" target="_blank">USDA Website</a></li>
<li class="fsa-footer__list-item fsa-footer__secondary-list-item"><a href="/link.html" target="_blank">FSA Website</a></li>
<li class="fsa-footer__list-item fsa-footer__secondary-list-item"><a href="/link.html" target="_blank">USDA Website</a></li>
</ul>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/demo/rwd__header-app.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div class="fsa-header-app">
<div class="fsa-header-app__bd">
<div class="fsa-header-app__primary">
<a class="fsa-header-app__home-link" href="boilerplate.html" title="Link to YAFANS home">
<a class="fsa-header-app__home-link" href="/link.html" title="Link to YAFANS home">
<span class="fsa-header-app__app-name">
<abbr class="fsa-header-app__app-abbr" title="Posted County Prices">PCP</abbr>
<span class="fsa-header-app__app-full">Posted County Prices</span>
Expand All @@ -36,7 +36,7 @@
<span>Joe Reuben</span>
</span>
</span>
<a href="https://www.eauth.usda.gov/Logout/logoff.asp" class="fsa-header-app__profile-link">
<a href="/link.html" class="fsa-header-app__profile-link">
<span class="fsa-level fsa-level--inline fsa-level--gutter-xs">
<svg class="fsa-icon fsa-icon--size-1" aria-hidden="true" focusable="false" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"> <path d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"></path> </svg>
<span>Log out</span>
Expand Down
Loading

0 comments on commit 47ea65a

Please sign in to comment.