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

style(branding): branding consistency fixup #87

Merged
merged 1 commit into from
Jan 25, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion protractor.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ if (process.env['TRAVIS']) {
'browserName': 'chrome',
'tunnel-identifier': process.env['TRAVIS_JOB_NUMBER'],
'build': process.env['TRAVIS_JOB_NUMBER'],
'name': 'Material 2 Docs E2E'
'name': 'Material Docs E2E'
};

}
Expand Down
6 changes: 3 additions & 3 deletions src/assets/documents/guides/getting-started.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<p>Get started with Angular Material 2 using the Angular CLI.</p>
<p>Get started with Angular Material using the Angular CLI.</p>
<h2 id="install-the-cli">Install the CLI</h2>
<pre><code class="lang-bash"> npm install -g angular-cli
</code></pre>
Expand Down Expand Up @@ -64,8 +64,8 @@ <h3 id="-optional-using-material-design-icons-with-md-icon-">[Optional] Using Ma
<p><strong>src/index.html</strong></p>
<pre><code class="lang-html"><span class="hljs-tag">&lt;<span class="hljs-name">link</span> <span class="hljs-attr">href</span>=<span class="hljs-string">"https://fonts.googleapis.com/icon?family=Material+Icons"</span> <span class="hljs-attr">rel</span>=<span class="hljs-string">"stylesheet"</span>&gt;</span>
</code></pre>
<h2 id="sample-angular-material-2-projects">Sample Angular Material 2 projects</h2>
<h2 id="sample-angular-material-projects">Sample Angular Material projects</h2>
<ul>
<li><a href="https://github.com/jelbourn/material2-app">Material 2 Sample App</a></li>
<li><a href="https://github.com/jelbourn/material2-app">Material Sample App</a></li>
<li><a href="https://github.com/kara/leashed-in">Angular Connect 2016 Demo</a></li>
</ul>
2 changes: 1 addition & 1 deletion src/assets/documents/guides/theming.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h3 id="what-is-a-theme-">What is a theme?</h3>
<li>A foreground palette: colors for text and icons.</li>
<li>A background palette: colors used for element backgrounds.</li>
</ul>
<p>In Angular Material 2, all theme styles are generated <em>statically</em> at build-time so that your
<p>In Angular Material, all theme styles are generated <em>statically</em> at build-time so that your
app doesn&#39;t have to spend cycles generating theme styles on startup.</p>
<h3 id="using-a-pre-built-theme">Using a pre-built theme</h3>
<p>Angular Material comes prepackaged with several pre-built theme css files. These theme files also
Expand Down
4 changes: 2 additions & 2 deletions src/assets/plunker/index.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Angular 2 Material Plunker</title>
<title>Angular Material Plunker</title>

<!-- Load common libraries -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/typescript/2.0.3/typescript.min.js"></script>
Expand All @@ -19,7 +19,7 @@
.catch(console.error.bind(console));
</script>

<!-- Load the Angular Material 2 stylesheet -->
<!-- Load the Angular Material stylesheet -->
<link href="https://unpkg.com/@angular/material/core/theming/prebuilt/indigo-pink.css" rel="stylesheet">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<style>body { font-family: Roboto, Arial, sans-serif; }</style>
Expand Down
2 changes: 1 addition & 1 deletion src/polyfills.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// This file includes polyfills needed by Angular 2 and is loaded before
// This file includes polyfills needed by Angular and is loaded before
// the app. You can add your own extra polyfills to this file.
import 'core-js/es6/symbol';
import 'core-js/es6/object';
Expand Down