Skip to content

Commit

Permalink
Merge branch 'angular:main' into my-fix-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
DBowen33 authored Jun 17, 2024
2 parents a2a3425 + 004a943 commit 94de6d1
Show file tree
Hide file tree
Showing 284 changed files with 10,416 additions and 11,147 deletions.
32 changes: 32 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,35 @@
<a name="18.1.0-next.2"></a>
# 18.1.0-next.2 "ivory-infinity" (2024-06-12)
### cdk
| Commit | Type | Description |
| -- | -- | -- |
| [0bc6583892](https://github.com/angular/components/commit/0bc65838926e88723bfc677fc3e4de81826cfe5b) | feat | **drag-drop:** add mixed orientation support |
### material
| Commit | Type | Description |
| -- | -- | -- |
| [6f698fa4e2](https://github.com/angular/components/commit/6f698fa4e24ef4637b2c83f43cb608df967a78b5) | feat | **core:** add option to configure prefix of system variables ([#29139](https://github.com/angular/components/pull/29139)) |
| [e7312037f7](https://github.com/angular/components/commit/e7312037f75dad5482b06868542ec2a715c116fc) | fix | **dialog:** Make autofocus work with animations disabled ([#29195](https://github.com/angular/components/pull/29195)) |
| [3b32d0e7c9](https://github.com/angular/components/commit/3b32d0e7c95b358d30f8b7e6b0570ab8ba815a06) | fix | **dialog:** Make focus behavior consistent across zoneful/zoneless apps ([#29192](https://github.com/angular/components/pull/29192)) |
| [566057b8f5](https://github.com/angular/components/commit/566057b8f58fab1b5328cbd4336b7b19ea412fd3) | fix | **divider:** non-text color contrast issues ([#28995](https://github.com/angular/components/pull/28995)) |
| [e3abc65d7d](https://github.com/angular/components/commit/e3abc65d7d191f2adf1c294bdb84f532d4eac05c) | fix | **radio:** mark radio-group for check on touch ([#29203](https://github.com/angular/components/pull/29203)) |
| [3da43230e6](https://github.com/angular/components/commit/3da43230e62c8983af5c21c4c1fc66ea2e5e7d52) | fix | **schematics:** estimate missing hues in M3 schematic ([#29231](https://github.com/angular/components/pull/29231)) |
| [d717de5150](https://github.com/angular/components/commit/d717de51501e04a0410217c07fc31929ff2e983a) | fix | **snack-bar:** fix overrides mixin name typo ([#29180](https://github.com/angular/components/pull/29180)) |

<!-- CHANGELOG SPLIT MARKER -->

<a name="18.0.3"></a>
# 18.0.3 "gossamer-glacier" (2024-06-12)
### material
| Commit | Type | Description |
| -- | -- | -- |
| [f6b993fdb7](https://github.com/angular/components/commit/f6b993fdb7fbdcfbe0297d320a5961097002308d) | fix | **dialog:** Make autofocus work with animations disabled ([#29195](https://github.com/angular/components/pull/29195)) |
| [6dd1689b51](https://github.com/angular/components/commit/6dd1689b519abf287098d30f7698fc37197e3db0) | fix | **dialog:** Make focus behavior consistent across zoneful/zoneless apps ([#29192](https://github.com/angular/components/pull/29192)) |
| [81d4527f91](https://github.com/angular/components/commit/81d4527f9130605f69dea31a092a60261bde25db) | fix | **radio:** mark radio-group for check on touch ([#29203](https://github.com/angular/components/pull/29203)) |
| [0f4d1862d3](https://github.com/angular/components/commit/0f4d1862d30366978176a4a87b7799915d3caedd) | fix | **schematics:** estimate missing hues in M3 schematic ([#29231](https://github.com/angular/components/pull/29231)) |
| [faf348438d](https://github.com/angular/components/commit/faf348438d57db80e8ac5187ffe3900fe398fe77) | fix | **snack-bar:** fix overrides mixin name typo ([#29180](https://github.com/angular/components/pull/29180)) |

<!-- CHANGELOG SPLIT MARKER -->

<a name="18.1.0-next.1"></a>
# 18.1.0-next.1 "velvet-violoncello" (2024-06-05)
### cdk
Expand Down
2 changes: 1 addition & 1 deletion guides/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ determine which features to include:

1. Choose a prebuilt theme name, or "custom" for a custom theme:

You can choose from [prebuilt material design themes](https://material.angular.io/guide/theming#using-a-pre-built-theme) or set up an extensible [custom theme](https://material.angular.io/guide/theming#defining-a-theme).
You can choose from [prebuilt material design themes](https://material.angular.io/guide/theming#pre-built-themes) or set up an extensible [custom theme](https://material.angular.io/guide/theming#defining-a-theme).

2. Set up global Angular Material typography styles:

Expand Down
2 changes: 1 addition & 1 deletion guides/schematics.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The Angular Material `ng add` schematic helps you set up an Angular CLI project

- Ensure [project dependencies](./getting-started#step-1-install-angular-material-angular-cdk-and-angular-animations) are placed in `package.json`
- Enable the [BrowserAnimationsModule](./getting-started#step-2-configure-animations) in your app module
- Add either a [prebuilt theme](./theming#using-a-pre-built-theme) or a [custom theme](./theming#defining-a-custom-theme)
- Add either a [prebuilt theme](./theming#pre-built-themes) or a [custom theme](./theming#defining-a-custom-theme)
- Add Roboto fonts to your `index.html`
- Add the [Material Icon font](./getting-started#step-6-optional-add-material-icons) to your `index.html`
- Add global styles to
Expand Down
24 changes: 22 additions & 2 deletions guides/theming.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,28 @@ more about these terms):

##### Pre-built themes

There are a number of color palettes available in `@angular/material` that can be
used with the `primary` and `tertiary` options:
Angular Material includes several pre-built theme CSS files, each with different palettes selected.
You can use one of these pre-built themes if you don't want to define a custom theme with Sass.

| Theme | Light or dark? | Specification |
|------------------------|----------------|----------------------------------|
| `azure-blue.css` | Light | Material Design 3 |
| `rose-red.css` | Light | Material Design 3 |
| `cyan-orange.css` | Dark | Material Design 3 |
| `magenta-violet.css` | Dark | Material Design 3 |
| `deeppurple-amber.css` | Light | Material Design 2 |
| `indigo-pink.css` | Light | Material Design 2 |
| `pink-bluegrey.css` | Dark | Material Design 2 |
| `purple-green.css` | Dark | Material Design 2 |

These files include the CSS for every component in the library. To include only the CSS for a subset
of components, you must use the Sass API detailed in [Defining a theme](#defining-a-theme) above.
You can [reference the source code for these pre-built themes](https://github.com/angular/components/blob/main/src/material/core/theming/prebuilt) to see examples of complete theme definitions.

##### Pre-defined palettes

The pre-built themes are based on a set of pre-defined palettes that can be used with the `primary`
and `tertiary` options:

- `$red-palette`
- `$green-palette`
Expand Down
Loading

0 comments on commit 94de6d1

Please sign in to comment.