From 603ba25f558be0ea1539b226df4c37ca352d3e29 Mon Sep 17 00:00:00 2001 From: Justin DuJardin Date: Sun, 20 Mar 2016 11:36:47 -0700 Subject: [PATCH] feat(angular2): update to beta 11 - reformat code and optimize imports - carefully manage setTimeout/clearTimeout calls due to zone.js nit-picky exceptions being thrown - use >= to be even more generous about which peer deps to install. can revisit if this causes more errors - work around errors on canary by not using *ngIf or *ngFor in Dynamic component loader cases. --- examples/all.ts | 29 +- examples/app.scss | 6 +- examples/app.ts | 14 +- examples/components/button/basic_usage.html | 53 ++-- examples/components/button/basic_usage.ts | 4 +- examples/components/card/action_buttons.scss | 3 +- examples/components/card/action_buttons.ts | 4 +- examples/components/card/basic_usage.scss | 3 +- examples/components/card/basic_usage.ts | 4 +- examples/components/card/inline_actions.scss | 2 +- examples/components/card/inline_actions.ts | 4 +- examples/components/checkbox/basic_usage.scss | 8 +- examples/components/checkbox/basic_usage.ts | 4 +- examples/components/checkbox/syncing.ts | 4 +- examples/components/dialog/basic_usage.html | 5 +- examples/components/dialog/basic_usage.ts | 6 +- examples/components/input/basic_usage.scss | 2 +- examples/components/input/basic_usage.ts | 6 +- examples/components/input/form_builder.ts | 13 +- examples/components/list/basic_usage.ts | 4 +- .../progress_circular/basic_usage.html | 4 +- .../progress_circular/basic_usage.ts | 10 +- .../components/progress_linear/basic_usage.ts | 4 +- examples/components/radio/basic_usage.ts | 4 +- examples/components/sidenav/basic_usage.ts | 4 +- examples/components/switch/basic_usage.ts | 6 +- examples/components/tabs/dynamic_height.html | 64 ++-- examples/components/tabs/dynamic_height.ts | 4 +- examples/components/tabs/dynamic_tabs.html | 4 +- examples/components/tabs/dynamic_tabs.ts | 10 +- examples/components/toolbar/basic_usage.ts | 4 +- .../components/toolbar/scroll_shrink.scss | 1 + examples/components/toolbar/scroll_shrink.ts | 12 +- .../components/whiteframe/basic_usage.html | 72 +++-- .../components/whiteframe/basic_usage.scss | 9 +- examples/components/whiteframe/basic_usage.ts | 4 +- examples/example.scss | 1 - examples/example.ts | 28 +- examples/highlight.scss | 3 +- examples/highlight.ts | 5 +- examples/routes/component.ts | 8 +- examples/routes/index.html | 27 +- examples/services/components.ts | 23 +- examples/services/navigation.ts | 6 +- examples/services/version.ts | 7 +- karma.conf.js | 21 +- ng2-material/all.ts | 62 ++-- ng2-material/components/backdrop/backdrop.ts | 4 +- ng2-material/components/button/button.scss | 20 +- ng2-material/components/button/button.ts | 9 +- ng2-material/components/checkbox/checkbox.ts | 12 +- ng2-material/components/content/content.scss | 3 +- ng2-material/components/dialog/dialog.ts | 1 - .../components/dialog/dialog_basic.ts | 29 +- .../components/dialog/dialog_config.ts | 2 - .../components/dialog/dialog_container.ts | 9 +- ng2-material/components/dialog/dialog_ref.ts | 12 +- ng2-material/components/divider/divider.scss | 4 +- ng2-material/components/divider/divider.ts | 5 +- ng2-material/components/form/messages.ts | 20 +- ng2-material/components/form/validators.ts | 43 +-- ng2-material/components/icon/icon.ts | 2 +- ng2-material/components/ink/ink.ts | 3 +- ng2-material/components/input/input.scss | 1 - ng2-material/components/input/input.ts | 1 - ng2-material/components/list/list.scss | 36 +-- ng2-material/components/list/list.ts | 15 +- ng2-material/components/peekaboo/peekaboo.ts | 30 +- .../progress_circular/progress_circular.ts | 23 +- .../progress_linear/progress_linear.ts | 29 +- .../components/radio/radio_button.scss | 7 +- ng2-material/components/radio/radio_button.ts | 24 +- .../components/radio/radio_dispatcher.ts | 2 +- ng2-material/components/sidenav/sidenav.scss | 1 - .../components/sidenav/sidenav_service.ts | 4 +- .../components/subheader/subheader.scss | 2 +- .../components/subheader/subheader.ts | 4 +- ng2-material/components/switcher/switch.scss | 4 +- ng2-material/components/switcher/switch.ts | 4 +- ng2-material/components/tabs/tabs.ts | 34 +- ng2-material/components/toolbar/toolbar.scss | 2 +- ng2-material/components/toolbar/toolbar.ts | 18 +- .../components/whiteframe/whiteframe.scss | 27 +- ng2-material/core/key_codes.ts | 14 +- ng2-material/core/style/default-theme.scss | 2 - ng2-material/core/style/layout.scss | 298 +++++++++++------- ng2-material/core/style/palette.scss | 2 - ng2-material/core/style/shadows.scss | 4 +- ng2-material/core/style/structure.scss | 15 +- ng2-material/core/style/theme-functions.scss | 2 - ng2-material/core/style/typography.scss | 12 +- ng2-material/core/style/variables.scss | 40 +-- ng2-material/core/util/animate.ts | 46 ++- ng2-material/core/util/media.ts | 8 +- ng2-material/core/util/util.ts | 9 +- ng2-material/webpack_all.ts | 4 +- ng2-material/webpack_styles.ts | 2 +- package.json | 10 +- test/bootstrap.ts | 5 +- test/components/backdrop/backdrop_spec.ts | 11 +- test/components/button/button_spec.ts | 2 +- test/components/checkbox/checkbox_spec.ts | 8 +- test/components/dialog/dialog_spec.ts | 2 +- test/components/form/messages_spec.ts | 8 +- test/components/form/validators_spec.ts | 2 +- test/components/ink/ink_spec.ts | 2 +- test/components/input/input_spec.ts | 15 +- test/components/peekaboo/peekaboo_spec.ts | 8 +- .../progress_circular_spec.ts | 8 +- .../progress_linear/progress_linear_spec.ts | 8 +- test/components/radio/radio_spec.ts | 2 +- .../sidenav/sidenav_service_spec.ts | 8 +- test/components/sidenav/sidenav_spec.ts | 12 +- test/components/tabs/tabs_spec.ts | 8 +- test/components/toolbar/toolbar_spec.ts | 2 +- test/test_url_resolver.ts | 2 +- test/util.ts | 2 +- 117 files changed, 874 insertions(+), 740 deletions(-) diff --git a/examples/all.ts b/examples/all.ts index 14480ef5..d24f6fb8 100644 --- a/examples/all.ts +++ b/examples/all.ts @@ -1,21 +1,20 @@ // TODO(jd): auto generate import/exports for examples during the grunt site-meta task. -import {CONST_EXPR, Type} from 'angular2/src/facade/lang'; - -import CardBasicUsage from './components/card/basic_usage'; -import CardInlineActions from './components/card/inline_actions'; -import ButtonBasicUsage from './components/button/basic_usage'; -import CardActionButtons from './components/card/action_buttons'; -import DialogBasicUsage from './components/dialog/basic_usage'; -import ToolbarBasicUsage from './components/toolbar/basic_usage'; -import ToolbarScrollShrink from './components/toolbar/scroll_shrink'; -import ProgressLinearBasicUsage from './components/progress_linear/basic_usage'; -import ProgressCircularBasicUsage from './components/progress_circular/basic_usage'; -import RadioBasicUsage from './components/radio/basic_usage'; -import SwitchBasicUsage from './components/switch/basic_usage'; -import TabsDynamicHeight from './components/tabs/dynamic_height'; -import TabsDynamicTabs from './components/tabs/dynamic_tabs'; +import {CONST_EXPR, Type} from "angular2/src/facade/lang"; +import CardBasicUsage from "./components/card/basic_usage"; +import CardInlineActions from "./components/card/inline_actions"; +import ButtonBasicUsage from "./components/button/basic_usage"; +import CardActionButtons from "./components/card/action_buttons"; +import DialogBasicUsage from "./components/dialog/basic_usage"; +import ToolbarBasicUsage from "./components/toolbar/basic_usage"; +import ToolbarScrollShrink from "./components/toolbar/scroll_shrink"; +import ProgressLinearBasicUsage from "./components/progress_linear/basic_usage"; +import ProgressCircularBasicUsage from "./components/progress_circular/basic_usage"; +import RadioBasicUsage from "./components/radio/basic_usage"; +import SwitchBasicUsage from "./components/switch/basic_usage"; +import TabsDynamicHeight from "./components/tabs/dynamic_height"; +import TabsDynamicTabs from "./components/tabs/dynamic_tabs"; import CheckboxBasicUsage from "./components/checkbox/basic_usage"; import CheckboxSyncing from "./components/checkbox/syncing"; import ListBasicUsage from "./components/list/basic_usage"; diff --git a/examples/app.scss b/examples/app.scss index cdc685a8..a8754e90 100644 --- a/examples/app.scss +++ b/examples/app.scss @@ -16,13 +16,13 @@ demos-app { .app-menu { border-right: 1px solid md-color($md-foreground, divider); md-list-item { - font-size:$subheader-font-size; - font-weight:$subheader-font-weight; + font-size: $subheader-font-size; + font-weight: $subheader-font-weight; cursor: pointer; will-change: color; transition: color $swift-ease-in-duration $swift-ease-in-timing-function; &.md-active { - color: md-color($md-primary,500); + color: md-color($md-primary, 500); } } md-toolbar { diff --git a/examples/app.ts b/examples/app.ts index 9c26afc8..e74c5bc5 100644 --- a/examples/app.ts +++ b/examples/app.ts @@ -1,4 +1,4 @@ -import {Component, View, enableProdMode, bind, Input, OnDestroy, ApplicationRef} from "angular2/core"; +import {Component, enableProdMode, bind, Input, OnDestroy, ApplicationRef} from "angular2/core"; import {bootstrap} from "angular2/platform/browser"; import { ROUTER_PROVIDERS, @@ -24,11 +24,11 @@ import {Media} from "ng2-material/core/util/media"; * Describe an example that can be dynamically loaded. */ export interface IExampleData { - template:string; - source:string; - styles:string; - component:string; - name:string; + template: string; + source: string; + styles: string; + component: string; + name: string; } @RouteConfig([ @@ -91,7 +91,7 @@ export class DemosApp implements OnDestroy { this._sidenav.show('menu'); } - navigate(to:any) { + navigate(to: any) { this.router.navigate(to); } diff --git a/examples/components/button/basic_usage.html b/examples/components/button/basic_usage.html index 4c80f63b..6d5d611f 100644 --- a/examples/components/button/basic_usage.html +++ b/examples/components/button/basic_usage.html @@ -1,4 +1,3 @@ -
@@ -18,37 +17,37 @@
- + - + - + - + - + - +
FAB
- Default Link - Primary Link + Default Link + Primary Link - +
Link vs. Button
@@ -71,11 +70,11 @@ more_vert + title="Launch Google.com in new window" + target="_blank" + disabled="true" + aria-label="Google.com" + class="md-icon-button launch"> launch
Icon Button
diff --git a/examples/components/button/basic_usage.ts b/examples/components/button/basic_usage.ts index ca9c0aa4..66ec1351 100644 --- a/examples/components/button/basic_usage.ts +++ b/examples/components/button/basic_usage.ts @@ -1,5 +1,5 @@ -import {View, Component} from 'angular2/core'; -import {MATERIAL_DIRECTIVES} from 'ng2-material/all'; +import {Component} from "angular2/core"; +import {MATERIAL_DIRECTIVES} from "ng2-material/all"; @Component({ diff --git a/examples/components/card/action_buttons.scss b/examples/components/card/action_buttons.scss index b7ef04cd..2c979934 100644 --- a/examples/components/card/action_buttons.scss +++ b/examples/components/card/action_buttons.scss @@ -1,6 +1,7 @@ [md-button] [md-icon] { - color: rgba(0,0,0,0.8); + color: rgba(0, 0, 0, 0.8); } + md-card-content { p { margin-bottom: 15px; diff --git a/examples/components/card/action_buttons.ts b/examples/components/card/action_buttons.ts index 4c8e5cd1..ed158ed8 100644 --- a/examples/components/card/action_buttons.ts +++ b/examples/components/card/action_buttons.ts @@ -1,5 +1,5 @@ -import {View, Component} from 'angular2/core'; -import {MATERIAL_DIRECTIVES} from 'ng2-material/all'; +import {Component} from "angular2/core"; +import {MATERIAL_DIRECTIVES} from "ng2-material/all"; @Component({ selector: 'card-action-buttons', diff --git a/examples/components/card/basic_usage.scss b/examples/components/card/basic_usage.scss index 4b39c567..1423dad2 100644 --- a/examples/components/card/basic_usage.scss +++ b/examples/components/card/basic_usage.scss @@ -2,6 +2,7 @@ .card-media { background-color: #999999; } + [md-button] [md-icon] { - color: rgba(0,0,0,0.8); + color: rgba(0, 0, 0, 0.8); } diff --git a/examples/components/card/basic_usage.ts b/examples/components/card/basic_usage.ts index d1f0b829..c3870fcd 100644 --- a/examples/components/card/basic_usage.ts +++ b/examples/components/card/basic_usage.ts @@ -1,5 +1,5 @@ -import {View, Component} from 'angular2/core'; -import {MATERIAL_DIRECTIVES} from 'ng2-material/all'; +import {Component} from "angular2/core"; +import {MATERIAL_DIRECTIVES} from "ng2-material/all"; @Component({ selector: 'card-basic-usage', diff --git a/examples/components/card/inline_actions.scss b/examples/components/card/inline_actions.scss index b2d05b09..04aa3c5a 100644 --- a/examples/components/card/inline_actions.scss +++ b/examples/components/card/inline_actions.scss @@ -1,3 +1,3 @@ [md-button] [md-icon] { - color: rgba(0,0,0,0.8); + color: rgba(0, 0, 0, 0.8); } diff --git a/examples/components/card/inline_actions.ts b/examples/components/card/inline_actions.ts index 5ef5bd21..e4c32fa9 100644 --- a/examples/components/card/inline_actions.ts +++ b/examples/components/card/inline_actions.ts @@ -1,5 +1,5 @@ -import {View, Component} from 'angular2/core'; -import {MATERIAL_DIRECTIVES} from 'ng2-material/all'; +import {Component} from "angular2/core"; +import {MATERIAL_DIRECTIVES} from "ng2-material/all"; @Component({ selector: 'card-inline-actions', diff --git a/examples/components/checkbox/basic_usage.scss b/examples/components/checkbox/basic_usage.scss index 2730b1ad..1f1e1bd5 100644 --- a/examples/components/checkbox/basic_usage.scss +++ b/examples/components/checkbox/basic_usage.scss @@ -1,23 +1,29 @@ div.flex-xs { - min-height:40px; + min-height: 40px; } + .checkboxDemo1 div { clear: both; } + .checkboxDemo1 md-checkbox { float: left; } + p { padding-left: 8px; } + fieldset.standard { border-style: solid; border-width: 1px; } + legend { color: #3F51B5; } + legend code { color: #3F51B5; font-weight: normal; diff --git a/examples/components/checkbox/basic_usage.ts b/examples/components/checkbox/basic_usage.ts index 499612fe..5e3175e2 100644 --- a/examples/components/checkbox/basic_usage.ts +++ b/examples/components/checkbox/basic_usage.ts @@ -1,5 +1,5 @@ -import {View, Component} from 'angular2/core'; -import {MATERIAL_DIRECTIVES} from 'ng2-material/all'; +import {Component} from "angular2/core"; +import {MATERIAL_DIRECTIVES} from "ng2-material/all"; @Component({ selector: 'checkbox-basic-usage', diff --git a/examples/components/checkbox/syncing.ts b/examples/components/checkbox/syncing.ts index d77d7364..4a5edd27 100644 --- a/examples/components/checkbox/syncing.ts +++ b/examples/components/checkbox/syncing.ts @@ -1,5 +1,5 @@ -import {View, Component} from 'angular2/core'; -import {MATERIAL_DIRECTIVES} from 'ng2-material/all'; +import {Component} from "angular2/core"; +import {MATERIAL_DIRECTIVES} from "ng2-material/all"; @Component({ selector: 'checkbox-syncing', diff --git a/examples/components/dialog/basic_usage.html b/examples/components/dialog/basic_usage.html index b4de8e66..c204585c 100644 --- a/examples/components/dialog/basic_usage.html +++ b/examples/components/dialog/basic_usage.html @@ -15,8 +15,9 @@ Custom Dialog
- Custom Dialog Fullscreen -
+ Custom Dialog Fullscreen + + diff --git a/examples/components/dialog/basic_usage.ts b/examples/components/dialog/basic_usage.ts index 9f05867a..325652ca 100644 --- a/examples/components/dialog/basic_usage.ts +++ b/examples/components/dialog/basic_usage.ts @@ -1,7 +1,5 @@ -import {View, Component} from 'angular2/core'; -import {MATERIAL_DIRECTIVES,MdDialog} from 'ng2-material/all'; -import {ElementRef} from "angular2/core"; -import {Input} from "angular2/core"; +import {Component, ElementRef} from "angular2/core"; +import {MATERIAL_DIRECTIVES, MdDialog} from "ng2-material/all"; import {DOM} from "angular2/src/platform/dom/dom_adapter"; import {MdDialogConfig, MdDialogBasic, MdDialogRef} from "ng2-material/components/dialog/dialog"; import {Media} from "../../../ng2-material/core/util/media"; diff --git a/examples/components/input/basic_usage.scss b/examples/components/input/basic_usage.scss index d694abea..3533b46d 100644 --- a/examples/components/input/basic_usage.scss +++ b/examples/components/input/basic_usage.scss @@ -6,7 +6,7 @@ width: 256px; height: 256px; font-size: 256px; - color: md-color($md-primary,900,0.6); + color: md-color($md-primary, 900, 0.6); } md-toolbar[md-hero] { diff --git a/examples/components/input/basic_usage.ts b/examples/components/input/basic_usage.ts index be7c9abd..1c923600 100644 --- a/examples/components/input/basic_usage.ts +++ b/examples/components/input/basic_usage.ts @@ -1,6 +1,6 @@ -import {View, Component} from 'angular2/core'; -import {MATERIAL_DIRECTIVES} from 'ng2-material/all'; -import {FORM_DIRECTIVES, Validators} from 'angular2/common'; +import {Component} from "angular2/core"; +import {MATERIAL_DIRECTIVES} from "ng2-material/all"; +import {FORM_DIRECTIVES} from "angular2/common"; @Component({ selector: 'input-basic-usage', diff --git a/examples/components/input/form_builder.ts b/examples/components/input/form_builder.ts index 54451287..0ce8cda7 100644 --- a/examples/components/input/form_builder.ts +++ b/examples/components/input/form_builder.ts @@ -1,6 +1,12 @@ -import {View, Component} from 'angular2/core'; -import {MdPatternValidator, MdMinValueValidator, MdNumberRequiredValidator, MdMaxValueValidator, MATERIAL_DIRECTIVES} from 'ng2-material/all'; -import {FORM_DIRECTIVES, Validators, FormBuilder, ControlGroup} from 'angular2/common'; +import {Component} from "angular2/core"; +import { + MdPatternValidator, + MdMinValueValidator, + MdNumberRequiredValidator, + MdMaxValueValidator, + MATERIAL_DIRECTIVES +} from "ng2-material/all"; +import {FORM_DIRECTIVES, Validators, FormBuilder, ControlGroup} from "angular2/common"; @Component({ selector: 'input-form-builder', @@ -16,6 +22,7 @@ export default class InputFormBuilder { description: 'Nuclear Missile Defense System', rate: 500 }; + constructor(fb: FormBuilder) { this.projectForm = fb.group({ 'clientName': ['', Validators.required], diff --git a/examples/components/list/basic_usage.ts b/examples/components/list/basic_usage.ts index fa285dc0..74a1b007 100644 --- a/examples/components/list/basic_usage.ts +++ b/examples/components/list/basic_usage.ts @@ -1,5 +1,5 @@ -import {View, Component} from 'angular2/core'; -import {MATERIAL_DIRECTIVES} from 'ng2-material/all'; +import {Component} from "angular2/core"; +import {MATERIAL_DIRECTIVES} from "ng2-material/all"; let imagePath = 'public/images/avatars/avatar11.svg'; diff --git a/examples/components/progress_circular/basic_usage.html b/examples/components/progress_circular/basic_usage.html index 00ff98cb..d427597e 100644 --- a/examples/components/progress_circular/basic_usage.html +++ b/examples/components/progress_circular/basic_usage.html @@ -2,7 +2,7 @@

Determinate

For operations where the percentage of the operation completed can be determined, use a determinate indicator. They - give users a quick sense of how long an operation will take.

+ give users a quick sense of how long an operation will take.

@@ -10,7 +10,7 @@

Determinate

Indeterminate

For operations where the user is asked to wait a moment while something finishes up, and it's not necessary to - expose what's happening behind the scenes and how long it will take, use an indeterminate indicator.

+ expose what's happening behind the scenes and how long it will take, use an indeterminate indicator.

diff --git a/examples/components/progress_circular/basic_usage.ts b/examples/components/progress_circular/basic_usage.ts index 3e146d98..995054da 100644 --- a/examples/components/progress_circular/basic_usage.ts +++ b/examples/components/progress_circular/basic_usage.ts @@ -1,5 +1,5 @@ -import {View, Component} from 'angular2/core'; -import {MATERIAL_DIRECTIVES} from 'ng2-material/all'; +import {Component} from "angular2/core"; +import {MATERIAL_DIRECTIVES} from "ng2-material/all"; @Component({ selector: 'progress-circular-basic-usage', @@ -8,9 +8,9 @@ import {MATERIAL_DIRECTIVES} from 'ng2-material/all'; directives: [MATERIAL_DIRECTIVES] }) export default class ProgressCircularBasicUsage { - public determinateValue:number = 30; - public deactivated:boolean = false; - public mode:string; + public determinateValue: number = 30; + public deactivated: boolean = false; + public mode: string; constructor() { // Iterate every 100ms, non-stop diff --git a/examples/components/progress_linear/basic_usage.ts b/examples/components/progress_linear/basic_usage.ts index b316aabb..cf7f677a 100644 --- a/examples/components/progress_linear/basic_usage.ts +++ b/examples/components/progress_linear/basic_usage.ts @@ -1,5 +1,5 @@ -import {View, Component} from 'angular2/core'; -import {MATERIAL_DIRECTIVES} from 'ng2-material/all'; +import {Component} from "angular2/core"; +import {MATERIAL_DIRECTIVES} from "ng2-material/all"; @Component({ selector: 'progress-linear-basic-usage', diff --git a/examples/components/radio/basic_usage.ts b/examples/components/radio/basic_usage.ts index 015fbfc7..95229037 100644 --- a/examples/components/radio/basic_usage.ts +++ b/examples/components/radio/basic_usage.ts @@ -1,5 +1,5 @@ -import {View, Component} from 'angular2/core'; -import {MATERIAL_DIRECTIVES} from 'ng2-material/all'; +import {Component} from "angular2/core"; +import {MATERIAL_DIRECTIVES} from "ng2-material/all"; // TODO (jdd): diff --git a/examples/components/sidenav/basic_usage.ts b/examples/components/sidenav/basic_usage.ts index c950f8a5..b44a5923 100644 --- a/examples/components/sidenav/basic_usage.ts +++ b/examples/components/sidenav/basic_usage.ts @@ -1,5 +1,5 @@ -import {View, Component} from 'angular2/core'; -import {MATERIAL_DIRECTIVES, Media, SidenavService} from 'ng2-material/all'; +import {Component} from "angular2/core"; +import {MATERIAL_DIRECTIVES, Media, SidenavService} from "ng2-material/all"; @Component({ diff --git a/examples/components/switch/basic_usage.ts b/examples/components/switch/basic_usage.ts index 4c59ee28..9d16e18a 100644 --- a/examples/components/switch/basic_usage.ts +++ b/examples/components/switch/basic_usage.ts @@ -1,9 +1,9 @@ -import {View, Component} from 'angular2/core'; -import {MATERIAL_DIRECTIVES} from 'ng2-material/all'; +import {Component} from "angular2/core"; +import {MATERIAL_DIRECTIVES} from "ng2-material/all"; @Component({ selector: 'switch-basic-usage', - templateUrl: 'examples/components/switch/basic_usage.html', + templateUrl: 'examples/components/switch/basic_usage.html', directives: [MATERIAL_DIRECTIVES] }) export default class SwitchBasicUsage { diff --git a/examples/components/tabs/dynamic_height.html b/examples/components/tabs/dynamic_height.html index 3a9f7610..c28a90be 100644 --- a/examples/components/tabs/dynamic_height.html +++ b/examples/components/tabs/dynamic_height.html @@ -1,22 +1,42 @@ - - - - - + + + + + diff --git a/examples/components/tabs/dynamic_height.ts b/examples/components/tabs/dynamic_height.ts index 0deae86e..f03d22cd 100644 --- a/examples/components/tabs/dynamic_height.ts +++ b/examples/components/tabs/dynamic_height.ts @@ -1,5 +1,5 @@ -import {View, Component, ViewEncapsulation} from 'angular2/core'; -import {MATERIAL_DIRECTIVES} from 'ng2-material/all'; +import {Component, ViewEncapsulation} from "angular2/core"; +import {MATERIAL_DIRECTIVES} from "ng2-material/all"; @Component({ selector: 'tabs-dynamic-height', diff --git a/examples/components/tabs/dynamic_tabs.html b/examples/components/tabs/dynamic_tabs.html index bbe6e472..ef4d6935 100644 --- a/examples/components/tabs/dynamic_tabs.html +++ b/examples/components/tabs/dynamic_tabs.html @@ -1,8 +1,8 @@