Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature(material): Upgrade to latest material. (closes #346) #305

Merged
merged 65 commits into from
Feb 23, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
ca2004a
remove deprecated md-input component and directives
Feb 1, 2017
ebb1847
point to the master branch for now
Feb 1, 2017
1fde464
leverage `[overlapTrigger]="false"` in notifications demo
Feb 1, 2017
a8ed1d4
No more need for tooltip `OnPush` workaround. https://github.com/angu…
Feb 1, 2017
74b5cab
bugfix(layout): leverage `disableClose` input from sidenav to prevent…
Feb 1, 2017
b5e3e8c
feature(data-table): leverage the `md-pseudo-checkbox` to render the …
Feb 1, 2017
8839b17
fixed css for `md-input-container` in chips
Feb 1, 2017
b27bbc4
merge develop
Feb 4, 2017
ac84849
merge with develop
Feb 7, 2017
3747397
fix compilation errors for new `mat-` preffix on mixins and scss
Feb 9, 2017
9af30ff
fix(stepper): fix styles with new material
Feb 9, 2017
c514d32
fix(expansion): fixed styles with material upgrade
Feb 9, 2017
178b5d6
Merge branch 'develop' into feature/upgrade-material
emoralesb05 Feb 9, 2017
63723ab
fix(file): renamed `md` to `td` in styles
Feb 9, 2017
5d595e8
fix(): styles in chips
Feb 9, 2017
ed17d40
fix(): styles for data-table
Feb 9, 2017
c290b9d
fix(): styles for paging
Feb 9, 2017
d1b0fae
fix(): menu + notifications style fixes
Feb 9, 2017
6f46bf0
fix(): styles in search module
Feb 9, 2017
00e50d2
fox(): styles in layouts
Feb 9, 2017
ae3c7f8
fix(): icons in layouts and lists
Feb 9, 2017
d57fa2b
fix(): fixed loading unit tests
Feb 9, 2017
f8389a7
fix(): fix styles for `md-card`
Feb 10, 2017
cece527
Merge branch 'develop' into feature/upgrade-material
emoralesb05 Feb 10, 2017
04d3fdc
fix(): fixed md-icon-logo class
Feb 10, 2017
443d71a
Merge branch 'develop' into feature/upgrade-material
emoralesb05 Feb 10, 2017
f7a9c94
update(home): add layout wrapper since card-actions forces block
Feb 10, 2017
c831f28
update(docs): autocomplete demo in material components
Feb 10, 2017
46b12a3
Merge branch 'feature/upgrade-material' of github.com:Teradata/covale…
Feb 10, 2017
37c2d57
feat(): point to material@2.0.0-beta.2
Feb 16, 2017
f8fbcb2
fix(): lint errors
Feb 16, 2017
a0a1f73
Merge branch 'develop' into feature/upgrade-material
Feb 16, 2017
4c4c358
feat(): upgrade core dependency to material@2.0.0-beta.2
Feb 16, 2017
352cca1
fix(): fix underline style for md-select in paging-bar
Feb 16, 2017
ecfb35c
fix(): missed mat- preffix
Feb 16, 2017
881c6c9
fix(steps): workaround since the ripple is too slow now.
Feb 16, 2017
2c94506
docs(iconography): use td-search-box
Feb 16, 2017
09a0a23
docs(): fix styles in design patterns
Feb 16, 2017
ee25aaf
fix(data-table): fix styles in data-table demo 1
Feb 16, 2017
da3778c
refactor(styles): remove unused styles from navigation-drawer
Feb 16, 2017
318486e
fix(dynamic-forms): fix label style for slider
Feb 16, 2017
d48529d
chore(): remove md-prefix and use mdPrefix
Feb 16, 2017
90c2ed6
fix(): card-colored fix to .mat-icon
Feb 16, 2017
32b38d0
fix(card-colored): added width and height to mat-icon
Feb 16, 2017
5a4d4ea
fix(paging-bar): set font-size on md-select
Feb 16, 2017
a07cf73
feat(divider): add mat-inset usage as an alternative to md-inset
Feb 16, 2017
f8f84ce
Merge branch 'develop' into feature/upgrade-material
emoralesb05 Feb 22, 2017
01df98b
update(styles): card avatar style update
Feb 22, 2017
18c8639
update(docs): use standard card title for style guide
Feb 22, 2017
92328c0
update(docs): new angular material theme link
Feb 22, 2017
7fada64
Merge branch 'develop' into feature/upgrade-material
emoralesb05 Feb 22, 2017
d600242
merge with develop
Feb 22, 2017
00b2f45
fix(material2-chips): added temp md- class fix
Feb 22, 2017
131a95e
update(styles): add body wrap to utilities for priority
Feb 22, 2017
8af73c6
update(styles): add mat prefix fab position
Feb 22, 2017
4f26c18
Merge branch 'feature/upgrade-material' of github.com:Teradata/covale…
Feb 22, 2017
77e28de
update(icon-font): ensure 1em works on font mat-icon
Feb 22, 2017
49ec45a
update(styles): add more utility text styles
Feb 22, 2017
04c8d03
update(typography): wrap with body for priority
Feb 22, 2017
6af00a1
update(ngx-charts): fix typo in example colors
Feb 22, 2017
1fcea8d
update(typography): fix html in body
Feb 22, 2017
27bb469
fix(themes): fix md- prefix for prebuilt themes
Feb 22, 2017
88acfcc
docs(themes): fix mat- prefix on theme docs
Feb 22, 2017
251cfb4
fix(flex-layout): remove fix version for flex-layout
Feb 22, 2017
a5e1de2
merge with develop
Feb 22, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"@angular/forms": "^2.4.5",
"@angular/flex-layout": "2.0.0-beta.5",
"@angular/http": "^2.4.5",
"@angular/material": "2.0.0-beta.1",
"@angular/material": "2.0.0-beta.2",
"@angular/platform-browser": "^2.4.5",
"@angular/platform-browser-dynamic": "^2.4.5",
"@angular/platform-server": "^2.4.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h4 class="md-subhead">with custom headings, columns, and inline editing</h4>
<md-tab-group md-stretch-tabs>
<md-tab>
<template md-tab-label>Demo</template>
<div class="md-table-container">
<div class="mat-table-container">
<table td-data-table>
<th td-data-table-column>
<md-icon>comment</md-icon>
Expand All @@ -22,7 +22,7 @@ <h4 class="md-subhead">with custom headings, columns, and inline editing</h4>
</th>
<tr td-data-table-row *ngFor="let row of basicData">
<td td-data-table-cell (click)="openPrompt(row, 'comments')">
<button md-button [class.md-accent]="!row['comments']">{{row['comments'] || 'Add Comment'}}</button>
<button md-button [class.mat-accent]="!row['comments']">{{row['comments'] || 'Add Comment'}}</button>
</td>
<td td-data-table-cell *ngFor="let column of columns" [numeric]="column.numeric">
{{column.format ? column.format(row[column.name]) : row[column.name]}}
Expand All @@ -48,7 +48,7 @@ <h4 class="md-subhead">with custom headings, columns, and inline editing</h4>
</th>
<tr td-data-table-row *ngFor="let row of basicData">
<td td-data-table-cell (click)="openPrompt(row, 'comments')">
<button md-button [class.md-accent]="!row['comments']">{ {row['comments'] || 'Add Comment'}}</button>
<button md-button [class.mat-accent]="!row['comments']">{ {row['comments'] || 'Add Comment'}}</button>
</td>
<td td-data-table-cell *ngFor="let column of columns" [numeric]="column.numeric">
{ {column.format ? column.format(row[column.name]) : row[column.name]}}
Expand Down Expand Up @@ -207,7 +207,7 @@ <h4 class="md-subhead">Paging Bar / Search Box / Sortable components</h4>
<md-tab-group md-stretch-tabs>
<md-tab>
<template md-tab-label>Demo</template>
<div layout="row" layout-align="start center" class="pad-left-sm pad-right-sm" [class.md-selected-title]="selectedRows.length && selectable">
<div layout="row" layout-align="start center" class="pad-left-sm pad-right-sm" [class.mat-selected-title]="selectedRows.length && selectable">
<span *ngIf="!searchBox.searchVisible" class="push-left-sm">
<span *ngIf="(selectable && !selectedRows.length) || !selectable" class="md-title">Title here</span>
<span *ngIf="selectedRows.length && selectable" class="md-body-1">{{selectedRows.length}} item(s) selected</span>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.md-table-container {
.mat-table-container {
display: block;
max-width: 100%;
overflow-x: auto;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
<p>Try entering white spaces before or after a word this input:</p>
<div layout="row">
<md-input-container flex>
<input md-input tdAutoTrim [(ngModel)]="trim" placeholder="This will be autotrimmed"/>
<input mdInput tdAutoTrim [(ngModel)]="trim" placeholder="This will be autotrimmed"/>
</md-input-container>
</div>
<p>Usage:</p>
<td-highlight lang="html">
<![CDATA[
<md-input-container>
<input md-input tdAutoTrim [(ngModel)]="trim" placeholder="This will be autotrimmed"/>
<input mdInput tdAutoTrim [(ngModel)]="trim" placeholder="This will be autotrimmed"/>
</md-input-container>
]]>
</td-highlight>
Expand Down Expand Up @@ -119,7 +119,7 @@
<p>Example enter lower than 5 or higher than 10:</p>
<div layout="row">
<md-input-container flex="20">
<input md-input placeholder="CPUs" #el="ngModel" type="number" [(ngModel)]="val" min="5" max="10" required/>
<input mdInput placeholder="CPUs" #el="ngModel" type="number" [(ngModel)]="val" min="5" max="10" required/>
</md-input-container>
</div>
<p>Errors:</p>
Expand All @@ -128,7 +128,7 @@
<td-highlight lang="html">
<![CDATA[
<md-input-container>
<input md-input placeholder="CPUs" #el="ngModel" type="number" [(ngModel)]="val" min="5" max="10" required/>
<input mdInput placeholder="CPUs" #el="ngModel" type="number" [(ngModel)]="val" min="5" max="10" required/>
</md-input-container>
]]>
</td-highlight>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export class DynamicFormsDemoComponent {

numberElements: ITdDynamicElementConfig[] = [{
name: 'number',
label: 'Number (coming soon)',
label: 'Number',
type: TdDynamicType.Number,
required: true,
min: 18,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ <h4 md-line>Headquarters</h4>
</td-expansion-summary>
<form class="md-padding" layout="column">
<md-input-container flex>
<input md-input placeholder="Company (disabled)" disabled value="Google"/>
<input mdInput placeholder="Company (disabled)" disabled value="Google"/>
</md-input-container>
<md-input-container flex>
<textarea md-input placeholder="Description" rows="4"></textarea>
<textarea mdInput placeholder="Description" rows="4"></textarea>
</md-input-container>
</form>
<md-divider></md-divider>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
(keyup.delete)="fileInput.clear()"
(keyup.backspace)="fileInput.clear()"
flex>
<input md-input
<input mdInput
placeholder="select or drop files"
[value]="files?.length ? (files?.length + ' files') : files?.name"
[disabled]="disabled"
Expand Down Expand Up @@ -53,7 +53,7 @@
(keyup.delete)="fileInput.clear()"
(keyup.backspace)="fileInput.clear()"
flex>
<input md-input
<input mdInput
placeholder="select or drop files"
[value]="files?.length ? (files?.length + ' files') : files?.name"
[disabled]="disabled"
Expand Down
16 changes: 8 additions & 8 deletions src/app/components/components/loading/loading.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ <h4 class="md-subhead">with indetederminate [tdLoadingMode], circular [tdLoading
<div *tdLoading="'overlayStarSyntax'; mode:'indeterminate'; type:'circle'; strategy:'overlay'; color:'accent'">
<div layout="column" flex>
<md-input-container flex>
<input md-input placeholder="Name"/>
<input mdInput placeholder="Name"/>
</md-input-container>
<md-input-container flex>
<textarea md-input placeholder="Description" rows="4"></textarea>
<textarea mdInput placeholder="Description" rows="4"></textarea>
</md-input-container>
</div>
</div>
Expand All @@ -30,10 +30,10 @@ <h4 class="md-subhead">with indetederminate [tdLoadingMode], circular [tdLoading
<div *tdLoading="'overlayStarSyntax'; mode:'indeterminate'; type:'circle'; strategy:'overlay'; color:'accent'">
<div layout="column" flex>
<md-input-container flex>
<input md-input placeholder="Name"/>
<input mdInput placeholder="Name"/>
</md-input-container>
<md-input-container flex>
<textarea md-input placeholder="Description" rows="4"></textarea>
<textarea mdInput placeholder="Description" rows="4"></textarea>
</md-input-container>
</div>
</div>
Expand Down Expand Up @@ -81,14 +81,14 @@ <h4 class="md-subhead">with determinate [tdLoadingMode], linear [tdLoadingType],
<template tdLoading="replaceTemplateSyntax" tdLoadingMode="determinate" tdLoadingType="linear" tdLoadingStrategy="replace" tdLoadingColor="warn">
<div layout="column" flex>
<md-input-container flex>
<input md-input placeholder="Name"/>
<input mdInput placeholder="Name"/>
</md-input-container>
<md-select placeholder="Select">
<md-option>Demo 1</md-option>
<md-option>Demo 2</md-option>
</md-select>
<md-input-container flex>
<textarea md-input placeholder="Description" rows="4"></textarea>
<textarea mdInput placeholder="Description" rows="4"></textarea>
</md-input-container>
</div>
</template>
Expand All @@ -104,14 +104,14 @@ <h4 class="md-subhead">with determinate [tdLoadingMode], linear [tdLoadingType],
<template tdLoading="replaceTemplateSyntax" tdLoadingMode="determinate" tdLoadingType="linear" tdLoadingStrategy="replace" tdLoadingColor="warn">
<div layout="column" flex>
<md-input-container flex>
<input md-input placeholder="Name"/>
<input mdInput placeholder="Name"/>
</md-input-container>
<md-select placeholder="Select">
<md-option>Demo 1</md-option>
<md-option>Demo 2</md-option>
</md-select>
<md-input-container flex>
<textarea md-input placeholder="Description" rows="4"></textarea>
<textarea mdInput placeholder="Description" rows="4"></textarea>
</md-input-container>
</div>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -334,38 +334,38 @@ <h3>Icons with Buttons</h3>
<form>
<div layout="row" layout-margin>
<md-input-container flex>
<input md-input placeholder="Company (disabled)" disabled value="Google">
<input mdInput placeholder="Company (disabled)" disabled value="Google">
</md-input-container>
</div>
<div layout="row" layout-margin>
<md-input-container flex>
<input md-input placeholder="First name">
<input mdInput placeholder="First name">
</md-input-container>
<md-input-container flex>
<input md-input placeholder="Long Last Name That Will Be Truncated">
<input mdInput placeholder="Long Last Name That Will Be Truncated">
</md-input-container>
</div>

<div layout="row" layout-margin>
<md-input-container flex>
<textarea md-input placeholder="Address" value="1600 Amphitheatre Pkway"></textarea>
<textarea mdInput placeholder="Address" value="1600 Amphitheatre Pkway"></textarea>
</md-input-container>
</div>
<div layout="row" layout-margin>
<md-input-container flex>
<textarea md-input placeholder="Address 2"></textarea>
<textarea mdInput placeholder="Address 2"></textarea>
</md-input-container>
</div>

<div layout="row" layout-margin>
<md-input-container flex>
<input md-input placeholder="City">
<input mdInput placeholder="City">
</md-input-container>
<md-input-container flex>
<input md-input placeholder="State">
<input mdInput placeholder="State">
</md-input-container>
<md-input-container flex>
<input md-input #postalCode maxlength="5" placeholder="Postal Code" value="94043">
<input mdInput #postalCode maxlength="5" placeholder="Postal Code" value="94043">
<md-hint align="end">{{postalCode.value.length}} / 5</md-hint>
</md-input-container>
</div>
Expand All @@ -378,38 +378,38 @@ <h3>Icons with Buttons</h3>
<form>
<div layout="row" layout-margin>
<md-input-container flex>
<input md-input placeholder="Company (disabled)" disabled value="Google">
<input mdInput placeholder="Company (disabled)" disabled value="Google">
</md-input-container>
</div>
<div layout="row" layout-margin>
<md-input-container flex>
<input md-input placeholder="First name">
<input mdInput placeholder="First name">
</md-input-container>
<md-input-container flex>
<input md-input placeholder="Long Last Name That Will Be Truncated">
<input mdInput placeholder="Long Last Name That Will Be Truncated">
</md-input-container>
</div>

<div layout="row" layout-margin>
<md-input-container flex>
<textarea md-input placeholder="Address" value="1600 Amphitheatre Pkway"></textarea>
<textarea mdInput placeholder="Address" value="1600 Amphitheatre Pkway"></textarea>
</md-input-container>
</div>
<div layout="row" layout-margin>
<md-input-container flex>
<textarea md-input placeholder="Address 2"></textarea>
<textarea mdInput placeholder="Address 2"></textarea>
</md-input-container>
</div>

<div layout="row" layout-margin>
<md-input-container flex>
<input md-input placeholder="City">
<input mdInput placeholder="City">
</md-input-container>
<md-input-container flex>
<input md-input placeholder="State">
<input mdInput placeholder="State">
</md-input-container>
<md-input-container flex>
<input md-input #postalCode maxlength="5" placeholder="Postal Code" value="94043">
<input mdInput #postalCode maxlength="5" placeholder="Postal Code" value="94043">
<md-hint align="end">{{postalCode.value.length}} / 5</md-hint>
</md-input-container>
</div>
Expand Down Expand Up @@ -1307,15 +1307,15 @@ <h3 md-line>{ { dog.name } }</h3>
<md-card-content>
<button md-raised-button
md-ripple
[mdRippleBackgroundColor]="'rgba(30, 136, 229, 0.2)'">
[mdRippleColor]="'rgba(30, 136, 229, 0.2)'">
Click me
</button>
<md-divider class="push-top push-bottom"></md-divider>
<td-highlight lang="html">
<![CDATA[
<button md-raised-button
md-ripple
[mdRippleBackgroundColor]="'rgba(30, 136, 229, 0.2)'">
[mdRippleColor]="'rgba(30, 136, 229, 0.2)'">
Click me
</button>
]]>
Expand All @@ -1326,7 +1326,7 @@ <h3 md-line>{ { dog.name } }</h3>
<md-card-title>Slider</md-card-title>
<md-divider></md-divider>
<md-card-content>
<md-slider min="1" max="5" thumbLabel tickInterval="1"></md-slider>
<md-slider color="accent" min="1" max="5" thumbLabel tickInterval="1"></md-slider>
<md-slider step="5" thumbLabel tickInterval="5"></md-slider>
<md-slider thumbLabel tick-interval="auto"></md-slider>
<md-divider class="push-top push-bottom"></md-divider>
Expand Down Expand Up @@ -1465,6 +1465,59 @@ <h3 md-dialog-title>Simple Dialog</h3>
</td-highlight>
</md-card-content>
</md-card>
<md-card>
<md-card-title>Autocomplete</md-card-title>
<md-divider></md-divider>
<md-card-content>
<div layout="row">
<md-input-container flex="50">
<input mdInput placeholder="State" [mdAutocomplete]="tdAuto" [(ngModel)]="currentState" #modelDir="ngModel"
(ngModelChange)="this.tdStates = filterStates(currentState)" [disabled]="tdDisabled">
</md-input-container>
</div>

<div class="push-top">
<button md-button (click)="modelDir.reset()">RESET</button>
<button md-button (click)="currentState='California'">SET VALUE</button>
<button md-button (click)="tdDisabled=!tdDisabled">
TOGGLE DISABLED
</button>
</div>

<md-autocomplete #tdAuto="mdAutocomplete">
<md-option *ngFor="let state of tdStates" [value]="state.name">
<span>{{ state.name }}</span>
<span class="demo-secondary-text"> ({{state.code}}) </span>
</md-option>
</md-autocomplete>
<md-divider class="push-top push-bottom"></md-divider>
<td-highlight lang="html">
<![CDATA[
<div layout="row">
<md-input-container flex="50">
<input mdInput placeholder="State" [mdAutocomplete]="tdAuto" [(ngModel)]="currentState" #modelDir="ngModel"
(ngModelChange)="this.tdStates = filterStates(currentState)" [disabled]="tdDisabled">
</md-input-container>
</div>

<div class="push-top">
<button md-button (click)="modelDir.reset()">RESET</button>
<button md-button (click)="currentState='California'">SET VALUE</button>
<button md-button (click)="tdDisabled=!tdDisabled">
TOGGLE DISABLED
</button>
</div>

<md-autocomplete #tdAuto="mdAutocomplete">
<md-option *ngFor="let state of tdStates" [value]="state.name">
<span>{ { state.name } }</span>
<span class="demo-secondary-text"> ({ {state.code} }) </span>
</md-option>
</md-autocomplete>
]]>
</td-highlight>
</md-card-content>
</md-card>
<md-card>
<md-card-title>Chips</md-card-title>
<md-divider></md-divider>
Expand All @@ -1480,7 +1533,7 @@ <h3 class="md-title">Chips (with colors)</h3>
<md-divider class="push-top push-bottom"></md-divider>
<h3 class="md-title">Chip Stacked (with colors)</h3>
<div layout-gt-xs="row">
<md-chip-list flex-gt-xs="50" class="md-chip-list-stacked">
<md-chip-list flex-gt-xs="50" class="mat-chip-list-stacked">
<md-chip *ngFor="let chip of chips"
[selected]="chip.selected"
color="{{chip.color}}">
Expand Down