Commit 4c15a968 authored by Hixie's avatar Hixie

[Layout] Put in some guards to prevent us from reintroducing 'display' properties into the CSS.

R=eseidel@chromium.org

Review URL: https://codereview.chromium.org/1132983007
parent d7138735
...@@ -4,13 +4,12 @@ ...@@ -4,13 +4,12 @@
import 'dart:math'; import 'dart:math';
import 'package:sky/framework/fn.dart'; import 'package:sky/framework/fn.dart';
import 'package:sky/framework/layout.dart';
class StockArrow extends Component { class StockArrow extends Component {
static final Style _style = new Style(''' static final Style _style = new Style('''
width: 40px; width: 40px;
height: 40px; height: 40px;
display: flex;
flex-direction: row;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
border-radius: 40px; border-radius: 40px;
...@@ -79,8 +78,9 @@ class StockArrow extends Component { ...@@ -79,8 +78,9 @@ class StockArrow extends Component {
bool up = percentChange > 0; bool up = percentChange > 0;
String type = up ? 'bottom' : 'top'; String type = up ? 'bottom' : 'top';
return new Container( return new FlexContainer(
inlineStyle: 'border-color: $border', inlineStyle: 'border-color: $border',
direction: FlexDirection.Row,
style: _style, style: _style,
children: [ children: [
new Container( new Container(
......
...@@ -4,14 +4,13 @@ ...@@ -4,14 +4,13 @@
import 'package:sky/framework/components/ink_well.dart'; import 'package:sky/framework/components/ink_well.dart';
import 'package:sky/framework/fn.dart'; import 'package:sky/framework/fn.dart';
import 'package:sky/framework/layout.dart';
import 'package:sky/framework/theme/typography.dart' as typography; import 'package:sky/framework/theme/typography.dart' as typography;
import 'stock_arrow.dart'; import 'stock_arrow.dart';
import 'stock_data.dart'; import 'stock_data.dart';
class StockRow extends Component { class StockRow extends Component {
static final Style _style = new Style(''' static final Style _style = new Style('''
display: flex;
flex-direction: row;
align-items: center; align-items: center;
border-bottom: 1px solid #F4F4F4; border-bottom: 1px solid #F4F4F4;
padding-top: 16px; padding-top: 16px;
...@@ -20,9 +19,7 @@ class StockRow extends Component { ...@@ -20,9 +19,7 @@ class StockRow extends Component {
padding-bottom: 20px;''' padding-bottom: 20px;'''
); );
static final Style _tickerStyle = new Style(''' static final FlexBoxParentData _tickerFlex = new FlexBoxParentData()..flex = 1;
flex: 1;'''
);
static final Style _lastSaleStyle = new Style(''' static final Style _lastSaleStyle = new Style('''
text-align: right; text-align: right;
...@@ -51,10 +48,12 @@ class StockRow extends Component { ...@@ -51,10 +48,12 @@ class StockRow extends Component {
new StockArrow( new StockArrow(
percentChange: stock.percentChange percentChange: stock.percentChange
), ),
new Container( new ParentDataNode(
key: 'Ticker', new Container(
style: _tickerStyle, key: 'Ticker',
children: [new Text(stock.symbol)] children: [new Text(stock.symbol)]
),
_tickerFlex
), ),
new Container( new Container(
key: 'LastSale', key: 'LastSale',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment