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 feat/textfield-disabled-mixins
Browse files Browse the repository at this point in the history
  • Loading branch information
allan-chen committed Nov 8, 2019
2 parents af9b650 + 5850080 commit 997bd8b
Show file tree
Hide file tree
Showing 17 changed files with 280 additions and 118 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/release-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@ jobs:
release-canary:
runs-on: ubuntu-latest
steps:
- name: Clone repository
uses: actions/checkout@v1.0.0
- name: Checkout master branch
uses: actions/checkout@v1
with:
ref: master
fetch-depth: 1
# GITHUB_REF:11 gets `refs/heads/master` => `master`.
# See https://github.com/actions/checkout/issues/6
run: |
git checkout "${GITHUB_REF:11}"
git pull
- name: Setup node
uses: actions/setup-node@v1
with:
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/release-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,14 @@ jobs:
release-pull-request:
runs-on: ubuntu-latest
steps:
- name: Clone repository
uses: actions/checkout@v1.0.0
- name: Checkout master branch
uses: actions/checkout@v1
with:
ref: master
fetch-depth: 1
# GITHUB_REF:11 gets `refs/heads/master` => `master`.
# See https://github.com/actions/checkout/issues/6
run: |
git checkout "${GITHUB_REF:11}"
git pull
- name: Setup node
uses: actions/setup-node@v1
with:
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,14 @@ jobs:
release:
runs-on: ubuntu-latest
steps:
- name: Clone repository
uses: actions/checkout@v1.0.0
- name: Checkout master branch
uses: actions/checkout@v1
with:
ref: master
# GITHUB_REF:11 gets `refs/heads/master` => `master`.
# See https://github.com/actions/checkout/issues/6
run: |
git checkout "${GITHUB_REF:11}"
git pull
- name: Setup node
uses: actions/setup-node@v1
with:
Expand Down
55 changes: 29 additions & 26 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,40 +97,43 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
* **text-field:** Removed sass variable in notched outline - `$mdc-notched-outline-transition-duration`.
* **mdc-fab:** This changes the structure of the FAB element by moving the ripple from the outer element to an inner mdc-fab__ripple element.

OLD
OLD

```html
<button class="mdc-fab" aria-label="Favorite">
<span class="mdc-fab__icon material-icons">favorite</span>
</button>
```
```html
<button class="mdc-fab" aria-label="Favorite">
<span class="mdc-fab__icon material-icons">favorite</span>
</button>
```

NEW
NEW

```html
<button class="mdc-fab" aria-label="Favorite">
<div class="mdc-fab__ripple"></div>
<span class="mdc-fab__icon material-icons">favorite</span>
</button>
```

```html
<button class="mdc-fab" aria-label="Favorite">
<div class="mdc-fab__ripple"></div>
<span class="mdc-fab__icon material-icons">favorite</span>
</button>
```
* **radio:** Ripple has been moved to a child element. See readme for updates.
* **slider:** remove adapter methods `appendTrackMarkers`, `removeTrackMarkers `, `setLastTrackMarkersStyleProperty `, and add adapter method `setTrackMarkers`.
* **button:** This changes the structure of the button element by moving the ripple from the outer <button> element to an inner `mdc-button__ripple` element.

OLD
```
<button class="mdc-button">
<span class="mdc-button__label">Hello World</span>
</button>
```
OLD

NEW
```
<button class="mdc-button">
<div class="mdc-button__ripple"></div>
<span class="mdc-button__label">Hello World</span>
</button>
```
```html
<button class="mdc-button">
<span class="mdc-button__label">Hello World</span>
</button>
```

NEW

```html
<button class="mdc-button">
<div class="mdc-button__ripple"></div>
<span class="mdc-button__label">Hello World</span>
</button>
```
* **chips:** MDCChipSetAdapter#removeChip has been replaced with MDCChipSetAdapter#removeChipAtIndex. MDCChipSetAdapter#setSelected has been replaced with MDCChipSetAdapter#selectChipAtIndex
* **density:** Renamed sass mixins & variables in MDC Data Table - `mdc-data-table-header-row-height` => `mdc-data-table-header-cell-height` & `mdc-data-table-row-height` => `mdc-data-table-cell-height`. Also removed `mdc-button--dense` variant, use button's density mixin instead.

Expand Down
12 changes: 8 additions & 4 deletions packages/mdc-button/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,14 +194,18 @@ These mixins will override the color of the container, ink, outline or ripple. I

Mixin | Description
--- | ---
`mdc-button-container-fill-color($color)` | Sets the container fill color to the given color.
`mdc-button-icon-color($color)` | Sets the icon color to the given color.
`mdc-button-ink-color($color)` | Sets the ink color to the given color, and sets the icon color to the given color unless `mdc-button-icon-color` is also used.
`mdc-button-container-fill-color($color)` | Sets the container fill color to the given color for an enabled button.
`mdc-button-disabled-container-fill-color($color)` | Sets the container fill color to the given color for a disabled button.
`mdc-button-icon-color($color)` | Sets the icon color to the given color for an enabled button.
`mdc-button-disabled-icon-color($color)` | Sets the icon color to the given color for a disabled button.
`mdc-button-ink-color($color)` | Sets the ink color to the given color for an enabled button, and sets the icon color to the given color unless `mdc-button-icon-color` is also used.
`mdc-button-disabled-ink-color($color)` | Sets the ink color to the given color for a disabled button, and sets the icon color to the given color unless `mdc-button-icon-color` is also used.
`mdc-button-density($density-scale)` | Sets density scale for button. Supported density scale values (`-3`, `-2`, `-1`, `0`).
`mdc-button-height($height)` | Sets custom height of button.
`mdc-button-shape-radius($radius, $density-scale, $rtl-reflexive)` | Sets rounded shape to button with given radius size. `$density-scale` is only required when `$radius` value is in percentage unit, defaults to `$mdc-button-density-default-scale`. Set `$rtl-reflexive` to true to flip radius values in RTL context, defaults to false.
`mdc-button-horizontal-padding($padding)` | Sets horizontal padding to the given number.
`mdc-button-outline-color($color)` | Sets the outline color to the given color.
`mdc-button-outline-color($color)` | Sets the outline color to the given color for an enabled button.
`mdc-button-disabled-outline-color($color)` | Sets the outline color to the given color for a disabled button.
`mdc-button-outline-width($width, $padding)` | Sets the outline width to the given number (defaults to 2px) and adjusts padding accordingly. `$padding` is only required in cases where `mdc-button-horizontal-padding` is also included with a custom value.

##### Caveat: Edge and CSS Custom Properties
Expand Down
Loading

0 comments on commit 997bd8b

Please sign in to comment.