From f4d74a199413c7a5e5b548a7b528c1c6d24d1ca4 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Thu, 22 Dec 2016 12:37:21 -0800 Subject: [PATCH 1/3] Fix asset urls for examples that load images/icons --- src/app/examples/card-fancy/card-fancy-example.css | 2 +- src/app/examples/card-fancy/card-fancy-example.html | 2 +- .../icon-svg-example/ic_3d_rotation_black_24px.svg | 4 ---- .../examples/icon-svg-example/icon-svg-example.html | 2 +- .../examples/icon-svg-example/icon-svg-example.ts | 10 +++++++++- src/app/pages/homepage/homepage.html | 2 +- src/assets/documents/overview/icon.html | 2 +- .../card-fancy => assets/img/examples}/shiba1.jpg | Bin .../card-fancy => assets/img/examples}/shiba2.jpg | Bin src/assets/img/examples/thumbup-icon.svg | 4 ++++ 10 files changed, 18 insertions(+), 10 deletions(-) delete mode 100644 src/app/examples/icon-svg-example/ic_3d_rotation_black_24px.svg rename src/{app/examples/card-fancy => assets/img/examples}/shiba1.jpg (100%) rename src/{app/examples/card-fancy => assets/img/examples}/shiba2.jpg (100%) create mode 100644 src/assets/img/examples/thumbup-icon.svg diff --git a/src/app/examples/card-fancy/card-fancy-example.css b/src/app/examples/card-fancy/card-fancy-example.css index a31788f10..af0b6a135 100644 --- a/src/app/examples/card-fancy/card-fancy-example.css +++ b/src/app/examples/card-fancy/card-fancy-example.css @@ -3,6 +3,6 @@ } .example-header-image { - background-image: url('shiba1.jpg'); + background-image: url('assets/img/examples/shiba2.jpg'); background-size: cover; } diff --git a/src/app/examples/card-fancy/card-fancy-example.html b/src/app/examples/card-fancy/card-fancy-example.html index bf173a748..07d25dfb8 100644 --- a/src/app/examples/card-fancy/card-fancy-example.html +++ b/src/app/examples/card-fancy/card-fancy-example.html @@ -4,7 +4,7 @@ Shiba Inu Dog Breed - +

The Shiba Inu is the smallest of the six original and distinct spitz breeds of dog from Japan. diff --git a/src/app/examples/icon-svg-example/ic_3d_rotation_black_24px.svg b/src/app/examples/icon-svg-example/ic_3d_rotation_black_24px.svg deleted file mode 100644 index 47f5dc6be..000000000 --- a/src/app/examples/icon-svg-example/ic_3d_rotation_black_24px.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/app/examples/icon-svg-example/icon-svg-example.html b/src/app/examples/icon-svg-example/icon-svg-example.html index a2beb1714..ac74cf790 100644 --- a/src/app/examples/icon-svg-example/icon-svg-example.html +++ b/src/app/examples/icon-svg-example/icon-svg-example.html @@ -1 +1 @@ - + diff --git a/src/app/examples/icon-svg-example/icon-svg-example.ts b/src/app/examples/icon-svg-example/icon-svg-example.ts index a445b4e11..ee613c665 100644 --- a/src/app/examples/icon-svg-example/icon-svg-example.ts +++ b/src/app/examples/icon-svg-example/icon-svg-example.ts @@ -1,8 +1,16 @@ import {Component} from '@angular/core'; +import {DomSanitizer} from '@angular/platform-browser'; +import {MdIconRegistry} from '@angular/material'; @Component({ selector: 'icon-svg-example', templateUrl: './icon-svg-example.html', }) -export class IconSvgExample {} +export class IconSvgExample { + constructor(iconRegistry: MdIconRegistry, sanitizer: DomSanitizer) { + iconRegistry.addSvgIcon( + 'thumbs-up', + sanitizer.bypassSecurityTrustResourceUrl('assets/img/examples/thumbup-icon.svg')) + } +} diff --git a/src/app/pages/homepage/homepage.html b/src/app/pages/homepage/homepage.html index 8b416f8ea..c66bb655d 100644 --- a/src/app/pages/homepage/homepage.html +++ b/src/app/pages/homepage/homepage.html @@ -37,7 +37,7 @@

Fast and Consistent

Versatile

-

Themable, for when you need to stay on brand or just have a facourite color. +

Themable, for when you need to stay on brand or just have a favorite color. Accessible and internationalized so that all users are welcome.

diff --git a/src/assets/documents/overview/icon.html b/src/assets/documents/overview/icon.html index f071d8259..286bd8c30 100644 --- a/src/assets/documents/overview/icon.html +++ b/src/assets/documents/overview/icon.html @@ -1,6 +1,6 @@

md-icon makes it easier to use vector-based icons in your app. This directive supports both icon fonts and SVG icons, but not bitmap-based formats (png, jpg, etc.).

-
+

Registering icons

MdIconRegistry is an injectable service that allows you to associate icon names with SVG URLs and define aliases for CSS font classes. Its methods are discussed below and listed in the API summary.

diff --git a/src/app/examples/card-fancy/shiba1.jpg b/src/assets/img/examples/shiba1.jpg similarity index 100% rename from src/app/examples/card-fancy/shiba1.jpg rename to src/assets/img/examples/shiba1.jpg diff --git a/src/app/examples/card-fancy/shiba2.jpg b/src/assets/img/examples/shiba2.jpg similarity index 100% rename from src/app/examples/card-fancy/shiba2.jpg rename to src/assets/img/examples/shiba2.jpg diff --git a/src/assets/img/examples/thumbup-icon.svg b/src/assets/img/examples/thumbup-icon.svg new file mode 100644 index 000000000..2391a9f66 --- /dev/null +++ b/src/assets/img/examples/thumbup-icon.svg @@ -0,0 +1,4 @@ + + + + From 5e2e27dfc36da96ea70c58331c67c2b93a3d15c9 Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Thu, 22 Dec 2016 13:21:09 -0800 Subject: [PATCH 2/3] Missing semi-colon --- src/app/examples/icon-svg-example/icon-svg-example.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/examples/icon-svg-example/icon-svg-example.ts b/src/app/examples/icon-svg-example/icon-svg-example.ts index ee613c665..b9689b420 100644 --- a/src/app/examples/icon-svg-example/icon-svg-example.ts +++ b/src/app/examples/icon-svg-example/icon-svg-example.ts @@ -11,6 +11,6 @@ export class IconSvgExample { constructor(iconRegistry: MdIconRegistry, sanitizer: DomSanitizer) { iconRegistry.addSvgIcon( 'thumbs-up', - sanitizer.bypassSecurityTrustResourceUrl('assets/img/examples/thumbup-icon.svg')) + sanitizer.bypassSecurityTrustResourceUrl('assets/img/examples/thumbup-icon.svg')); } } From 1659e1acfd60793d7068b55f806de1d317f372ea Mon Sep 17 00:00:00 2001 From: Jeremy Elbourn Date: Thu, 22 Dec 2016 13:31:07 -0800 Subject: [PATCH 3/3] asset --- src/app/examples/card-fancy/card-fancy-example.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/examples/card-fancy/card-fancy-example.css b/src/app/examples/card-fancy/card-fancy-example.css index af0b6a135..daef28f16 100644 --- a/src/app/examples/card-fancy/card-fancy-example.css +++ b/src/app/examples/card-fancy/card-fancy-example.css @@ -3,6 +3,6 @@ } .example-header-image { - background-image: url('assets/img/examples/shiba2.jpg'); + background-image: url('assets/img/examples/shiba1.jpg'); background-size: cover; }