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

Commit 7525f16

Browse files
authored
Merge pull request #164 from angular/branding
style(branding): branding consistency fixup
2 parents 811cb12 + 6fec5c3 commit 7525f16

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Angular Material-Start (ES6)
1+
# AngularJS Material-Start (ES6)
22

33
This branch contains the final/complete version (i.e. `step-10-finished`) of the
44
[Material Start ES6 Tutorial](https://github.com/angular/material-start/tree/es6-tutorial) branch
@@ -26,7 +26,7 @@ There are many additional branches in this repository that you may find useful:
2626

2727
#### Purpose
2828

29-
This project uses the latest master branch of Angular Material to build the application outlined
29+
This project uses the latest master branch of AngularJS Material to build the application outlined
3030
below.
3131

3232
![material-starter-ux2](https://cloud.githubusercontent.com/assets/6004537/14996543/b588eb46-1137-11e6-803c-ce23996c9742.png)
@@ -40,8 +40,8 @@ can be used to show the Share bottom sheet view.
4040

4141
This Starter app demonstrates how:
4242

43-
* Angular Material `layout` and `flex` options can easily configure HTML containers
44-
* Angular Material components `<md-toolbar>`, `<md-sidenav>`, and `<md-icon>` can quickly provide
43+
* AngularJS Material `layout` and `flex` options can easily configure HTML containers
44+
* AngularJS Material components `<md-toolbar>`, `<md-sidenav>`, and `<md-icon>` can quickly provide
4545
a base application structure
4646
* Custom controllers can be used and show `<md-bottomsheet>` with HTML templates
4747
* Custom controller can easily, and programmatically open/close the SideNav component
@@ -67,7 +67,7 @@ process:
6767

6868
3. Wire components to your application logic
6969

70-
> Use the seamless integration possible with Angular directives and controllers.<br/>
70+
> Use the seamless integration possible with AngularJS directives and controllers.<br/>
7171
> This integration assumes that you have unit tested your application logic.
7272
7373
4. Add Responsive breakpoints
@@ -78,7 +78,7 @@ process:
7878

7979
7. Write End-to-end (e2e) Tests
8080

81-
> It is important to validate your application logic with Angular Material UI components.
81+
> It is important to validate your application logic with AngularJS Material UI components.
8282
8383
###### Wirefame
8484

@@ -88,7 +88,7 @@ will be used in the Starter app:
8888
<br/>
8989
<img src="https://cloud.githubusercontent.com/assets/210413/6444676/c247c8f8-c0c4-11e4-8206-208f55cbceee.png">
9090

91-
> **Note:** The container #2 (above) is a simple `<div>` container and not an Angular Material
91+
> **Note:** The container #2 (above) is a simple `<div>` container and not an AngularJS Material
9292
component.
9393

9494
- - -
@@ -123,7 +123,7 @@ You will notice a few files/directories within this project:
123123
the application.
124124
3. `index.html` - The entry point to your application. This uses System.js to load the
125125
`app/src/boot/boot.js` bootstrap file which in turn loads the `app/src/app.js` file that imports
126-
all of your dependencies and declares them as Angular modules, and configures the icons and
126+
all of your dependencies and declares them as AngularJS modules, and configures the icons and
127127
theming for the application.
128128

129129
#### Troubleshooting
@@ -133,7 +133,7 @@ If you have issues getting the application to run or work as expected:
133133
1. Make sure you have installed JSPM and run the `jspm update` command.
134134
2. Reach out on our [Forum](https://groups.google.com/forum/#!forum/ngmaterial) to see if any other
135135
developers have had the same issue.
136-
3. This project is based against the `master` branch of Angular Material, so it is always showing
136+
3. This project is based against the `master` branch of AngularJS Material, so it is always showing
137137
the latest and greatest. You may want to update the `package.json` to use Version 1.1.0 or
138138
another stable release to make sure it isn't because of something we changed recently.
139139
4. Search for the issue here on [GitHub](https://github.com/angular/material-start/issues?q=is%3Aissue+is%3Aopen).

app/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta name="description" content="">
77
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no" />
88

9-
<title>Angular Material - Starter App</title>
9+
<title>AngularJS Material - Starter App</title>
1010
<link rel='stylesheet' href='http://fonts.googleapis.com/css?family=Roboto:400,700'>
1111
<link rel="stylesheet" href="./jspm_packages/github/angular/bower-material@master/angular-material.css"/>
1212
<link rel="stylesheet" href="./assets/app.css"/>
@@ -20,7 +20,7 @@
2020
aria-label="Show User List">
2121
<md-icon md-svg-icon="menu"></md-icon>
2222
</md-button>
23-
<h1>Angular Material - Starter App</h1>
23+
<h1>AngularJS Material - Starter App</h1>
2424
</md-toolbar>
2525

2626
<!-- Container #2 -->

app/src/AppController.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Main App Controller for the Angular Material Starter App
2+
* Main App Controller for the AngularJS Material Starter App
33
* @param UsersDataService
44
* @param $mdSidenav
55
* @constructor

app/src/users/Users.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import UsersDataService from 'src/users/services/UsersDataService';
55
import UsersList from 'src/users/components/list/UsersList';
66
import UserDetails from 'src/users/components/details/UserDetails';
77

8-
// Define the Angular 'users' module
8+
// Define the AngularJS 'users' module
99

1010
export default angular
1111
.module("users", ['ngMaterial'])

0 commit comments

Comments
 (0)