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

Commit

Permalink
Merge remote-tracking branch 'origin/master' into fix/card-on-surface
Browse files Browse the repository at this point in the history
  • Loading branch information
Kenneth G. Franqueiro committed Mar 25, 2019
2 parents ab4d342 + a8a6660 commit 79bb8a4
Show file tree
Hide file tree
Showing 35 changed files with 1,653 additions and 957 deletions.
7 changes: 2 additions & 5 deletions demos/tab-bar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,8 @@
@include mdc-tab-text-label-color($material-color-blue-600);
@include mdc-tab-icon-color($material-color-blue-600);
@include mdc-tab-states-color($material-color-yellow-700);
}

.mdc-tab--active {
@include mdc-tab-text-label-color($material-color-blue-900);
@include mdc-tab-icon-color($material-color-blue-900);
@include mdc-tab-active-text-label-color($material-color-blue-900);
@include mdc-tab-active-icon-color($material-color-blue-900);
}

.mdc-tab-indicator {
Expand Down
2 changes: 1 addition & 1 deletion docs/open_source/release-process.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ This will pull the latest tags and `master` commits into your local repository.
Run the following script to automatically cherry-pick new bugfixes on top of the last release:

```
node scripts/cherry-pick-patch-commits
node scripts/cherry-pick-commits --patch
```

> Note: After running the script, you are in a detached HEAD state. You can create a temporary local branch if desired,
Expand Down
6 changes: 4 additions & 2 deletions packages/material-components-web/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,12 @@ import { checkbox } from 'material-components-web';
const checkbox = new checkbox.MDCCheckbox(document.querySelector('.mdc-checkbox'));
```

> See [Importing the JS component](../../docs/importing-js.md) for more information on how to import JavaScript.
> NOTE: Since switch is a reserved word in JS, switch is instead named `switchControl`.
> NOTE: Built CSS files as well as UMD JS bundles will be available as part of the package
> post-alpha.
> NOTE: Built CSS files as well as UMD JS bundles will be available as part of the package.

### Auto-initialization of components

Expand Down
Loading

0 comments on commit 79bb8a4

Please sign in to comment.