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

Commit cfbc576

Browse files
committed
Remove run-time SVG theming to pure SCSS
1 parent 1ccf573 commit cfbc576

File tree

10 files changed

+83
-258
lines changed

10 files changed

+83
-258
lines changed

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"@angular/platform-browser": "^4.0.0",
2828
"@angular/platform-browser-dynamic": "^4.0.0",
2929
"@angular/router": "^4.0.0",
30-
"color": "^1.0.3",
3130
"core-js": "^2.4.1",
3231
"rxjs": "^5.1.0",
3332
"zone.js": "^0.8.4"

src/_app-theme.scss

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
@import '../node_modules/@angular/material/theming';
2-
@import './app/pages/homepage/homepage-theme';
2+
3+
@import './app/pages/component-category-list/component-category-list-theme';
4+
@import './app/pages/component-list/component-list-theme';
35
@import './app/pages/component-sidenav/component-sidenav-theme';
46
@import './app/pages/component-viewer/component-viewer-theme';
5-
@import './app/pages/component-list/component-list-theme';
6-
@import './app/pages/component-category-list/component-category-list-theme';
77
@import './app/pages/guide-list/guide-list-theme';
8-
8+
@import './app/pages/homepage/homepage-theme';
9+
@import './app/shared/example-viewer/example-viewer-theme';
10+
@import './app/shared/footer/footer-theme';
11+
@import './app/shared/navbar/navbar-theme';
912
@import './styles/api-theme';
1013
@import './styles/markdown-theme';
14+
@import './styles/svg-theme';
1115
@import './styles/tables-theme';
12-
@import './app/shared/navbar/navbar-theme';
13-
@import './app/shared/example-viewer/example-viewer-theme';
14-
@import './app/shared/footer/footer-theme';
1516

1617

1718
// Styles for the docs app that are based on the current theme.
@@ -39,17 +40,17 @@
3940
color: mat-color($primary, default-contrast);
4041
}
4142

43+
@include component-category-list-theme($theme);
44+
@include component-list-theme($theme);
45+
@include component-viewer-sidenav-theme($theme);
46+
@include component-viewer-theme($theme);
4247
@include docs-site-api-theme($theme);
4348
@include docs-site-markdown-theme($theme);
49+
@include docs-site-svg-theme($theme);
4450
@include docs-site-tables-theme($theme);
45-
@include nav-bar-theme($theme);
46-
@include component-viewer-sidenav-theme($theme);
47-
@include home-page-theme($theme);
48-
@include component-viewer-theme($theme);
49-
@include component-list-theme($theme);
50-
@include component-category-list-theme($theme);
51-
@include nav-bar-theme($theme);
5251
@include example-viewer-theme($theme);
5352
@include footer-theme($theme);
5453
@include guide-list-theme($theme);
54+
@include home-page-theme($theme);
55+
@include nav-bar-theme($theme);
5556
}

src/app/pages/component-category-list/component-category-list.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<md-card-title>{{category.name}}</md-card-title>
77
<p class="docs-component-category-list-card-summary">{{category.summary}}</p>
88
<docs-svg-viewer class="docs-component-category-list-card-image"
9-
[svgHref]="'../../../assets/img/component-categories/' + category.id + '.svg'">
9+
[src]="'../../../assets/img/component-categories/' + category.id + '.svg'">
1010
</docs-svg-viewer>
1111
</md-card>
1212
</div>

src/app/pages/component-list/component-list.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
class="docs-component-list-item"
44
[routerLink]="['/components/component/', component.id]">
55
<docs-svg-viewer class="docs-component-list-item-icon"
6-
[attr.aria-label]="component.name"
7-
[svgHref]="'../../../assets/img/components/' + component.id + '.svg'">
6+
[attr.aria-label]="component.name"
7+
[src]="'../../../assets/img/components/' + component.id + '.svg'">
88
</docs-svg-viewer>
99
{{component.name}}
1010
</a>

src/app/pages/homepage/homepage.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ <h2> Material Design components for Angular</h2>
1414
<div class="docs-homepage-row">
1515
<div class="docs-homepage-promo-img">
1616
<docs-svg-viewer
17-
svgHref="../assets/img/homepage/sprintzerotoapp.svg"
17+
src="../assets/img/homepage/sprintzerotoapp.svg"
1818
scaleToContainer="true"></docs-svg-viewer>
1919
</div>
2020
<div class="docs-homepage-promo-desc">
@@ -26,7 +26,7 @@ <h2>Sprint from Zero to App</h2>
2626
<div class="docs-homepage-row docs-homepage-reverse-row">
2727
<div class="docs-homepage-promo-img">
2828
<docs-svg-viewer
29-
svgHref="../assets/img/homepage/fastandconsistent.svg"
29+
src="../assets/img/homepage/fastandconsistent.svg"
3030
scaleToContainer="true"></docs-svg-viewer>
3131
</div>
3232
<div class="docs-homepage-promo-desc">
@@ -38,7 +38,7 @@ <h2>Fast and Consistent</h2>
3838
<div class="docs-homepage-row">
3939
<div class="docs-homepage-promo-img">
4040
<docs-svg-viewer
41-
svgHref="../assets/img/homepage/versatile.svg"
41+
src="../assets/img/homepage/versatile.svg"
4242
scaleToContainer="true"></docs-svg-viewer>
4343
</div>
4444
<div class="docs-homepage-promo-desc">
@@ -49,7 +49,7 @@ <h2>Versatile</h2>
4949
</div>
5050
<div class="docs-homepage-row docs-homepage-reverse-row">
5151
<div class="docs-homepage-promo-img">
52-
<docs-svg-viewer svgHref="../assets/img/homepage/optimized.svg"></docs-svg-viewer>
52+
<docs-svg-viewer src="../assets/img/homepage/optimized.svg"></docs-svg-viewer>
5353
</div>
5454
<div class="docs-homepage-promo-desc">
5555
<h2>Optimized for Angular</h2>

src/app/shared/shared-module.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {GuideItems} from './guide-items/guide-items';
1111
import {ThemeStorage} from './theme-picker/theme-storage/theme-storage';
1212
import {ThemePicker} from './theme-picker/theme-picker';
1313
import {NavBar} from './navbar/navbar';
14-
import {SvgBuilder} from './svg-viewer/svg-builder';
1514
import {SvgViewer} from './svg-viewer/svg-viewer';
1615
import {DocsMaterialModule} from '../app-module';
1716

@@ -25,7 +24,7 @@ import {DocsMaterialModule} from '../app-module';
2524
],
2625
declarations: [DocViewer, ExampleViewer, NavBar, PlunkerButton, ThemePicker, SvgViewer],
2726
exports: [DocViewer, ExampleViewer, NavBar, PlunkerButton, ThemePicker, SvgViewer],
28-
providers: [DocumentationItems, GuideItems, ThemeStorage, SvgBuilder],
27+
providers: [DocumentationItems, GuideItems, ThemeStorage],
2928
entryComponents: [
3029
ExampleViewer,
3130
],

src/app/shared/svg-viewer/svg-builder.spec.ts

Lines changed: 0 additions & 85 deletions
This file was deleted.

src/app/shared/svg-viewer/svg-builder.ts

Lines changed: 0 additions & 91 deletions
This file was deleted.

0 commit comments

Comments
 (0)