Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit8f51a80

Browse files
committed
Merge branch 'release/1.19.0' into gh-pages
2 parentsd3c7349 +cf7d6ce commit8f51a80

File tree

79 files changed

+2308
-1652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+2308
-1652
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ npm-debug.log
88
.ugly
99
.bundle/
1010
_sass/lib/fsa-style
11+
scratch.md
1112

1213
\.vscode/

‎README.md‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ twitter_username: francisrupert
2020
github_username:usda-fsa
2121
permalink:none
2222
github_repository_url:https://github.com/USDA-FSA/fsa-design-system
23-
fsa-style_version:2.6.0
23+
fsa-style_version:2.7.0-RC2
2424

2525
# Site key assets
2626
stylesheets:

‎_data/navvy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@
396396
img:"img/subcategories/font.png"
397397

398398
-subtitle:"Link Display"
399-
keyword:"block,inline,inline-block"
399+
keyword:"block,inline,inline-block,fill"
400400
subhref:"utilities/#link-display"
401401
img:"img/subcategories/link-display.png"
402402

‎_includes/rwd-viewer.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<divclass="docs__rwd-demo-block"data-component>
1111
<divclass="docs__rwd-embed-container">
12-
<divclass="fsa-level fsa-level--justify-center fsa-level--gutter-none"role="group">
12+
<divclass="fsa-level fsa-level--justify-center fsa-level--gutter-xs"role="group">
1313
<buttondata-behavior="toggle-rwd-size"data-size="phone"class="fsa-btn fsa-btn--plain fsa-p--s fsa-radius--full fsa-color--secondary {% if rwdSize == 'phone' %}fsa-bg--secondary-100{% else %}fsa-bg:hover--tertiary-100{% endif %}"type="button"{%ifrwdSize == 'phone'%}aria-selected="true"{%endif%}title="Portrait"aria-label="Portrait"><svgclass="fsa-icon fsa-icon--size-2"aria-hidden="true"focusable="false"role="img"xmlns="http://www.w3.org/2000/svg"viewBox="0 0 24 24"><pathd="M15.5 1h-8C6.12 1 5 2.12 5 3.5v17C5 21.88 6.12 23 7.5 23h8c1.38 0 2.5-1.12 2.5-2.5v-17C18 2.12 16.88 1 15.5 1zm-4 21c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5zm4.5-4H7V4h9v14z"/></svg></button>
1414
<buttondata-behavior="toggle-rwd-size"data-size="phone-big"class="fsa-btn fsa-btn--plain fsa-p--s fsa-radius--full fsa-color--secondary {% if rwdSize == 'phone-big' %}fsa-bg--secondary-100{% else %}fsa-bg:hover--tertiary-100{% endif %}"type="button"{%ifrwdSize == 'phone-big'%}aria-selected="true"{%endif%}title="Landscape"aria-label="Landscape"><svgstyle="transform: rotate(-90deg);"class="fsa-icon fsa-icon--size-2"aria-hidden="true"focusable="false"role="img"xmlns="http://www.w3.org/2000/svg"viewBox="0 0 24 24"><pathd="M15.5 1h-8C6.12 1 5 2.12 5 3.5v17C5 21.88 6.12 23 7.5 23h8c1.38 0 2.5-1.12 2.5-2.5v-17C18 2.12 16.88 1 15.5 1zm-4 21c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5zm4.5-4H7V4h9v14z"/></svg></button>
1515
<buttondata-behavior="toggle-rwd-size"data-size="tablet"class="fsa-btn fsa-btn--plain fsa-p--s fsa-radius--full fsa-color--secondary {% if rwdSize == 'tablet' %}fsa-bg--secondary-100{% else %}fsa-bg:hover--tertiary-100{% endif %}"type="button"{%ifrwdSize == 'tablet'%}aria-selected="true"{%endif%}title="Tablet"aria-label="Tablet"><svgclass="fsa-icon fsa-icon--size-2"aria-hidden="true"focusable="false"role="img"xmlns="http://www.w3.org/2000/svg"viewBox="0 0 24 24"><pathd="M18.5 0h-14C3.12 0 2 1.12 2 2.5v19C2 22.88 3.12 24 4.5 24h14c1.38 0 2.5-1.12 2.5-2.5v-19C21 1.12 19.88 0 18.5 0zm-7 23c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5zm7.5-4H4V3h15v16z"/></svg></button>

‎_layouts/category.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ <h1 class="ds-page-title__hd-text" id="article-title">{{ page.title }}</h1>
1414
<articleclass="ds-article">
1515

1616
{% if page.intro %}
17-
<pclass="fsa-text--lead">{{ page.intro }}</p>
17+
<pclass="fsa-text--lead fsa-m-t--m">{{ page.intro }}</p>
1818
{% endif %}
1919

2020
{{ content }}

‎_layouts/componentsLanding.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h1 class="ds-page-title__hd-text" id="article-title">{{ page.title }}</h1>
2828
<h2class="sr-only">Overview</h2>
2929

3030
{% if page.intro %}
31-
<pclass="fsa-text--lead">{{ page.intro }}</p>
31+
<pclass="fsa-text--lead fsa-m-t--m">{{ page.intro }}</p>
3232
{% endif %}
3333

3434
{{ content }}

‎_layouts/guide.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h1 class="ds-page-title__hd-text" id="article-title">{{ page.title }}</h1>
2424
</div>
2525

2626
{% if page.intro %}
27-
<pclass="fsa-text--lead">{{ page.intro }}</p>
27+
<pclass="fsa-text--lead fsa-m-t--m">{{ page.intro }}</p>
2828
{% endif %}
2929

3030
{{ content }}

‎_layouts/page.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ <h1 class="ds-page-title__hd-text" id="article-title">
4949
<h2class="sr-only">Overview</h2>
5050

5151
{% if page.intro %}
52-
<pclass="fsa-text--lead">{{ page.intro }}</p>
52+
<pclass="fsa-text--lead fsa-m-t--m">{{ page.intro }}</p>
5353
{% endif %}
5454

5555
{% if page.shortName %}
5656
{% unless page.suppress_kitcken_sink %}
57-
<divclass="fsa-level fsa-level--justify-between fsa-level--align-middle">
57+
<divclass="fsa-level fsa-level--justify-between fsa-level--align-baseline">
5858
<h3class="fsa-m--none">Preview</h3>
5959
<aclass="fsa-btn fsa-btn--secondary fsa-btn--small"href="http://usda-fsa.github.io/fsa-style/#{{ page.shortName }}"target="_blank">View Kitchen Sink</a>
6060
</div>

‎_sass/components/_ds.anatomy.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
& {
44
h2[id] +& {
5-
margin-top:-15px;
5+
margin-top:-$size-default;
66
border-top:0;
77
}
88
}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp