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 greenkeeper/url-search-params-polyfill-5.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
abhiomkar authored Oct 10, 2018
2 parents 6e06678 + 28a8cfe commit a524bdc
Show file tree
Hide file tree
Showing 581 changed files with 22,416 additions and 7,546 deletions.
2 changes: 0 additions & 2 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,4 @@ submitting a pull request*. You can read more about this in our [contributing do

MDC Web is still under active development. You can see our current progress on [master](https://github.com/material-components/material-components-web/tree/master) as well as an overview of our [architecture and practices](https://github.com/material-components/material-components-web/blob/master/docs/code).

If you're interested in information for a specific component, check out our [component issues](https://github.com/material-components/material-components-web/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aopen%20label%3Av2-component) to see which milestone it's associated with and subscribe to updates to it. If an issue has the `in-tracker` label, you can also take a look at our [public Pivotal Tracker](https://www.pivotaltracker.com/n/projects/1664011) for a rough estimate of when we'll get to it.

Our team prioritizes responding to as many engineering and user experience questions as possible. We do not support responses to questions outside of these areas at this time.
2 changes: 1 addition & 1 deletion .htmllintrc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"line-max-len-ignore-regex": "<script|<link|<path|^\\s*<!--\\s*https?://|^\\s*https?://|^\\s*href=\"[^\"]+\"",
"line-no-trailing-whitespace": false,
"raw-ignore-regex": "<!--\\s*htmllint-disable\\s*-->[^]*?<!--\\s*htmllint-enable\\s*-->|<svg[^>]*>[^]*?</svg>",
"tag-bans": ["b"],
"tag-bans": [],
"tag-name-lowercase": true,
"tag-name-match": true,
"title-max-len": false,
Expand Down
17 changes: 12 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ install:
# Noisy output, but useful for debugging npm package dependency version issues:
#- npm ls

after_script:
# Prevent Travis job logs from getting truncated early.
# See https://github.com/travis-ci/travis-ci/issues/6421#issuecomment-238137337
- sleep 5

matrix:
include:

Expand All @@ -32,6 +37,12 @@ matrix:
script:
- if has_testable_files; then npm run lint; else log_untestable_files; fi

- node_js: 8
env:
- TEST_SUITE=build
script:
- if has_testable_files; then npm run build; else log_untestable_files; fi

- node_js: 8
env:
- TEST_SUITE=unit
Expand Down Expand Up @@ -64,9 +75,5 @@ matrix:
# Source the scripts to export their env vars. See https://superuser.com/a/176788/62792
- source scripts/travis-env-vars.sh
- source test/screenshot/infra/commands/travis.sh
install: # Override global settings
- npm install
# Noisy output, but useful for debugging npm package dependency version issues:
#- npm ls
script:
- npm run screenshot:test
- if has_testable_files; then npm run screenshot:test; else log_untestable_files; fi
97 changes: 95 additions & 2 deletions CHANGELOG.md

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
[![Build Status](https://travis-ci.com/material-components/material-components-web.svg?branch=master)](https://travis-ci.com/material-components/material-components-web/)
[![codecov](https://codecov.io/gh/material-components/material-components-web/branch/master/graph/badge.svg)](https://codecov.io/gh/material-components/material-components-web)
[![Chat](https://img.shields.io/discord/259087343246508035.svg)](https://discord.gg/material-components)
[![Screenshots](https://us-central1-material-components-web.cloudfunctions.net/screenshot-shield-svg)](https://us-central1-material-components-web.cloudfunctions.net/screenshot-shield-url)

# Material Components for the web

Expand Down Expand Up @@ -96,10 +97,14 @@ npm install @material/ripple
Then import the ES2015 file for @material/ripple into your application, and initialize an MDCRipple with a DOM element:

```js
import {MDCRipple} from '@material/ripple';
import {MDCRipple} from '@material/ripple/index';
const ripple = new MDCRipple(document.querySelector('.foo-button'));
```

> Note: Import `@material/ripple/index` if you wish to transpile MDC Web's ES2015 sources as part of your build process.
> If your build toolchain is configured to only transpile your own sources, import `@material/ripple` instead, which will
> reference the distributed UMD module instead.
This will produce a Material Design ripple on the button!

<img src="docs/button_with_ripple.png" alt="Button with Ripple" width="90" height="36">
Expand Down
4 changes: 2 additions & 2 deletions app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ skip_files:

handlers:
- url: /
static_files: demos/index.html
upload: demos/index.html
static_files: demos/redirect.html
upload: demos/redirect.html

- url: /assets/(.*)
static_files: build/\1
Expand Down
4 changes: 2 additions & 2 deletions demos/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Demonstrations
# Demonstrations

MDC Web's collection of components. Demonstrated in idiomatic JavaScript/CSS/HTML. A hosted version of this folder can be found [here](http://material-components-web.appspot.com/).
MDC Web's collection of components. Demonstrated in idiomatic JavaScript/CSS/HTML.

## Installation

Expand Down
10 changes: 5 additions & 5 deletions demos/button.html
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,10 @@ <h1 class="mdc-typography--headline3">Ripple Enabled</h1>
</fieldset>

<fieldset>
<legend class="mdc-typography--headline6">Custom button (Experimental)</legend>
<legend class="mdc-typography--headline6">Custom button</legend>
<div>
<button class="mdc-button mdc-button--unelevated big-round-corner-button">
Corner Radius
<button class="mdc-button mdc-button--unelevated big-round-shape-button">
Shape Radius
</button>
<button class="mdc-button mdc-button--outlined thick-outline-button">
Thick Outline Width
Expand Down Expand Up @@ -375,8 +375,8 @@ <h1 class="mdc-typography--headline3">CSS Only</h1>
<fieldset>
<legend class="mdc-typography--headline6">Custom button (Experimental)</legend>
<div>
<button class="mdc-button mdc-button--unelevated big-round-corner-button" data-demo-no-js>
Big Corner Radius
<button class="mdc-button mdc-button--unelevated big-round-shape-button" data-demo-no-js>
Shape Radius
</button>
<button class="mdc-button mdc-button--outlined thick-outline-button" data-demo-no-js>
Thick Outline Width
Expand Down
8 changes: 4 additions & 4 deletions demos/button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions://
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.//
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
Expand Down Expand Up @@ -43,8 +43,8 @@

}

.mdc-button.big-round-corner-button {
@include mdc-button-corner-radius(8px);
.mdc-button.big-round-shape-button {
@include mdc-button-shape-radius(8px);
}

.mdc-button.thick-outline-button {
Expand Down
Loading

0 comments on commit a524bdc

Please sign in to comment.