Skip to content

Commit f87247f

Browse files
authored
Merge pull request #337 from rackerlabs/docs-to-master
chore(git): sync 'docs' and 'master'
2 parents f34d9ab + d1fc3bf commit f87247f

File tree

3 files changed

+22
-4
lines changed

3 files changed

+22
-4
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Developer Setup
44

5-
0. [install yarn](https://yarnpkg.com/en/docs/install)
6-
0. [install test dependencies](https://github.com/rackerlabs/helix-ui/wiki/Testing#system-requirements)
7-
0. `yarn install` to install project dependencies
8-
0. `yarn start` to begin working
5+
1. [install yarn](https://yarnpkg.com/en/docs/install)
6+
2. [install test dependencies](https://github.com/rackerlabs/helix-ui/wiki/Testing#system-requirements)
7+
3. `yarn install` to install project dependencies
8+
4. `yarn start` to begin working

docs/guides/getting-started/index.html

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,16 @@ <h2 id="step-2">Step 2: Install Polyfills</h2>
9797
</li>
9898
<li>Proceed to "Step 3: Choose a Layout".</li>
9999
</ol>
100+
<p class="hxSubBody hxSubdued">
101+
<hx-icon type="info-circle"></hx-icon>
102+
Version 2.x (or later) is recommended, because it is more efficient
103+
in loading required polyfill bundles.
104+
</p>
100105
<hx-tabset class="beta-hxBound">
101106
<hx-tablist>
102107
<hx-tab>NPM</hx-tab>
103108
<hx-tab>Download</hx-tab>
109+
<hx-tab>unpkg</hx-tab>
104110
</hx-tablist>
105111
<hx-tabcontent>
106112
<hx-tabpanel class="hxBox-xl">
@@ -132,6 +138,17 @@ <h2 id="step-2">Step 2: Install Polyfills</h2>
132138
</a>.
133139
</p>
134140
</hx-tabpanel>
141+
<hx-tabpanel class="hxBox-xl">
142+
<p>
143+
Alternatively, you can load the polyfills directly from
144+
<a href="https://unpkg.com">unpkg.com</a> via the following URLs.
145+
</p>
146+
147+
<ul>
148+
<li><code>https://unpkg.com/@webcomponents/webcomponentsjs@2/webcomponents-loader.js</code></li>
149+
<li><code>https://unpkg.com/@webcomponents/webcomponentsjs@2/custom-elements-es5-adapter.js</code></li>
150+
</ul>
151+
</hx-tabpanel>
135152
</hx-tabcontent>
136153
</hx-tabset>
137154
<p class="hxSubdued hxSubBody">

src/helix-ui/styles/elements/hx-tabcontent.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ hx-tabcontent {
33
border-color: @gray-300 transparent;
44
border-style: solid;
55
border-width: 1px;
6+
flex-basis: 0px;
67
flex-shrink: 0;
78
min-height: 14rem; // 224px
89
overflow: hidden;

0 commit comments

Comments
 (0)