diff --git a/examples/stocks-fn/stockarrow.dart b/examples/stocks-fn/stockarrow.dart index 63cebf5502f..82e52815d2e 100644 --- a/examples/stocks-fn/stockarrow.dart +++ b/examples/stocks-fn/stockarrow.dart @@ -74,11 +74,11 @@ class StockArrow extends Component { return new Container( inlineStyle: 'border-color: $border', - styles: [_style], + style: _style, children: [ new Container( inlineStyle: 'border-$type-color: $border', - styles: [up ? _upStyle : _downStyle] + style: up ? _upStyle : _downStyle ) ] ); diff --git a/examples/stocks-fn/stockrow.dart b/examples/stocks-fn/stockrow.dart index cacb3c0d891..6eb9df64803 100644 --- a/examples/stocks-fn/stockrow.dart +++ b/examples/stocks-fn/stockrow.dart @@ -47,23 +47,23 @@ class StockRow extends Component { ), new Container( key: 'Ticker', - styles: [_tickerStyle], + style: _tickerStyle, children: [new Text(stock.symbol)] ), new Container( key: 'LastSale', - styles: [_lastSaleStyle], + style: _lastSaleStyle, children: [new Text(lastSale)] ), new Container( key: 'Change', - styles: [_changeStyle], + style: _changeStyle, children: [new Text(changeInPrice)] ) ]; return new Material( - styles: [_style], + style: _style, children: children ); } diff --git a/examples/stocks-fn/stocksapp.dart b/examples/stocks-fn/stocksapp.dart index c35983ea9ef..e303fbe26ca 100644 --- a/examples/stocks-fn/stocksapp.dart +++ b/examples/stocks-fn/stocksapp.dart @@ -105,19 +105,19 @@ class StocksApp extends App { var toolbar = new Toolbar( children: [ - new Icon(key: 'menu', styles: [_iconStyle], + new Icon(key: 'menu', style: _iconStyle, size: 24, type: 'navigation/menu_white') ..events.listen('click', _drawerAnimation.toggle), new Container( - styles: [_titleStyle], + style: _titleStyle, children: [title] ), - new Icon(key: 'search', styles: [_iconStyle], + new Icon(key: 'search', style: _iconStyle, size: 24, type: 'action/search_white') ..events.listen('click', _handleSearchClick), - new Icon(key: 'more_white', styles: [_iconStyle], + new Icon(key: 'more_white', style: _iconStyle, size: 24, type: 'navigation/more_vert_white') ] @@ -133,7 +133,7 @@ class StocksApp extends App { children: [ new Container( key: 'Content', - styles: [_style], + style: _style, children: [toolbar, list] ), fab, diff --git a/framework/components/button.dart b/framework/components/button.dart index 9f6ceadf87a..0a80bbad1ae 100644 --- a/framework/components/button.dart +++ b/framework/components/button.dart @@ -26,7 +26,7 @@ class Button extends Component { Node build() { return new Material( - styles: [_style], + style: _style, children: [content], level: level ); diff --git a/framework/components/checkbox.dart b/framework/components/checkbox.dart index 64e9d748ae5..bc7e14a2bed 100644 --- a/framework/components/checkbox.dart +++ b/framework/components/checkbox.dart @@ -68,13 +68,13 @@ class Checkbox extends ButtonBase { Node build() { return new Container( - styles: [_style], + style: _style, children: [ new Container( - styles: [highlight ? _containerHighlightStyle : _containerStyle], + style: highlight ? _containerHighlightStyle : _containerStyle, children: [ new Container( - styles: [checked ? _checkedStyle : _uncheckedStyle] + style: checked ? _checkedStyle : _uncheckedStyle ) ] ) diff --git a/framework/components/drawer.dart b/framework/components/drawer.dart index 6c792ccc283..e2cfc99a995 100644 --- a/framework/components/drawer.dart +++ b/framework/components/drawer.dart @@ -150,21 +150,21 @@ class Drawer extends Component { Container mask = new Container( key: 'Mask', - styles: [_maskStyle], + style: _maskStyle, inlineStyle: maskInlineStyle )..events.listen('gesturetap', animation.handleMaskTap) ..events.listen('gestureflingstart', animation.handleFlingStart); Material content = new Material( key: 'Content', - styles: [_contentStyle], + style: _contentStyle, inlineStyle: contentInlineStyle, children: children, level: level ); return new Container( - styles: [_style], + style: _style, inlineStyle: inlineStyle, children: [ mask, content ] ); diff --git a/framework/components/drawer_header.dart b/framework/components/drawer_header.dart index 028792e8ed0..91bb2cf6d0c 100644 --- a/framework/components/drawer_header.dart +++ b/framework/components/drawer_header.dart @@ -33,15 +33,15 @@ class DrawerHeader extends Component { Node build() { return new Container( - styles: [_style], + style: _style, children: [ new Container( key: 'Spacer', - styles: [_spacerStyle] + style: _spacerStyle ), new Container( key: 'Label', - styles: [_labelStyle], + style: _labelStyle, children: children ) ] diff --git a/framework/components/fixed_height_scrollable.dart b/framework/components/fixed_height_scrollable.dart index 6e1605c2e32..5ccaa230562 100644 --- a/framework/components/fixed_height_scrollable.dart +++ b/framework/components/fixed_height_scrollable.dart @@ -74,10 +74,10 @@ abstract class FixedHeightScrollable extends Scrollable { } return new Container( - styles: [_style], + style: _style, children: [ new Container( - styles: [_scrollAreaStyle], + style: _scrollAreaStyle, inlineStyle: transformStyle, children: buildItems(itemNumber, drawCount) ) diff --git a/framework/components/floating_action_button.dart b/framework/components/floating_action_button.dart index 1752710cdc3..93fd61b50be 100644 --- a/framework/components/floating_action_button.dart +++ b/framework/components/floating_action_button.dart @@ -43,17 +43,13 @@ class FloatingActionButton extends Component { if (content != null) children.add(content); - List