| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 import 'package:sky/widgets/theme.dart'; | 5 import 'package:sky/widgets/theme.dart'; |
| 6 | 6 |
| 7 import '../rendering/flex.dart'; | 7 import '../rendering/flex.dart'; |
| 8 import '../theme/shadows.dart'; | 8 import '../theme/shadows.dart'; |
| 9 import '../theme/view_configuration.dart'; | 9 import '../theme/view_configuration.dart'; |
| 10 import 'basic.dart'; | 10 import 'basic.dart'; |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 if (right != null) | 47 if (right != null) |
| 48 children.addAll(right); | 48 children.addAll(right); |
| 49 | 49 |
| 50 return new Container( | 50 return new Container( |
| 51 child: new Flex( | 51 child: new Flex( |
| 52 [new Container(child: new Flex(children), height: kToolBarHeight)], | 52 [new Container(child: new Flex(children), height: kToolBarHeight)], |
| 53 alignItems: FlexAlignItems.flexEnd | 53 alignItems: FlexAlignItems.flexEnd |
| 54 ), | 54 ), |
| 55 padding: new EdgeDims.symmetric(horizontal: 8.0), | 55 padding: new EdgeDims.symmetric(horizontal: 8.0), |
| 56 decoration: new BoxDecoration( | 56 decoration: new BoxDecoration( |
| 57 backgroundColor: backgroundColor == null ? Theme.of(this).primary[500] :
backgroundColor, | 57 backgroundColor: backgroundColor == null ? Theme.of(this).primaryColor :
backgroundColor, |
| 58 boxShadow: shadows[2] | 58 boxShadow: shadows[2] |
| 59 ) | 59 ) |
| 60 ); | 60 ); |
| 61 } | 61 } |
| 62 | 62 |
| 63 } | 63 } |
| OLD | NEW |