Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various updates #417

Merged
merged 4 commits into from
Jan 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions docs/_data/icons.json5
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,13 @@
name: 'checkmark-circle',
minver: '0.1.10',
},
{
name: 'clock',
minver: '0.15.0',
keywords: [
'time'
]
},
{
name: 'cog',
minver: '0.1.0',
Expand Down Expand Up @@ -158,9 +165,8 @@
{
name: 'input-time',
minver: '0.1.0',
keywords: [
'clock',
],
deprecated: true,
replacement: 'clock'
},
{
name: 'input-url',
Expand Down
2 changes: 1 addition & 1 deletion docs/_templates/partials/footer_legal.njk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
© 2018 Rackspace US, Inc.
© 2019 Rackspace US, Inc.
<nav>
<a href="https://www.rackspace.com/information/legal/websiteterms">Website Terms</a>
<a href="https://www.rackspace.com/information/legal/privacystatement">Privacy Policy</a>
Expand Down
12 changes: 3 additions & 9 deletions docs/components/typography/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -201,22 +201,16 @@ <h2 id="links">Links</h2>
</hx-alert>
<hx-alert type="warning" status="warning" persist>
Adding the <code>disabled</code> attribute to a link <b>will not</b>
prevent user interaction. Consider using a <code>&lt;button&gt;</code>
instead.
prevent user interaction.
</hx-alert>
<div class="example">
<div>
<a href="#">Normal Link</a>
<br />
<a href="#" class="pseudo-active">Pressed Link</a>
<br />
<a href="#" disabled>"Disabled" Link</a>
<a href="#">Link Text</a>
</div>

<footer>
{% code 'html' %}
<a href="#">Normal Link</a>
<a href="#" disabled>"Disabled" Link</a>
<a href="#">Link Text</a>
{% endcode %}
</footer>
</div>
Expand Down
29 changes: 29 additions & 0 deletions docs/components/typography/test.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,33 @@ <h2>Error Message</h2>
Compressed Markup - No line breaks in composed DOM.
</p>
</section>

<section>
<h2>Link</h2>
<dl class="hxList">
<div>
<dt>Default</dt>
<dd>
<a href="#">Link One</a>
</dd>
</div>
<div>
<dt>Active/Pressed</dt>
<dd>
<a href="#" class="pseudo-active">Link Two</a>
</dd>
</div>
<div>
<dt>"Disabled"</dt>
<dd>
<p>
<a href="#" disabled>Link Three</a> -
<small>
(incorrect semantics) Should <em>not</em> have special styling
</small>
</p>
</dd>
</div>
</dl>
</section>
{% endblock %}
19 changes: 17 additions & 2 deletions docs/elements/hx-tabset/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,25 @@ <h2 id="methods">Methods</h2>

{% block attributes %}
<dl>
<dt>current-tab {Integer=0}</dt>
<dt>current-tab</dt>
<dd>
<p>
Zero-based index of the currently active tab + tabpanel.
Zero-based index of the currently active tab.
</p>
</dd>
</dl>
{% endblock %}

{% block properties %}
<dl class="memberList">
<dt>currentTab {Integer [0]}</dt>
<dd>
<p>
Zero-based index of the currently active tab.
</p>
<p class="hxSubdued hxSubBody">
<hx-icon type="info-circle"></hx-icon>
Reflects the <code>current-tab</code> attribute.
</p>
</dd>
</dl>
Expand Down
3 changes: 3 additions & 0 deletions src/helix-ui/icons/clock.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions src/helix-ui/icons/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import _billing from './billing.svg';
import _calendar from './calendar.svg';
import _checkmark from './checkmark.svg';
import _checkmarkCircle from './checkmark-circle.svg';
import _clock from './clock.svg';
import _cog from './cog.svg';
import _copy from './copy.svg';
import _download from './download.svg';
Expand All @@ -27,7 +28,6 @@ import _globe from './globe.svg';
import _helpCircle from './help-circle.svg';
import _infoCircle from './info-circle.svg';
import _inputFile from './input-file.svg';
import _inputTime from './input-time.svg';
import _kbdArrowDown from './kbd-arrow-down.svg';
import _kbdArrowLeft from './kbd-arrow-left.svg';
import _kbdArrowRight from './kbd-arrow-right.svg';
Expand Down Expand Up @@ -93,6 +93,7 @@ const MAP = {
'calendar': _calendar,
'checkmark': _checkmark,
'checkmark-circle': _checkmarkCircle,
'clock': _clock,
'cog': _cog,
'copy': _copy,
'download': _download,
Expand All @@ -108,7 +109,6 @@ const MAP = {
'help-circle': _helpCircle,
'info-circle': _infoCircle,
'input-file': _inputFile,
'input-time': _inputTime,
'kbd-arrow-down': _kbdArrowDown,
'kbd-arrow-left': _kbdArrowLeft,
'kbd-arrow-right': _kbdArrowRight,
Expand Down Expand Up @@ -165,5 +165,6 @@ MAP['export'] = MAP['upload'];
MAP['input-url'] = MAP['globe'];
MAP['technical-change'] = MAP['server-config'];
MAP['technical-incident'] = MAP['server-incident'];
MAP['input-time'] = MAP['clock'];

export default MAP;
3 changes: 0 additions & 3 deletions src/helix-ui/icons/input-time.svg

This file was deleted.