| OLD | NEW |
|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <!-- | 2 <!-- |
| 3 Copyright (c) 2014 The Chromium Authors. All rights reserved. | 3 Copyright (c) 2014 The Chromium Authors. All rights reserved. |
| 4 Use of this source code is governed by a BSD-style license that can be | 4 Use of this source code is governed by a BSD-style license that can be |
| 5 found in the LICENSE file. | 5 found in the LICENSE file. |
| 6 --> | 6 --> |
| 7 | 7 |
| 8 <link rel="import" href="/tracing/ui/base/dom_helpers.html"> | 8 <link rel="import" href="/tracing/ui/base/dom_helpers.html"> |
| 9 <link rel="import" href="/tracing/ui/base/utils.html"> | 9 <link rel="import" href="/tracing/ui/base/utils.html"> |
| 10 | 10 |
| (...skipping 1480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1491 display: flex; | 1491 display: flex; |
| 1492 } | 1492 } |
| 1493 | 1493 |
| 1494 span { | 1494 span { |
| 1495 flex: 0 1 auto; | 1495 flex: 0 1 auto; |
| 1496 } | 1496 } |
| 1497 | 1497 |
| 1498 #side { | 1498 #side { |
| 1499 -webkit-user-select: none; | 1499 -webkit-user-select: none; |
| 1500 flex: 0 0 auto; | 1500 flex: 0 0 auto; |
| 1501 <<<<<<< HEAD | |
| 1502 <<<<<<< HEAD | |
| 1503 padding-left: 2px; | 1501 padding-left: 2px; |
| 1504 padding-right: 2px; | 1502 padding-right: 2px; |
| 1505 ======= | |
| 1506 padding-left: 4px; | |
| 1507 >>>>>>> 8881d68... Merge origin/master to the polymer branch. | |
| 1508 ======= | |
| 1509 padding-left: 2px; | |
| 1510 padding-right: 2px; | |
| 1511 >>>>>>> d779e0a... [polymer] Merge of master into polymer10-migration | |
| 1512 vertical-align: top; | 1503 vertical-align: top; |
| 1513 font-size: 15px; | 1504 font-size: 15px; |
| 1514 font-family: sans-serif; | 1505 font-family: sans-serif; |
| 1515 display: inline; | 1506 display: inline; |
| 1516 line-height: 85%; | 1507 line-height: 85%; |
| 1517 margin-left: 5px; | 1508 margin-left: 5px; |
| 1518 } | 1509 } |
| 1519 | 1510 |
| 1520 #button { | 1511 #button { |
| 1521 font-weight: bold; | 1512 font-weight: bold; |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1661 get tapCallback() { | 1652 get tapCallback() { |
| 1662 return this.tapCallback_; | 1653 return this.tapCallback_; |
| 1663 }, | 1654 }, |
| 1664 | 1655 |
| 1665 onTap_: function() { | 1656 onTap_: function() { |
| 1666 if (this.tapCallback_) | 1657 if (this.tapCallback_) |
| 1667 this.tapCallback_(); | 1658 this.tapCallback_(); |
| 1668 } | 1659 } |
| 1669 }); | 1660 }); |
| 1670 </script> | 1661 </script> |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2164413002:
[Polymer10 rebase] Fix table.html change markers (Closed)
Base URL: git@github.com:catapult-project/catapult.git@polymer10-rebase