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

docs: fix View Demo button for directives w/o a demo. update icons, Bower references #11888

Merged
Splaktar merged 1 commit into from
Apr 21, 2020
Merged

docs: fix View Demo button for directives w/o a demo. update icons, Bower references #11888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 18 additions & 22 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ and use the AngularJS Material distribution files.
Change to your project's root directory.

```bash
# To get the latest stable version, use Bower from the command line.
# To get the latest stable version, use NPM from the command line.
npm install angular-material --save

# To get the most recent, latest committed-to-master version use:
Expand All @@ -147,16 +147,13 @@ npm install http://github.com/angular/bower-material#master --save

#### Other Dependency Managers

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

This includes instructions for [Bower](https://github.com/angular/bower-material#bower)
and [JSPM](https://github.com/angular/bower-material#jspm).
Visit our [distribution repository](https://github.com/angular/bower-material/blob/master/README.md)
for more details on how to install and use the AngularJS Material distribution
files within your local project.

#### CDN

CDN versions of AngularJS Material are now available.
CDN versions of AngularJS Material are available.

With the Google CDN, you will not need to download local copies of the distribution files. Instead
simply reference the CDN urls to easily use those remote library files. This is especially useful
Expand All @@ -166,26 +163,25 @@ when using online tools such as [CodePen](http://codepen.io/), [Plunker](http://
```html
<head>

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

</head>
<body>

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

<!-- AngularJS Material Javascript now available via Google CDN; version 1.1.10 used here -->
<script src="https://ajax.googleapis.com/ajax/libs/angular_material/1.1.10/angular-material.min.js"></script>
<!-- AngularJS Material Javascript now available via Google CDN; version 1.1.21 used here -->
<script src="https://ajax.googleapis.com/ajax/libs/angular_material/1.1.21/angular-material.min.js"></script>
</body>
```

Developers seeking the latest, most-current build versions can use [GitCDN.xyz](https://gitcdn.xyz/) to
pull directly from the distribution GitHub
[Bower-Material](https://github.com/angular/bower-material) repository:
pull directly from our [distribution repository](https://github.com/angular/bower-material):

```html
<head>
Expand All @@ -197,10 +193,10 @@ pull directly from the distribution GitHub
<body>

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

<!-- AngularJS Material Javascript using GitCDN to load directly from `bower-material/master` -->
<script src="https://gitcdn.xyz/cdn/angular/bower-material/master/angular-material.js"></script>
Expand Down
6 changes: 1 addition & 5 deletions docs/app/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,10 +449,6 @@ a.docs-logo {
.docs-tools .md-button md-icon {
color: #666 !important;
}
.docs-toolbar-tools .md-button md-icon {
color: #666 !important;
fill: #666 !important;
}
@media (max-width: 400px) {
.docs-tools {
display: none;
Expand Down Expand Up @@ -528,7 +524,7 @@ md-tabs.demo-source-tabs .active md-tab-label {
flex: 1 1 auto;
}
.demo-content > * {
flex: 1 1 0%;
flex: 1 1 0;
}

.demo-content > div[layout-fill] {
Expand Down
19 changes: 0 additions & 19 deletions docs/app/img/icons/github.svg
View file
Open in desktop

This file was deleted.

12 changes: 5 additions & 7 deletions docs/app/img/icons/npm-logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions docs/app/partials/getting-started.tmpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,11 @@ <h3>Our CodePen Community</h3>
<h3>Installing the AngularJS Material Libraries</h3>

<p>
You can install the AngularJS Material library (and its dependent libraries) in your local
project using either
You can
<a href="https://github.com/angular/bower-material/#installing-angularjs-material"
target="_blank">NPM, JSPM, or Bower</a>.
target="_blank">install the AngularJS Material library</a>
(and its dependent libraries) in your local project using
<a href="https://www.npmjs.com/" target="_blank">NPM</a>.
</p>

<p>
Expand Down
2 changes: 1 addition & 1 deletion docs/app/svg-assets-cache.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 6 additions & 13 deletions docs/config/template/index.template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,29 +83,21 @@ <h2 class="md-toolbar-item md-breadcrumb md-headline" tabindex="-1">
<span flex></span> <!-- use up the empty space -->

<div class="md-toolbar-item docs-tools" layout="row">
<md-button class="md-icon-button"
aria-label="Install with Bower"
ng-if="!currentComponent.docs.length && !currentComponent.isService"
target="_blank"
ng-href="https://github.com/angular/bower-material">
<md-tooltip md-autohide>Install with Bower</md-tooltip>
<md-icon md-svg-src="img/icons/bower-logo.svg"></md-icon>
</md-button>
<md-button class="md-icon-button"
aria-label="Install with NPM"
ng-if="!currentComponent.docs.length && !currentComponent.isService"
target="_blank"
ng-href="https://www.npmjs.com/package/angular-material">
<md-tooltip md-autohide>Install with NPM</md-tooltip>
<md-icon md-svg-src="img/icons/npm-logo.svg" style="transform: scale(1.3)"></md-icon>
<md-icon md-svg-src="img/icons/npm-logo.svg"></md-icon>
</md-button>
<md-button class="md-icon-button"
aria-label="View Source on Github"
ng-if="!currentComponent.docs.length && !currentComponent.isService"
target="_blank"
ng-href="{{BUILDCONFIG.repository}}/{{menu.version.current.github}}">
<md-tooltip md-autohide>View Source on Github</md-tooltip>
<md-icon md-svg-src="img/icons/github.svg" style="color: rgba(255,255,255,0.97);"></md-icon>
<md-icon md-svg-src="img/icons/github-icon.svg" style="color: black;"></md-icon>
</md-button>

<md-select
Expand Down Expand Up @@ -137,9 +129,10 @@ <h2 class="md-toolbar-item md-breadcrumb md-headline" tabindex="-1">
<md-button
class="md-icon-button"
aria-label="View Demo"
ng-class="{hide: !currentDoc || !currentDoc.hasDemo}"
ng-class="{hide: !currentDoc || !currentDoc.hasDemo || !currentComponent.demoUrl}"
ng-href="{{currentComponent.demoUrl}}">
<md-icon md-svg-src="img/icons/ic_play_circle_fill_24px.svg" style="fill:green"></md-icon>
<md-icon md-svg-src="img/icons/ic_play_circle_fill_24px.svg" style="fill: #666666">
</md-icon>
<md-tooltip>View Demo</md-tooltip>
</md-button>

Expand All @@ -149,7 +142,7 @@ <h2 class="md-toolbar-item md-breadcrumb md-headline" tabindex="-1">
ng-class="{hide: !currentDoc}"
ng-href="{{currentDoc.githubUrl}}"
hide-sm hide-md>
<md-icon md-svg-src="img/icons/github.svg" style="color: rgba(255,255,255,0.97);"></md-icon>
<md-icon md-svg-src="img/icons/github-icon.svg"></md-icon>
<md-tooltip>View Source on Github</md-tooltip>
</md-button>
</div>
Expand Down