Skip to content

Commit

Permalink
docs: fix package paths (#3966)
Browse files Browse the repository at this point in the history
  • Loading branch information
devversion authored and jelbourn committed Apr 8, 2017
1 parent 449b882 commit b1e5ff6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ imports only the set of components actually used in the application.
* Angular Material now depends on Angular 4.
* Now that animations have been refactored into a separate package, users of `@angular/material`
need to explicitly import `BrowserAnimationsModule` (or `NoopAnimationsModule`) from
`@angular/package-browser/animations` as well as installing `@angular/animations`.
`@angular/platform-browser/animations` as well as installing `@angular/animations`.



Expand Down
2 changes: 1 addition & 1 deletion guides/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Including a theme is **required** to apply all of the core and theme styles to y
To get started with a prebuilt theme, include the following in your app's index.html:

```html
<link href="node_modules/@angular/material/core/theming/prebuilt/indigo-pink.css" rel="stylesheet">
<link href="node_modules/@angular/material/prebuilt-themes/indigo-pink.css" rel="stylesheet">
```

Note that your app's project structure may have a different relative location for your node_modules.
Expand Down
9 changes: 5 additions & 4 deletions guides/theming-your-components.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ All you need is to create a `@mixin` function in the custom-component-theme.scss

```scss
// Import all the tools needed to customize the theme and extract parts of it
@import '~@angular/material/core/theming/all-theme';
@import '~@angular/material/theming';

// Define a mixin that accepts a theme and outputs the color styles for the component.
@mixin candy-carousel-theme($theme) {
Expand All @@ -33,7 +33,7 @@ Now you just have to call the `@mixin` function to apply the theme:

```scss
// Import a pre-built theme
@import '~@angular/material/core/theming/prebuilt/deeppurple-amber';
@import '~@angular/material/prebuilt-themes/deeppurple-amber.css';
// Import your custom input theme file so you can call the custom-input-theme function
@import 'app/candy-carousel/candy-carousel-theme.scss';

Expand All @@ -53,11 +53,12 @@ Styles that are affected by the theme should be placed in a separated theming fi


## Using colors from a palette
You can consume the theming functions from the `@angular/material/core/theming/theming` and Material palette vars from `@angular/material/core/theming/palette`. You can use the `mat-color` function to extract a specific color from a palette. For example:
You can consume the theming functions and Material palette variables from `@angular/material/theming`.
You can use the `mat-color` function to extract a specific color from a palette. For example:

```scss
// Import theming functions
@import '~@angular/material/core/theming/theming';
@import '~@angular/material/theming';
// Import your custom theme
@import 'src/unicorn-app-theme.scss';

Expand Down

0 comments on commit b1e5ff6

Please sign in to comment.