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

Commit

Permalink
style(branding): branding consistency fixup
Browse files Browse the repository at this point in the history
fixes #10304
  • Loading branch information
EladBezalel committed Jan 27, 2017
1 parent 2c9a5cc commit 6fa8067
Show file tree
Hide file tree
Showing 73 changed files with 278 additions and 261 deletions.
24 changes: 12 additions & 12 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contributing to Angular Material
# Contributing to AngularJS Material

- [Code of Conduct](#coc)
- [Signing the CLA](#cla)<br/><br/>
Expand All @@ -9,16 +9,16 @@
- [Submission Guidelines](#submit)

## <a name="coc"></a> Code of Conduct
Help us keep Angular open and inclusive.
Help us keep AngularJS open and inclusive.

Please read and follow our
[Code of Conduct](https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md).

<br/>
## <a name="question"></a> Have a Question, Problem, or Idea?

If you have questions or ideas regarding Angular Material, please direct these to the
[Angular Material Forum](https://groups.google.com/forum/#!forum/ngmaterial).
If you have questions or ideas regarding AngularJS Material, please direct these to the
[AngularJS Material Forum](https://groups.google.com/forum/#!forum/ngmaterial).

Otherwise, do you:

Expand All @@ -44,7 +44,7 @@ You can request a new feature by
implement a new feature then consider what kind of change it is:

* **Major Changes** that you wish to contribute to the project should be discussed first on our
[Angular Material Forum](https://groups.google.com/forum/#!forum/ngmaterial), so that we can better
[AngularJS Material Forum](https://groups.google.com/forum/#!forum/ngmaterial), so that we can better
coordinate our efforts, prevent duplication of work, and help you to craft the change so that it is
successfully accepted into the project.
* **Small Changes** can be crafted and submitted to the
Expand Down Expand Up @@ -80,12 +80,12 @@ quickly:

* **Overview of the Issue** - if an error is being thrown, a non-minified stack trace helps.

* **Angular Material Version** - check the header of your `angular-material.js` file to determine
* **AngularJS Material Version** - check the header of your `angular-material.js` file to determine
your specific version #.

```js
/*!
* Angular Material Design
* AngularJS Material Design
* https://github.com/angular/material
* @license MIT
* v0.6.0-rc1-master-57f10f7
Expand All @@ -104,13 +104,13 @@ Here are two examples of well-defined issues:
#### <a name="submitpr"></a>Submitting Pull Requests

**Important**: With the exception of minor bugs and doc fixes, we are not actively reviewing
unsolicited PRs to Angular Material.
unsolicited PRs to AngularJS Material.

Please check with us via [the discussion forum](https://groups.google.com/forum/#!forum/ngmaterial)
before investing significant effort in a planned Pull Request submission; it's likely that we are already
working on a related PR.

* All contributions must be consistent with the Angular Material coding conventions. See the
* All contributions must be consistent with the AngularJS Material coding conventions. See the
[Coding Guidelines](../docs/guides/CODING.md)
* Submit proposed changes or additions as GitHub pull requests. See the
[Pull Request Guidelines](../docs/guides/PULL_REQUESTS.md)
Expand All @@ -120,7 +120,7 @@ working on a related PR.

We have very precise rules over how our git commit messages can be formatted. This leads to **more
readable messages** that are easy to follow when looking through the **project history**. It is
important to note that we use the git commit messages to **generate** the Angular Material
important to note that we use the git commit messages to **generate** the AngularJS Material
[Changelog](../../CHANGELOG.md) document.

> A detailed explanation of guidelines and conventions can be found in this
Expand Down Expand Up @@ -201,9 +201,9 @@ refactor(content): prefix mdContent scroll- attributes
## <a name="pr_forks"></a> Guidelines for Developer Commit Authorizations

Please review the [Commit Level and Authorization Guidelines](../docs/guides/COMMIT_LEVELS.md) for
details on how to implement and submit your fixes, changes, or enhancements to Angular Material.
details on how to implement and submit your fixes, changes, or enhancements to AngularJS Material.

This guideline provides details on creating a repository Fork of the Angular Material repository
This guideline provides details on creating a repository Fork of the AngularJS Material repository
and how to submit Pull Requests.


Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
- `CodePen Demo which shows your issue:`
- `Details:`

**Angular Versions**: *
- `Angular Version:`
- `Angular Material Version:`
**AngularJS Versions**: *
- `AngularJS Version:`
- `AngularJS Material Version:`

**Additional Information**:
- `Browser Type: *`
Expand Down
50 changes: 25 additions & 25 deletions CHANGELOG.md

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
[Material Design](https://www.google.com/design/spec/material-design/) is a specification for a
unified system of visual, motion, and interaction design that adapts across different devices. Our
goal is to deliver a lean, lightweight set of AngularJS-native UI elements that implement the
material design specification for use in Angular single-page applications (SPAs).
material design specification for use in AngularJS single-page applications (SPAs).

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

For developers using AngularJS, Angular Material is the reference implementation of Google's Material Design Specification. This project implements version 1.x of Angular Material and includes a rich set of reusable, well-tested, and accessible UI components.
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.

Quick Links:

Expand All @@ -17,21 +17,21 @@ Quick Links:
* [Installing](#installing)


Please note that using Angular Material requires the use of **Angular 1.3.x** or higher. Angular
Please note that using AngularJS Material requires the use of **AngularJS 1.3.x** or higher. AngularJS
Material is targeted for all browsers with browser versions shown below with green boxes:

![ngm1_browser_support](https://cloud.githubusercontent.com/assets/210413/18553899/f3fbfbca-7b27-11e6-81c9-2937950c808e.png)

## <a name="news"></a> GitHub Universe

Based on the number of unique contributors and repository forks, GitHub Octoverse recently announced that Angular Material is one of the top 10 most-loved active projects on GitHub:
Based on the number of unique contributors and repository forks, GitHub Octoverse recently announced that AngularJS Material is one of the top 10 most-loved active projects on GitHub:

![angularongithubuniverse](https://cloud.githubusercontent.com/assets/210413/18553990/53cf2e32-7b28-11e6-8e08-29548fd3d786.jpg)

## <a name="demos"></a> Online Documentation (and Demos)

<div style="border: 1px solid #ccc">
<img src="https://cloud.githubusercontent.com/assets/11819543/10056006/4aee3b68-6207-11e5-8497-a0656f85902a.PNG" alt="Angular Material docs website" style="display:block;">
<img src="https://cloud.githubusercontent.com/assets/11819543/10056006/4aee3b68-6207-11e5-8497-a0656f85902a.PNG" alt="AngularJS Material docs website" style="display:block;">
</div>

- Visit [Material.AngularJS.org](https://material.angularjs.org/) online to review the API, see the
Expand All @@ -42,11 +42,11 @@ Based on the number of unique contributors and repository forks, GitHub Octovers

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

Angular Material has revised/improved its build processes. To preserve stability with applications currently using Angular Material, we will have three (3) types of releases:
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:

* `major` : this type of release will be the Angular 2.x efforts maintained in a separate repository called [Material2](https://github.com/angular/material2). This type of release will not be used within Angular Material 1.x.
* `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.
* `minor`: aka `master` contains patch release changes AND breaking changes and new features
* `patch`: non-breaking changes (no API, CSS, UX changes that will cause breaks in existing ngMaterial applications)
* `patch`: non-breaking changes (no API, CSS, UX changes that will cause breaks in existing AngularJS Material applications)

##### Patch Releases

Expand All @@ -62,7 +62,7 @@ Our formal release of `minor` builds is much less frequent; probably 1x / Quarte

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.

> for the purposes of Angular Material 1.x, you *could* think of the patch releases as being *minor* changes and the 'minor' releases as being *major* changes.
> 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.

## <a name="contributing"></a> Contributing
Expand All @@ -76,7 +76,7 @@ Developers interested in contributing should read the following guidelines:

> Please do **not** ask general questions in an issue. Issues are only to report bugs, request
enhancements, or request new features. For general questions and discussions, use the
[Angular Material Forum](https://groups.google.com/forum/#!forum/ngmaterial).
[AngularJS Material Forum](https://groups.google.com/forum/#!forum/ngmaterial).

It is important to note that for each release, the [ChangeLog](CHANGELOG.md) is a resource that will
itemize all:
Expand All @@ -87,7 +87,7 @@ itemize all:

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

Developers can easily build Angular Material using NPM and gulp.
Developers can easily build AngularJS Material using NPM and gulp.

* [Builds - Under the Hood](docs/guides/BUILD.md)

Expand All @@ -107,7 +107,7 @@ Then run the **gulp** tasks:
# To build `angular-material.js/.css` and `Theme` files in the `/dist` directory
gulp build

# To build the Angular Material Docs and Demos in `/dist/docs` directory
# To build the AngularJS Material Docs and Demos in `/dist/docs` directory
gulp docs
```

Expand All @@ -118,8 +118,8 @@ debugging) developers should read the [Build Instructions](docs/guides/BUILD.md)

#### Bower

For developers not interested in building the Angular Material library... use **bower** to install
and use the Angular Material distribution files.
For developers not interested in building the AngularJS Material library... use **bower** to install
and use the AngularJS Material distribution files.

Change to your project's root directory.

Expand All @@ -132,12 +132,12 @@ bower install angular-material#master
```

Visit [Bower-Material](https://github.com/angular/bower-material/blob/master/README.md) for more
details on how to install and use the Angular Material distribution files within your own local
details on how to install and use the AngularJS Material distribution files within your own local
project.

#### CDN

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

With the Google CDN, you will not need to download local copies of the distribution files. Instead
Expand All @@ -148,19 +148,19 @@ when using online tools such as [CodePen](http://codepen.io/), [Plunkr](http://p
```html
<head>

<!-- Angular Material CSS now available via Google CDN; version 1.0.7 used here -->
<!-- AngularJS Material CSS now available via Google CDN; version 1.0.7 used here -->
<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/angular_material/0.11.2/angular-material.min.css">

</head>
<body>

<!-- Angular Material Dependencies -->
<!-- AngularJS Material Dependencies -->
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-animate.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-aria.min.js"></script>


<!-- Angular Material Javascript now available via Google CDN; version 1.0.7 used here -->
<!-- AngularJS Material Javascript now available via Google CDN; version 1.0.7 used here -->
<script src="https://ajax.googleapis.com/ajax/libs/angular_material/1.0.7/angular-material.min.js"></script>
</body>
```
Expand All @@ -172,18 +172,18 @@ pull directly from the distribution GitHub
```html
<head>

<!-- Angular Material CSS using GitCDN to load directly from `bower-material/master` -->
<!-- AngularJS Material CSS using GitCDN to load directly from `bower-material/master` -->
<link rel="stylesheet" href="https://gitcdn.link/repo/angular/bower-material/master/angular-material.css">

</head>
<body>

<!-- Angular Material Dependencies -->
<!-- AngularJS Material Dependencies -->
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-animate.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular-aria.js"></script>

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

</body>
Expand Down
2 changes: 1 addition & 1 deletion config/karma-sauce.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module.exports = function(config) {
reporters: ['dots', 'saucelabs'],

sauceLabs: {
testName: 'Angular Material 1.x Unit Tests',
testName: 'AngularJS Material 1.x Unit Tests',
tunnelIdentifier: process.env.TRAVIS_JOB_ID,
build: 'Build ' + process.env.TRAVIS_JOB_ID,

Expand Down
2 changes: 1 addition & 1 deletion config/ngModuleData.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* The Angular Material module `ngMaterial` is generated by scanning all Material components
* The AngularJS Material module `ngMaterial` is generated by scanning all Material components
* for valid module definitions. @see gulp-utils.js ::buildNgMaterialDefinition()
*
* angular.module('ngMaterial', [
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Documentation
-------------

The Angular Material **Live Docs** are generated from the source code. In fact, the Angular Material documentation itself uses the Angular Material layout, components and themes.
The AngularJS Material **Live Docs** are generated from the source code. In fact, the AngularJS Material documentation itself uses the AngularJS Material layout, components and themes.

> Our build process uses **[dgeni](https://github.com/angular/dgeni)**, the wonderful documentation
generator built by [Pete Bacon Darwin](https://github.com/petebacondarwin).
Expand Down
2 changes: 1 addition & 1 deletion docs/app/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ function(SERVICES, COMPONENTS, DEMOS, PAGES,

$routeProvider.otherwise('/');

// Change hash prefix of the Angular router, because we use the hash symbol for anchor links.
// Change hash prefix of the AngularJS router, because we use the hash symbol for anchor links.
// The hash will be not used by the docs, because we use the HTML5 mode for our links.
$locationProvider.hashPrefix('!');

Expand Down
2 changes: 1 addition & 1 deletion docs/app/js/codepen.js
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
var matchAngularModule = /\.module\(('[^']*'|"[^"]*")\s*,(\s*\[([^\]]*)\]\s*\))/ig;
var modules = "['ngMaterial', 'ngMessages', 'material.svgAssetsCache']";

// See scripts.js for list of external Angular libraries used for the demos
// See scripts.js for list of external AngularJS libraries used for the demos

return file.replace(matchAngularModule, ".module('MyApp',"+ modules + ")");
}
Expand Down
4 changes: 2 additions & 2 deletions docs/app/partials/contributors.tmpl.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div ng-controller="GuideCtrl" class="doc-content">
<md-content>
<p>
We are thankful for the amazing community and <em>contributors</em> to Angular Material.<br/>
Shown below is a list of all our contributors: developers who submitted fixes and improvements to ngMaterial.
We are thankful for the amazing community and <em>contributors</em> to AngularJS Material.<br/>
Shown below is a list of all our contributors: developers who submitted fixes and improvements to AngularJS Material.
</p>
<md-divider></md-divider>

Expand Down
Loading

0 comments on commit 6fa8067

Please sign in to comment.