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

Commit 6ea6e78

Browse files
authored
Fix plunkers and add tabs to the site (#70)
* Tab example * Fix plunker, update examples * Add example sources to assets/ so that they can be served directly for plunker * Footer font-size descrease
1 parent 039dd9a commit 6ea6e78

File tree

151 files changed

+1607
-36
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+1607
-36
lines changed

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
},
1717
"private": true,
1818
"dependencies": {
19-
"@angular/common": "^2.4.0",
20-
"@angular/compiler": "^2.4.0",
21-
"@angular/core": "^2.4.0",
22-
"@angular/forms": "^2.4.0",
23-
"@angular/http": "^2.4.0",
19+
"@angular/common": "^2.4.1",
20+
"@angular/compiler": "^2.4.1",
21+
"@angular/core": "^2.4.1",
22+
"@angular/forms": "^2.4.1",
23+
"@angular/http": "^2.4.1",
2424
"@angular/material": "angular/material2-builds",
25-
"@angular/platform-browser": "^2.4.0",
26-
"@angular/platform-browser-dynamic": "^2.4.0",
25+
"@angular/platform-browser": "^2.4.1",
26+
"@angular/platform-browser-dynamic": "^2.4.1",
2727
"@angular/router": "~3.2.3",
2828
"core-js": "^2.4.1",
2929
"fs-extra": "^1.0.0",
@@ -34,7 +34,7 @@
3434
"zone.js": "^0.7.4"
3535
},
3636
"devDependencies": {
37-
"@angular/compiler-cli": "^2.4.0",
37+
"@angular/compiler-cli": "^2.4.1",
3838
"@types/jasmine": "^2.2.30",
3939
"@types/node": "^6.0.42",
4040
"angular-cli": "1.0.0-beta.24",

src/app/examples/example-module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ export const EXAMPLE_COMPONENTS = {
147147
},
148148
'snack-bar-overview': {title: 'Basic snack-bar', component: SnackBarOverviewExample},
149149
'tabs-overview': {title: 'Basic tabs', component: TabsOverviewExample},
150-
'tabs-template-label': {title: 'Tabs with a label template', component: TabsTemplateLabelExample},
150+
'tabs-template-label': {title: 'Coming soon!', component: TabsTemplateLabelExample},
151151
'toolbar-multirow': {title: 'Multi-row toolbar', component: ToolbarMultirowExample},
152152
'toolbar-overview': {title: 'basic toolbar', component: ToolbarOverviewExample},
153153
'tooltip-overview': {title: 'Basic tooltip', component: TooltipOverviewExample},

src/app/examples/slider-configurable/slider-configurable-example.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {Component, ViewEncapsulation} from '@angular/core';
22

33

44
@Component({
5-
selector: 'configurable-slider-example',
5+
selector: 'slider-configurable-example',
66
templateUrl: './slider-configurable-example.html',
77
styleUrls: ['./slider-configurable-example.css'],
88
encapsulation: ViewEncapsulation.None,
Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1 @@
1-
<md-tab-group>
2-
<md-tab>
3-
<template md-tab-label>
4-
I'm a <em>fancy</em> tab <md-icon>sentiment_very_satisfied</md-icon>
5-
</template>
6-
Content 1
7-
</md-tab>
8-
<md-tab label="Tab 2">Content 2</md-tab>
9-
</md-tab-group>
1+
More examples coming soon!

src/app/shared/documentation-items/documentation-items.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ const DOCS = [
4444
{id: 'list', name: 'List', examples: ['list-sections']},
4545
{id: 'grid-list', name: 'Grid list', examples: ['grid-list-dynamic']},
4646
{id: 'card', name: 'Card', examples: ['card-fancy']},
47+
{id: 'tabs', name: 'Tabs', examples: ['tabs-template-label']},
4748
]
4849
},
4950
{

src/app/shared/footer/footer.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.docs-footer {
22
margin-top: 40px;
3-
padding: 20px;
3+
padding: 15px;
44
text-align: center;
5+
font-size: 12px;
56
}

src/assets/documents/overview/tabs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
of the header, pagination controls appear to let the user scroll left and right across the labels.</p>
55
<p>The active tab may be set using the <code>selectedIndex</code> input or when the user selects one of the
66
tab labels in the header.</p>
7-
<div material-docs-example="tab-overview"></div>
7+
<div material-docs-example="tabs-overview"></div>
88
<h3 id="events">Events</h3>
99
<p>The <code>selectChange</code> output event is emitted when the active tab changes. </p>
1010
<p>The <code>focusChange</code> output event is emitted when the user puts focus on any of the tab labels in

src/assets/examples/card-fancy-example-css.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
}
44

55
<span class="hljs-selector-class">.example-header-image</span> {
6-
<span class="hljs-attribute">background-image</span>: <span class="hljs-built_in">url</span>(<span class="hljs-string">'shiba1.jpg'</span>);
6+
<span class="hljs-attribute">background-image</span>: <span class="hljs-built_in">url</span>(<span class="hljs-string">'assets/img/examples/shiba1.jpg'</span>);
77
<span class="hljs-attribute">background-size</span>: cover;
88
}

src/assets/examples/card-fancy-example-html.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<span class="hljs-tag">&lt;<span class="hljs-name">md-card-title</span>&gt;</span>Shiba Inu<span class="hljs-tag">&lt;/<span class="hljs-name">md-card-title</span>&gt;</span>
55
<span class="hljs-tag">&lt;<span class="hljs-name">md-card-subtitle</span>&gt;</span>Dog Breed<span class="hljs-tag">&lt;/<span class="hljs-name">md-card-subtitle</span>&gt;</span>
66
<span class="hljs-tag">&lt;/<span class="hljs-name">md-card-header</span>&gt;</span>
7-
<span class="hljs-tag">&lt;<span class="hljs-name">img</span> <span class="hljs-attr">md-card-image</span> <span class="hljs-attr">src</span>=<span class="hljs-string">"shiba2.jpg"</span>&gt;</span>
7+
<span class="hljs-tag">&lt;<span class="hljs-name">img</span> <span class="hljs-attr">md-card-image</span> <span class="hljs-attr">src</span>=<span class="hljs-string">"assets/img/examples/shiba2.jpg"</span>&gt;</span>
88
<span class="hljs-tag">&lt;<span class="hljs-name">md-card-content</span>&gt;</span>
99
<span class="hljs-tag">&lt;<span class="hljs-name">p</span>&gt;</span>
1010
The Shiba Inu is the smallest of the six original and distinct spitz breeds of dog from Japan.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<span class="hljs-tag">&lt;<span class="hljs-name">md-icon</span> <span class="hljs-attr">svgSrc</span>=<span class="hljs-string">"ic_3d_rotation_black_24px.svg"</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">md-icon</span>&gt;</span>
1+
<span class="hljs-tag">&lt;<span class="hljs-name">md-icon</span> <span class="hljs-attr">svgIcon</span>=<span class="hljs-string">"thumbs-up"</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-name">md-icon</span>&gt;</span>

0 commit comments

Comments
 (0)