Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/Teradata/covalent into f…
Browse files Browse the repository at this point in the history 
…eature/upgrade-cli
  • Loading branch information
@richavyas
richavyas committed Jan 16, 2017
2 parents 955741e + da4db7f commit e2a1f1f
Show file tree
Hide file tree
Showing 18 changed files with 865 additions and 198 deletions.
4 changes: 4 additions & 0 deletions src/app/components/components/json-formatter/json-formatter.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ export class JsonFormatterDemoComponent {
description: `Levels opened by default when JS object is formatted and rendered.`,
name: 'levelsOpen?',
type: 'number',
}, {
description: `Refreshes json-formatter and rerenders [data]`,
name: 'refresh',
type: `function()`,
}];

data: Object = {
Expand Down
182 changes: 109 additions & 73 deletions src/app/components/components/material-components/material-components.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
<md-divider></md-divider>
<md-card-content>
<p>Standard card with content</p>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad</p>
</md-card-content>
<md-divider></md-divider>
Expand All @@ -109,7 +109,7 @@
<md-divider></md-divider>
<md-card-content>
<p>Standard card with content</p>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad</p>
</md-card-content>
<md-divider></md-divider>
Expand Down Expand Up @@ -205,85 +205,121 @@ <h3>Usage within Forms</h3>
<md-card>
<md-card-title>Icons</md-card-title>
<md-divider></md-divider>
<md-card-content layout="row">

<div flex="50" layout="column" style="padding-right: 10px;">
<h3>Basic Icons</h3>
<div>
<md-icon>account_circle</md-icon>
<md-icon>help</md-icon>
<md-icon>delete</md-icon>
<md-icon>favorite</md-icon>
<md-icon>star</md-icon>
<md-icon>done_all</md-icon>
<md-icon>description</md-icon>
<md-icon>open_in_new</md-icon>
<md-icon>question_answer</md-icon>
<md-icon>schedule</md-icon>
</div>
<md-divider style="margin-top: 15px; margin-bottom: 15px;"></md-divider>
<div>
<md-icon>thumb_up</md-icon>
<md-icon>today</md-icon>
<md-icon>warning</md-icon>
<md-icon>airplay</md-icon>
<md-icon>comment</md-icon>
<md-icon>settings</md-icon>
<md-icon>room</md-icon>
<md-icon>stars</md-icon>
<md-icon>touch_app</md-icon>
<md-icon>trending_up</md-icon>
</div>
<md-divider style="margin-top: 15px; margin-bottom: 15px;"></md-divider>
<div>
<md-icon>view_list</md-icon>
<md-icon>view_module</md-icon>
<md-icon>view_quilt</md-icon>
<md-icon>view_week</md-icon>
<md-icon>view_headline</md-icon>
<md-icon>dashboard</md-icon>
<md-icon>subject</md-icon>
<md-icon>view_carousel</md-icon>
<md-icon>playlist_add_check</md-icon>
<md-icon>playlist_add</md-icon>
<md-divider style="margin-top: 15px; margin-bottom: 15px;"></md-divider>
</div>
<td-highlight lang="html">
<![CDATA[
<!-- Basic -->
<md-card-content>
<div layout="row">
<div flex="50" layout="column" style="padding-right: 10px;">
<h3>Basic Icons</h3>
<div layout="row">
<md-icon>account_circle</md-icon>
]]>
<md-icon>help</md-icon>
<md-icon>delete</md-icon>
<md-icon>favorite</md-icon>
<md-icon>star</md-icon>
<md-icon>done_all</md-icon>
<md-icon>description</md-icon>
<md-icon>open_in_new</md-icon>
<md-icon>question_answer</md-icon>
<md-icon>schedule</md-icon>
</div>
<md-divider style="margin-top: 15px; margin-bottom: 15px;"></md-divider>
<div layout="row">
<md-icon>thumb_up</md-icon>
<md-icon>today</md-icon>
<md-icon>warning</md-icon>
<md-icon>airplay</md-icon>
<md-icon>comment</md-icon>
<md-icon>settings</md-icon>
<md-icon>room</md-icon>
<md-icon>stars</md-icon>
<md-icon>touch_app</md-icon>
<md-icon>trending_up</md-icon>
</div>
<md-divider style="margin-top: 15px; margin-bottom: 15px;"></md-divider>
<div layout="row">
<md-icon>view_list</md-icon>
<md-icon>view_module</md-icon>
<md-icon>view_quilt</md-icon>
<md-icon>view_week</md-icon>
<md-icon>view_headline</md-icon>
<md-icon>dashboard</md-icon>
<md-icon>subject</md-icon>
<md-icon>view_carousel</md-icon>
<md-icon>playlist_add_check</md-icon>
<md-icon>playlist_add</md-icon>
</div>
<md-divider style="margin-top: 15px; margin-bottom: 15px;"></md-divider>
<td-highlight lang="html">
<![CDATA[
<!-- Basic -->
<md-icon>account_circle</md-icon>
]]>
</td-highlight>
</div>
</div>

<div flex="50">
<md-card-actions>
<div flex="50" layout="column">
<h3>Icons with Buttons</h3>
<button md-icon-button>
<div layout="row" layout-align="start center">
<button md-icon-button>
<md-icon>favorite</md-icon>
</button>
<button md-fab color="accent">
</button>
<button md-fab color="accent" style="margin-left: 10px;">
<md-icon>shopping_cart</md-icon>
</button>
<button md-mini-fab color="accent">
</button>
<button md-mini-fab color="accent" style="margin-left: 10px;">
<md-icon>add</md-icon>
</button>
<button md-mini-fab color="accent" disabled style="margin-left: 10px;">
<md-icon>backup</md-icon>
</button>
</div>
<md-divider style="margin-top: 15px; margin-bottom: 15px;"></md-divider>
<td-highlight lang="html">
<![CDATA[
<!-- Icons and Buttons -->
<button md-icon-button>
<md-icon>favorite</md-icon>
</button>
<button md-fab color="accent">
<md-icon>shopping_cart</md-icon>
</button>
<button md-mini-fab color="accent">
<md-icon>add</md-icon>
</button>
<button md-mini-fab color="accent" disabled>
<md-icon>backup</md-icon>
</button>
]]>
</td-highlight>
</div>
</div>

<md-divider style="margin-top: 15px; margin-bottom: 15px;"></md-divider>

<div layout="column">
<h3>Icon Sizes</h3>
<div layout="row" layout-align="start end" style="margin-bottom: 15px;">
<md-icon class="md-18">favorite</md-icon>
<md-icon class="md-24" style="margin-left: 10px;">favorite</md-icon>
<md-icon class="md-36" style="margin-left: 10px;">favorite</md-icon>
<md-icon class="md-48" style="margin-left: 10px;">favorite</md-icon>
<button md-fab color="accent" style="margin-left: 10px;">
<md-icon class="md-18">shopping_cart</md-icon>
</button>
<button md-mini-fab color="accent" disabled><md-icon>backup</md-icon></button>
</md-card-actions>
<td-highlight lang="html">
<![CDATA[
<!-- Icons and Buttons -->
<button md-icon-button>
<md-icon>favorite</md-icon>
</button>
<button md-fab color="accent">
<md-icon>shopping_cart</md-icon>
<button md-fab color="accent" style="margin-left: 10px;">
<md-icon class="md-24">shopping_cart</md-icon>
</button>
<button md-mini-fab color="accent">
<md-icon>add</md-icon>
<button md-fab color="accent" style="margin-left: 10px;">
<md-icon class="md-36">shopping_cart</md-icon>
</button>
<button md-mini-fab color="accent" disabled><md-icon>backup</md-icon></button>
]]>
</div>
<td-highlight lang="html">
<![CDATA[
<!-- Icon Sizes (Default: md-24) -->
<md-icon class="md-18">favorite</md-icon>
<md-icon class="md-24">favorite</md-icon>
<md-icon class="md-36">favorite</md-icon>
<md-icon class="md-48">favorite</md-icon>
]]>
</td-highlight>
</div>
</md-card-content>
Expand Down Expand Up @@ -1105,7 +1141,7 @@ <h3 md-line>{ { dog.name } }</h3>
</md-tab>
</md-tab-group>
<md-card-content>

</md-card-content>
</md-card>

Expand Down Expand Up @@ -1328,7 +1364,7 @@ <h3 class="md-title">Inverted Slider</h3>
import { Component } from '@angular/core';
import { MdSnackBar } from '@angular/material';
...
...
...
constructor(private _snackBarService: MdSnackBar) {
}

Expand Down
Loading

0 comments on commit e2a1f1f

Please sign in to comment.