Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Commit

Permalink
Merge branch 'master' into fix/text-field/match-spec
Browse files Browse the repository at this point in the history
  • Loading branch information
williamernest authored Aug 24, 2018
2 parents 7be735f + a9bd102 commit 3eff892
Show file tree
Hide file tree
Showing 15 changed files with 148 additions and 807 deletions.
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
language: node_js

# Opt-in to Travis's container infrastructure. This potentially makes builds less flaky, and easier to debug.
# - https://docs.travis-ci.com/user/reference/trusty/#container-based-with-sudo-false
# - https://docs.travis-ci.com/user/common-build-problems/#troubleshooting-locally-in-a-docker-image
# - https://blog.travis-ci.com/2014-12-17-faster-builds-with-container-based-infrastructure/#what-benefits-does-this-new-infrastructure-have
sudo: false

branches:
# Only run Travis on:
# A) Commits made directly to the `master` branch (i.e., merged PRs); and
Expand Down
6 changes: 3 additions & 3 deletions demos/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -222,11 +222,11 @@
</span>
</a>

<a href="tabs.html" role="listitem" class="mdc-list-item">
<a href="tab-bar.html" role="listitem" class="mdc-list-item">
<span class="demo-catalog-list-icon mdc-list-item__graphic"><img src="/images/ic_tabs_24px.svg" /></span>
<span class="mdc-list-item__text">
<span class="mdc-list-item__primary-text">Tabs</span>
<span class="mdc-list-item__secondary-text">Tabs with support for icon and text labels</span>
<span class="mdc-list-item__primary-text">Tab Bar</span>
<span class="mdc-list-item__secondary-text">The Tab packages include support for icon and text labels, native scrolling, and indicator customization</span>
</span>
</a>

Expand Down
Loading

0 comments on commit 3eff892

Please sign in to comment.