OLD | NEW |
---|---|
1 <link rel="import" href="../../../../packages/polymer/polymer.html"> | 1 <link rel="import" href="../../../../packages/polymer/polymer.html"> |
2 <link rel="import" href="class_ref.html"> | 2 <link rel="import" href="class_ref.html"> |
3 <link rel="import" href="instance_ref.html"> | 3 <link rel="import" href="instance_ref.html"> |
4 <link rel="import" href="library_ref.html"> | 4 <link rel="import" href="library_ref.html"> |
5 <link rel="import" href="nav_bar.html"> | 5 <link rel="import" href="nav_bar.html"> |
6 <<<<<<< 3c295de444a82389503022ca4d8d7ed6065728f1 | |
6 <link rel="import" href="script_ref.html"> | 7 <link rel="import" href="script_ref.html"> |
8 ======= | |
Cutch
2016/07/25 14:08:21
bad merge
cbernaschina
2016/07/25 15:57:13
Done.
| |
9 <link rel="import" href="observatory_element.html"> | |
10 >>>>>>> Removed references from other elements | |
7 | 11 |
8 | 12 |
9 <polymer-element name="field-view"> | 13 <polymer-element name="field-view"> |
10 <template> | 14 <template> |
11 <link rel="stylesheet" href="css/shared.css"> | 15 <link rel="stylesheet" href="css/shared.css"> |
12 <nav-bar> | 16 <nav-bar> |
13 <top-nav-menu></top-nav-menu> | 17 <top-nav-menu></top-nav-menu> |
14 <vm-nav-menu vm="{{ field.isolate.vm }}"></vm-nav-menu> | 18 <vm-nav-menu vm="{{ field.isolate.vm }}"></vm-nav-menu> |
15 <isolate-nav-menu isolate="{{ field.isolate }}"></isolate-nav-menu> | 19 <isolate-nav-menu isolate="{{ field.isolate }}"></isolate-nav-menu> |
16 <library-nav-menu library="{{ field.library }}"></library-nav-menu> | 20 <library-nav-menu library="{{ field.library }}"></library-nav-menu> |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
95 startPos="{{ field.location.tokenPos }}" | 99 startPos="{{ field.location.tokenPos }}" |
96 endPos="{{ field.location.tokenPos }}"> | 100 endPos="{{ field.location.tokenPos }}"> |
97 </script-inset> | 101 </script-inset> |
98 </div> | 102 </div> |
99 | 103 |
100 <view-footer></view-footer> | 104 <view-footer></view-footer> |
101 </template> | 105 </template> |
102 </polymer-element> | 106 </polymer-element> |
103 | 107 |
104 <script type="application/dart" src="field_view.dart"></script> | 108 <script type="application/dart" src="field_view.dart"></script> |
OLD | NEW |