Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action _menu.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action _menu.html"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 3 <link rel="import" href="chrome://resources/html/assert.html"> | 3 <link rel="import" href="chrome://resources/html/assert.html"> |
| 4 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> | 4 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> |
| 5 <link rel="import" href="chrome://resources/html/polymer.html"> | 5 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 6 <link rel="import" href="chrome://resources/html/icon.html"> | 6 <link rel="import" href="chrome://resources/html/icon.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> |
| 8 <link rel="import" href="../controls/extension_controlled_indicator.html"> | 8 <link rel="import" href="../controls/extension_controlled_indicator.html"> |
| 9 <link rel="import" href="../focus_row_behavior.html"> | 9 <link rel="import" href="../focus_row_behavior.html"> |
| 10 <link rel="import" href="search_engine_dialog.html"> | 10 <link rel="import" href="search_engine_dialog.html"> |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 23 align-items: center; | 23 align-items: center; |
| 24 display: flex; | 24 display: flex; |
| 25 } | 25 } |
| 26 | 26 |
| 27 #name-column, | 27 #name-column, |
| 28 #keyword-column { | 28 #keyword-column { |
| 29 flex: 3; | 29 flex: 3; |
| 30 word-break: break-word; | 30 word-break: break-word; |
| 31 } | 31 } |
| 32 | 32 |
| 33 #keyword-column > div, | |
| 33 .favicon-image + div { | 34 .favicon-image + div { |
| 34 -webkit-margin-end: 8px; | 35 -webkit-margin-end: 8px; |
| 35 } | 36 } |
| 36 | 37 |
| 37 #url-column { | 38 #url-column { |
| 38 flex: 4; | 39 flex: 4; |
| 39 } | 40 } |
| 40 | 41 |
| 41 :host(:not([show-dots_])) paper-icon-button { | 42 :host(:not([show-dots_])) paper-icon-button { |
| 42 pointer-events: none; | 43 pointer-events: none; |
| 43 visibility: hidden; | 44 visibility: hidden; |
| 44 } | 45 } |
| 45 </style> | 46 </style> |
| 46 | 47 |
| 47 <template is="dom-if" if="[[showEditSearchEngineDialog_]]" restamp> | 48 <template is="dom-if" if="[[showEditSearchEngineDialog_]]" restamp> |
| 48 <settings-search-engine-dialog model="[[engine]]"> | 49 <settings-search-engine-dialog model="[[engine]]"> |
| 49 </settings-search-engine-dialog> | 50 </settings-search-engine-dialog> |
| 50 </template> | 51 </template> |
| 51 <div class="list-item" focus-row-container> | 52 <div class="list-item" focus-row-container> |
| 52 <div id="name-column"> | 53 <div id="name-column"> |
| 53 <div class="favicon-image" | 54 <div class="favicon-image" |
| 54 style="background-image: [[getIconSet_(engine.iconURL)]]"></div> | 55 style="background-image: [[getIconSet_(engine.iconURL)]]"></div> |
| 55 <div>[[engine.displayName]]</div> | 56 <div>[[engine.displayName]]</div> |
| 56 </div> | 57 </div> |
| 57 <div id="keyword-column">[[engine.keyword]]</div> | 58 <div id="keyword-column"><div>[[engine.keyword]]</div></div> |
|
dpapad
2017/05/16 01:38:59
Need to wrap with an extra div, such that the marg
| |
| 58 <div id="url-column" class="text-elide">[[engine.url]]</div> | 59 <div id="url-column" class="text-elide">[[engine.url]]</div> |
| 59 <paper-icon-button icon="cr:more-vert" on-tap="onDotsTap_" | 60 <paper-icon-button icon="cr:more-vert" on-tap="onDotsTap_" |
| 60 title="$i18n{moreActions}" focus-row-control | 61 title="$i18n{moreActions}" focus-row-control |
| 61 focus-type="cr-menu-button"> | 62 focus-type="cr-menu-button"> |
| 62 </paper-icon-button> | 63 </paper-icon-button> |
| 63 <dialog is="cr-action-menu"> | 64 <dialog is="cr-action-menu"> |
| 64 <button class="dropdown-item" role="option" on-tap="onMakeDefaultTap_" | 65 <button class="dropdown-item" role="option" on-tap="onMakeDefaultTap_" |
| 65 hidden$="[[!engine.canBeDefault]]" id="makeDefault"> | 66 hidden$="[[!engine.canBeDefault]]" id="makeDefault"> |
| 66 $i18n{searchEnginesMakeDefault} | 67 $i18n{searchEnginesMakeDefault} |
| 67 </button> | 68 </button> |
| 68 <button class="dropdown-item" role="option" on-tap="onEditTap_" | 69 <button class="dropdown-item" role="option" on-tap="onEditTap_" |
| 69 hidden$="[[!engine.canBeEdited]]" | 70 hidden$="[[!engine.canBeEdited]]" |
| 70 id="edit">$i18n{edit}</button> | 71 id="edit">$i18n{edit}</button> |
| 71 <button class="dropdown-item" role="option" on-tap="onDeleteTap_" | 72 <button class="dropdown-item" role="option" on-tap="onDeleteTap_" |
| 72 hidden$="[[!engine.canBeRemoved]]" | 73 hidden$="[[!engine.canBeRemoved]]" |
| 73 id="delete">$i18n{searchEnginesRemoveFromList}</button> | 74 id="delete">$i18n{searchEnginesRemoveFromList}</button> |
| 74 </dialog> | 75 </dialog> |
| 75 </div> | 76 </div> |
| 76 <template is="dom-if" if="[[engine.extension]]"> | 77 <template is="dom-if" if="[[engine.extension]]"> |
| 77 <extension-controlled-indicator | 78 <extension-controlled-indicator |
| 78 extension-id="[[engine.extension.id]]" | 79 extension-id="[[engine.extension.id]]" |
| 79 extension-name="[[engine.extension.name]]" | 80 extension-name="[[engine.extension.name]]" |
| 80 extension-can-be-disabled="[[engine.extension.canBeDisabled]]"> | 81 extension-can-be-disabled="[[engine.extension.canBeDisabled]]"> |
| 81 </extension-controlled-indicator> | 82 </extension-controlled-indicator> |
| 82 </template> | 83 </template> |
| 83 </template> | 84 </template> |
| 84 <script src="search_engine_entry.js"></script> | 85 <script src="search_engine_entry.js"></script> |
| 85 </dom-module> | 86 </dom-module> |
| OLD | NEW |