Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit f8289dc

Browse files
Splaktarjelbourn
authored andcommitted
docs(readme,home): major update to the readme (#11083)
add links to docs home improve clarity of docs home fix AngularJS vs Angular mistake in docs home remove the reference to the "recent" v1 release in docs home
1 parent ef537d5 commit f8289dc

File tree

2 files changed

+72
-59
lines changed

2 files changed

+72
-59
lines changed

README.md

Lines changed: 62 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# Material Design for AngularJS Apps [![Build Status](https://travis-ci.org/angular/material.svg)](https://travis-ci.org/angular/material)
22

3-
[Material Design](https://www.google.com/design/spec/material-design/) is a specification for a
3+
[Material Design](https://material.io/) is a specification for a
44
unified system of visual, motion, and interaction design that adapts across different devices. Our
55
goal is to deliver a lean, lightweight set of AngularJS-native UI elements that implement the
66
material design specification for use in AngularJS single-page applications (SPAs).
77

88
![venn diagram](https://cloud.githubusercontent.com/assets/210413/5077572/30dfc2f0-6e6a-11e4-9723-07c918128f4f.png)
99

10-
AngularJS Material is the reference implementation of Google's Material Design Specification. AngularJS Material includes a rich set of reusable, well-tested, and accessible UI components.
10+
AngularJS Material is an implementation of Google's [Material Design Specification](https://material.io/guidelines/material-design/).
11+
AngularJS Material includes a rich set of reusable, well-tested, and accessible UI components.
1112

1213
Quick Links:
1314

@@ -17,47 +18,48 @@ Quick Links:
1718
* [Installing](#installing)
1819

1920

20-
Please note that using AngularJS Material requires the use of **AngularJS 1.3.x** or higher. AngularJS
21-
Material is targeted for all browsers with browser versions shown below with green boxes:
21+
Please note that using AngularJS Material requires the use of **[AngularJS](https://angularjs.org/) 1.3.x** or higher.
22+
AngularJS Material is targeted for the browser versions shown below in the green boxes:
2223

23-
![ngm1_browser_support](https://cloud.githubusercontent.com/assets/210413/18553899/f3fbfbca-7b27-11e6-81c9-2937950c808e.png)
24+
![ngm1_browser_support](https://user-images.githubusercontent.com/3506071/35176284-1419c42c-fd46-11e7-9381-d93e5c5db39a.png)
2425

25-
## <a name="demos"></a> Online Documentation (and Demos)
26+
## <a name="demos"></a> Online Documentation and Demos
2627

2728
<div style="border: 1px solid #ccc">
28-
<img src="https://cloud.githubusercontent.com/assets/11819543/10056006/4aee3b68-6207-11e5-8497-a0656f85902a.PNG" alt="AngularJS Material docs website" style="display:block;">
29-
</div>
29+
<img src="https://user-images.githubusercontent.com/3506071/35176652-81464d34-fd48-11e7-81d3-ac58d7d10a32.png" alt="AngularJS Material docs website" style="display:block;">
30+
</div><br>
3031

31-
- Visit [Material.AngularJS.org](https://material.angularjs.org/) online to review the API, see the
32-
components in action with live Demos, and study the Layout system.
32+
- Visit [material.angularjs.org](https://material.angularjs.org/) online to review the API, see the
33+
components in action via live demos, and to read our detailed guides which include the layout system,
34+
theming system, typography, and more.
3335
- Or you can build the documentation and demos locally; see
3436
[Build Docs & Demos](https://github.com/angular/material/tree/master/docs/README.md) for details.
3537

3638

3739
## <a name="releasing"></a> Our Release Processes
3840

39-
AngularJS Material has revised/improved its build processes. To preserve stability with applications currently using AngularJS Material, we will have three (3) types of releases:
41+
To preserve stability with applications currently using AngularJS Material, we do not follow semver.
42+
We have three types of releases:
4043

41-
* `major` : major releases will be done as part of the latest iteration of AngularJS Material on a [separate repo](https://github.com/angular/material2). This type of release will not be used within AngularJS Material.
42-
* `minor`: aka `master` contains patch release changes AND breaking changes and new features
43-
* `patch`: non-breaking changes (no API, CSS, UX changes that will cause breaks in existing AngularJS Material applications)
44+
* `major` : major releases will be done in the separate [Angular Material](https://github.com/angular/material2) repo.
45+
This type of release will not be used within AngularJS Material.
46+
* `minor`: contain breaking changes in addition to patch release changes.
47+
* `patch`: non-breaking changes (no API, CSS, UX changes that will cause breaks in existing AngularJS Material applications).
4448

4549
##### Patch Releases
4650

47-
The patch builds (1.0.4, 1.0.5, 1.0.6) are prepared based on commits in the `patch` branch; which contains only non-breaking changes (eg bug fix, some API additions, minimal non-breaking CSS changes ). We will be building `patch` releases every week.
51+
The patch builds (1.1.4, 1.1.5, 1.1.6) are prepared based on commits in the `master` branch; which contains only
52+
non-breaking changes (I.e. bug fixes, new features, API additions, and minimal non-breaking CSS changes).
53+
We are targeting `patch` releases every 2 weeks.
4854

4955
##### Minor Releases
5056

51-
The minor build (1.1.0, 1.2.0, 1.3.0,...) are prepared based on commits in the `master` branch; which will remain the daily development branch AND will be the source for the `minor` releases.
52-
53-
Our formal release of `minor` builds is much less frequent. Developers can easily obtain the latest, full change-set from bower or npm using references to `@master`.
54-
55-
##### Changelog
56-
57-
The Changelog may contain releases for `patch` or `minor`. If you do not see a fix listed in the Changelog but the issue has been resolved or the PR merged, then those changes will be `master` available in the next *minor* release.
58-
59-
> For the purposes of AngularJS Material, you *could* think of the patch releases as being *minor* changes and the 'minor' releases as being *major* changes.
57+
The minor builds (1.1.0, 1.2.0, 1.3.0) can contain breaking changes to CSS, APIs, and UX.
58+
Our formal release of `minor` builds is much less frequent. The release process for `minor` builds is currently
59+
being re-evaluated.
6060

61+
> For the purposes of AngularJS Material, you *could* think of the patch releases as being *minor* changes
62+
and the 'minor' releases as being *major* changes according to semver.
6163

6264
## <a name="contributing"></a> Contributing
6365

@@ -66,7 +68,9 @@ Developers interested in contributing should read the following guidelines:
6668
- [Issue Guidelines](.github/CONTRIBUTING.md#submit)
6769
- [Contributing Guidelines](.github/CONTRIBUTING.md)
6870
- [Coding Guidelines](docs/guides/CODING.md)
69-
- [ChangeLog](CHANGELOG.md)
71+
- [Pull Request Guide](docs/guides/PULL_REQUESTS.md)
72+
- [Software Process](docs/guides/COMMIT_LEVELS.md)
73+
- [Change Log](CHANGELOG.md)
7074

7175
> Please do **not** ask general questions in an issue. Issues are only to report bugs, request
7276
enhancements, or request new features. For general questions and discussions, use the
@@ -81,18 +85,12 @@ itemize all:
8185

8286
## <a name="building"></a> Building
8387

84-
Developers can easily build AngularJS Material using NPM and gulp.
88+
Developers can build AngularJS Material using NPM and gulp.
8589

86-
* [Builds - Under the Hood](docs/guides/BUILD.md)
87-
88-
First install or update your local project's **npm** tools:
90+
First install or update your local project's **npm** dependencies:
8991

9092
```bash
91-
# First install all the NPM tools:
9293
npm install
93-
94-
# Or update
95-
npm update
9694
```
9795

9896
Then run the **gulp** tasks:
@@ -105,34 +103,45 @@ gulp build
105103
gulp docs
106104
```
107105

106+
For development, use the `docs:watch` **NPM** script to run in dev mode:
107+
108+
```bash
109+
# To build the AngularJS Material Source, Docs, and Demos in watch mode
110+
npm run docs:watch
111+
```
112+
108113
For more details on how the build process works and additional commands (available for testing and
109-
debugging) developers should read the [Build Instructions](docs/guides/BUILD.md).
114+
debugging) developers should read the [Build Guide](docs/guides/BUILD.md).
110115

111116
## <a name="installing"></a> Installing Build (Distribution Files)
112117

113-
#### Bower
118+
#### NPM
114119

115-
For developers not interested in building the AngularJS Material library... use **bower** to install
120+
For developers not interested in building the AngularJS Material library... use **NPM** to install
116121
and use the AngularJS Material distribution files.
117122

118123
Change to your project's root directory.
119124

120125
```bash
121126
# To get the latest stable version, use Bower from the command line.
122-
bower install angular-material
127+
npm install angular-material --save
123128

124129
# To get the most recent, latest committed-to-master version use:
125-
bower install angular-material#master
130+
npm install http://github.com/angular/bower-material#master --save
126131
```
127132

133+
#### Other Dependency Managers
134+
128135
Visit [Bower-Material](https://github.com/angular/bower-material/blob/master/README.md) for more
129136
details on how to install and use the AngularJS Material distribution files within your own local
130137
project.
131138

139+
This includes instructions for [Bower](https://github.com/angular/bower-material#bower)
140+
and [JSPM](https://github.com/angular/bower-material#jspm).
141+
132142
#### CDN
133143

134-
CDN versions of AngularJS Material are now available at
135-
[Google Hosted Libraries](https://developers.google.com/speed/libraries/#angular-material).
144+
CDN versions of AngularJS Material are now available.
136145

137146
With the Google CDN, you will not need to download local copies of the distribution files. Instead
138147
simply reference the CDN urls to easily use those remote library files. This is especially useful
@@ -142,20 +151,20 @@ when using online tools such as [CodePen](http://codepen.io/), [Plunkr](http://p
142151
```html
143152
<head>
144153

145-
<!-- AngularJS Material CSS now available via Google CDN; version 1.1.4 used here -->
146-
<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/angular_material/1.1.4/angular-material.min.css">
154+
<!-- AngularJS Material CSS now available via Google CDN; version 1.1.6 used here -->
155+
<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/angular_material/1.1.6/angular-material.min.css">
147156

148157
</head>
149158
<body>
150159

151160
<!-- AngularJS Material Dependencies -->
152-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.11/angular.min.js"></script>
153-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.11/angular-animate.min.js"></script>
154-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.11/angular-aria.min.js"></script>
155-
161+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.7/angular.min.js"></script>
162+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.7/angular-animate.min.js"></script>
163+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.7/angular-aria.min.js"></script>
164+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.7/angular-messages.min.js"></script>
156165

157166
<!-- AngularJS Material Javascript now available via Google CDN; version 1.1.4 used here -->
158-
<script src="https://ajax.googleapis.com/ajax/libs/angular_material/1.1.4/angular-material.min.js"></script>
167+
<script src="https://ajax.googleapis.com/ajax/libs/angular_material/1.1.6/angular-material.min.js"></script>
159168
</body>
160169
```
161170

@@ -173,19 +182,20 @@ pull directly from the distribution GitHub
173182
<body>
174183

175184
<!-- AngularJS Material Dependencies -->
176-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.11/angular.js"></script>
177-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.11/angular-animate.js"></script>
178-
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.11/angular-aria.js"></script>
185+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.7/angular.js"></script>
186+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.7/angular-animate.js"></script>
187+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.7/angular-aria.js"></script>
188+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.7/angular-messages.min.js"></script>
179189

180190
<!-- AngularJS Material Javascript using GitCDN to load directly from `bower-material/master` -->
181191
<script src="https://gitcdn.link/repo/angular/bower-material/master/angular-material.js"></script>
182192

183193
</body>
184194
```
185195

186-
Once you have all the necessary assets installed, add `ngMaterial` as a dependency for your app:
196+
Once you have all the necessary assets installed, add `ngMaterial` and `ngMessages` as dependencies for your app:
187197

188198
```javascript
189-
angular.module('myApp', ['ngMaterial']);
199+
angular.module('myApp', ['ngMaterial', 'ngMessages']);
190200
```
191201

docs/app/partials/home.tmpl.html

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<h2 class="md-headline" style="margin-top: 0;">What is AngularJS Material?</h2>
44
<p>
55
AngularJS Material is both a UI Component framework and a reference implementation of Google's
6-
Material Design Specification. This project provides a set of reusable, well-tested, and
7-
accessible UI components based on Material Design.
6+
<a href="https://material.io/guidelines/material-design/" target="_blank" rel="noopener">Material Design Specification</a>.
7+
This project provides a set of reusable, well-tested, and accessible UI components based on Material Design.
88
</p>
99
<ul class="buckets" layout layout-align="center center" layout-wrap>
1010
<li flex="50" flex-gt-md="25" ng-repeat="(index, link) in [
@@ -25,14 +25,17 @@ <h2 class="md-headline" style="margin-top: 0;">What is AngularJS Material?</h2>
2525
</ul>
2626

2727
<br/>
28-
<h2 class="md-headline">What about Angular?</h2>
28+
<h2 class="md-headline">AngularJS versus Angular?</h2>
2929
<p>
30-
AngularJS Material recently released Version 1 which we consider to be stable and ready for
31-
production use. Developers should note that AngularJS Material works only with AngularJS 1.x.
30+
The AngularJS Material library is a mature and stable product that is ready for production use.
31+
Developers should note that AngularJS Material works only with
32+
<a href="https://angularjs.org/" target="_blank" rel="noopener">AngularJS 1.x</a>.
3233
</p>
3334
<ul>
34-
<li>Current AngularJS Material development efforts are focused on bug fixes and minor improvements.</li>
35-
<li>AngularJS Material development is also in-progress at the <a href="https://github.com/angular/material2">angular/material2</a> GitHub repository.</li>
35+
<li>Current AngularJS Material development efforts are focused on bug fixes, accessibility, and minor improvements.</li>
36+
<li>The Angular Material library (for Angular v2+) can be found in the
37+
<a href="https://github.com/angular/material2">angular/material2</a> GitHub repository.
38+
</li>
3639
</ul>
3740
<p>
3841
Please refer to our changelog for up-to-date listings of all v1.x improvements and breaking changes.

0 commit comments

Comments
 (0)