Skip to content

Commit e1237a9

Browse files
author
Ryan A. Johnson
committed
chore(merge): sync with master
2 parents d4e859d + 2b12f2f commit e1237a9

File tree

89 files changed

+2112
-1762
lines changed

Some content is hidden

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

89 files changed

+2112
-1762
lines changed

.editorconfig

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# top-most EditorConfig file
2+
root = true
3+
4+
# (defaults) applies to all files
5+
[*]
6+
charset = utf-8
7+
end_of_line = lf
8+
indent_size = 2
9+
indent_style = space
10+
insert_final_newline = true
11+
trim_trailing_whitespace = true
12+
13+
# JavaScript Overrides
14+
[*.{js,mjs}]
15+
indent_size = 4
16+
17+
# TypeScript Overrides
18+
[*.{ts}]
19+
indent_size = 4

.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ test/*
88

99
# files
1010
_config.*
11+
12+
# spec files
13+
src/**/*.spec.js

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,8 @@ public/
1212
dist/
1313

1414
# Private credentials/config
15-
_config.private.js
15+
_config.private.js
16+
17+
# Removing Coverage Reports folder created.
18+
coverage
19+
.nyc_output

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@ before_script:
2222
- yarn serve > /dev/null 2>&1 &
2323
- while ! curl --silent http://localhost:3000 > /dev/null 2>&1; do sleep 1; done
2424
script:
25+
# - yarn test:coverage
2526
- yarn lint
2627
- yarn test

docs/_data/polyfilled-apis.json5

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{
2121
name: 'Element.attachShadow()',
2222
mdn: 'API/Element/attachShadow',
23-
missing: ['firefox', 'edge', 'ie'],
23+
missing: ['edge', 'ie'],
2424
polyfill: 'webcomponentsjs',
2525
},
2626
{
@@ -32,7 +32,7 @@
3232
{
3333
name: 'Element.shadowRoot',
3434
mdn: 'API/Element/shadowRoot',
35-
missing: ['firefox', 'edge', 'ie'],
35+
missing: ['edge', 'ie'],
3636
polyfill: 'webcomponentsjs',
3737
},
3838
{
@@ -68,7 +68,7 @@
6868
{
6969
name: 'Window.customElements',
7070
mdn: 'API/Window/customElements',
71-
missing: ['firefox', 'edge', 'ie'],
71+
missing: ['edge', 'ie'],
7272
polyfill: 'webcomponentsjs',
7373
},
7474
]

docs/_templates/component.njk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
{% if page.also %}
2222
<a href="#see-also">See Also</a>
2323
{% endif %}
24-
<hr />
24+
<hr class="hxDivider" />
2525
<a class="top-link" href="#top">Back to Top</a>
2626
</nav>
2727
</aside>

docs/_templates/element.njk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
{% if page.also %}
5858
<a href="#see-also">See Also</a>
5959
{% endif %}
60-
<hr />
60+
<hr class="hxDivider" />
6161
<a class="top-link" href="#top">Back to Top</a>
6262
</nav>
6363
</aside>

docs/_templates/partials/see-also.njk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<section>
22
<h2 id="see-also">See Also</h2>
3-
<ul>
3+
<ul class="hxList">
44
{% for href,label in page.also %}
55
<li><a href="{{href}}">{{label}}</a></li>
66
{% endfor %}

docs/_templates/partials/sidebar.njk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
{% if page.also %}
55
<a href="#see-also">See Also</a>
66
{% endif %}
7-
<hr />
7+
<hr class="hxDivider" />
88
<a class="top-link" href="#top">Back to Top</a>
99
</nav>

docs/components/box/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h2 id="containers">Containers</h2>
2020
<p>
2121
Containers can be defined in one of two ways:
2222
</p>
23-
<ol>
23+
<ol class="hxList">
2424
<li>Using an <code>&lt;hx-div&gt;</code> element <em class="hxSubBody">(recommended)</em></li>
2525
<li>Adding the <code>.hxBox</code> CSS class to any block element</li>
2626
</ol>

0 commit comments

Comments
 (0)