Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Side by Side Diff: chrome/browser/resources/settings/site_settings/site_list.html

Issue 2721333007: [MD settings] edlide content exceptions (Closed)
Patch Set: elide secondary line as well Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/polymer.html"> 3 <link rel="import" href="chrome://resources/html/polymer.html">
4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">
7 <link rel="import" href="../i18n_setup.html"> 7 <link rel="import" href="../i18n_setup.html">
8 <link rel="import" href="../icons.html"> 8 <link rel="import" href="../icons.html">
9 <link rel="import" href="../route.html"> 9 <link rel="import" href="../route.html">
10 <link rel="import" href="../settings_shared_css.html"> 10 <link rel="import" href="../settings_shared_css.html">
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 on-tap="onResetTap_"> 57 on-tap="onResetTap_">
58 $i18n{siteSettingsActionReset} 58 $i18n{siteSettingsActionReset}
59 </button> 59 </button>
60 </dialog> 60 </dialog>
61 61
62 <div class="list-frame" hidden$="[[hasSites_(sites)]]"> 62 <div class="list-frame" hidden$="[[hasSites_(sites)]]">
63 <div class="list-item secondary">$i18n{noSitesAdded}</div> 63 <div class="list-item secondary">$i18n{noSitesAdded}</div>
64 </div> 64 </div>
65 <div class="list-frame menu-content vertical-list" id="listContainer"> 65 <div class="list-frame menu-content vertical-list" id="listContainer">
66 <template is="dom-repeat" items="[[sites]]"> 66 <template is="dom-repeat" items="[[sites]]">
67 <div class="list-item"> 67 <div class="list-item" actionable$="[[enableSiteSettings_]]" on-tap="o nOriginTap_">
68 <div class="start layout horizontal center" on-tap="onOriginTap_" 68 <div class="favicon-image"
dschuyler 2017/03/02 01:27:01 The .middle class shouldn't be inside of a .start
tommycli 2017/03/02 16:36:02 Acknowledged.
69 actionable$="[[enableSiteSettings_]]"> 69 style$="[[computeSiteIcon(item.origin)]]">
70 <div class="favicon-image" 70 </div>
71 style$="[[computeSiteIcon(item.origin)]]"> 71 <div class="middle no-min-width">
72 </div> 72 <div class="selectable text-elide">[[item.displayName]]</div>
73 <div class="middle">
74 <div class="selectable">[[item.displayName]]</div>
75 73
76 <!-- This div must not contain extra whitespace. --> 74 <!-- This div must not contain extra whitespace. -->
77 <div class="selectable secondary" id="siteDescription" 75 <div class="selectable secondary text-elide" id="siteDescription"
78 >[[computeSiteDescription_(item)]]</div> 76 >[[computeSiteDescription_(item)]]</div>
79 </div>
80 </div> 77 </div>
81 78
82 <template is="dom-if" if="[[!!computeIconControlledBy_(item)]]"> 79 <template is="dom-if" if="[[!!computeIconControlledBy_(item)]]">
83 <iron-icon icon="[[computeIconControlledBy_(item)]]"></iron-icon> 80 <iron-icon icon="[[computeIconControlledBy_(item)]]"></iron-icon>
84 </template> 81 </template>
85 82
86 <paper-icon-button id="dots" icon="cr:more-vert" 83 <paper-icon-button id="dots" icon="cr:more-vert"
87 hidden="[[isActionMenuHidden_(item.source)]]" 84 hidden="[[isActionMenuHidden_(item.source)]]"
88 on-tap="onShowActionMenuTap_" title="$i18n{moreActions}"> 85 on-tap="onShowActionMenuTap_" title="$i18n{moreActions}">
89 </paper-icon-button> 86 </paper-icon-button>
90 <template is="dom-if" if="[[enableSiteSettings_]]"> 87 <template is="dom-if" if="[[enableSiteSettings_]]">
91 <div on-tap="onOriginTap_" actionable> 88 <div on-tap="onOriginTap_" actionable>
92 <button class="subpage-arrow" is="paper-icon-button-light" 89 <button class="subpage-arrow" is="paper-icon-button-light"
93 aria-label$="[[item.displayName]]" 90 aria-label$="[[item.displayName]]"
94 aria-describedby="siteDescription"></button> 91 aria-describedby="siteDescription"></button>
95 </div> 92 </div>
96 </template> 93 </template>
97 </div> 94 </div>
98 </template> 95 </template>
99 </div> 96 </div>
100 </div> 97 </div>
101 <template is="dom-if" if="[[showEditExceptionDialog_]]" restamp> 98 <template is="dom-if" if="[[showEditExceptionDialog_]]" restamp>
102 <settings-edit-exception-dialog model="[[actionMenuSite_]]" 99 <settings-edit-exception-dialog model="[[actionMenuSite_]]"
103 on-close="onEditExceptionDialogClosed_"> 100 on-close="onEditExceptionDialogClosed_">
104 </settings-edit-exception-dialog> 101 </settings-edit-exception-dialog>
105 </template> 102 </template>
106 </template> 103 </template>
107 <script src="site_list.js"></script> 104 <script src="site_list.js"></script>
108 </dom-module> 105 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698