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

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

Issue 2846973002: MD Settings: Fix cookie exceptions flex layout regression. (Closed)
Patch Set: Created 3 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <link rel="import" href="chrome://resources/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action _menu.html"> 2 <link rel="import" href="chrome://resources/cr_elements/cr_action_menu/cr_action _menu.html">
3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 3 <link rel="import" href="chrome://resources/cr_elements/icons.html">
4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html"> 4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html">
5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">
8 <link rel="import" href="../i18n_setup.html"> 9 <link rel="import" href="../i18n_setup.html">
9 <link rel="import" href="../icons.html"> 10 <link rel="import" href="../icons.html">
10 <link rel="import" href="../route.html"> 11 <link rel="import" href="../route.html">
11 <link rel="import" href="../settings_shared_css.html"> 12 <link rel="import" href="../settings_shared_css.html">
12 <link rel="import" href="add_site_dialog.html"> 13 <link rel="import" href="add_site_dialog.html">
13 <link rel="import" href="constants.html"> 14 <link rel="import" href="constants.html">
14 <link rel="import" href="edit_exception_dialog.html"> 15 <link rel="import" href="edit_exception_dialog.html">
15 <link rel="import" href="site_settings_behavior.html"> 16 <link rel="import" href="site_settings_behavior.html">
16 <link rel="import" href="site_settings_prefs_browser_proxy.html"> 17 <link rel="import" href="site_settings_prefs_browser_proxy.html">
17 18
18 <dom-module id="site-list"> 19 <dom-module id="site-list">
19 <template> 20 <template>
20 <style include="settings-shared"> 21 <style include="settings-shared iron-flex">
21 .selectable { 22 .selectable {
22 -webkit-user-select: text; 23 -webkit-user-select: text;
23 } 24 }
24 </style> 25 </style>
25 <div id="category"> 26 <div id="category">
26 <div class="settings-box first" hidden$="[[allSites]]"> 27 <div class="settings-box first" hidden$="[[allSites]]">
27 <h2 class="start">[[categoryHeader]]</h2> 28 <h2 class="start">[[categoryHeader]]</h2>
28 <paper-button id="addSite" 29 <paper-button id="addSite"
29 class="secondary-button header-aligned-button" 30 class="secondary-button header-aligned-button"
30 hidden="[[readOnlyList]]" on-tap="onAddSiteTap_"> 31 hidden="[[readOnlyList]]" on-tap="onAddSiteTap_">
(...skipping 24 matching lines...) Expand all
55 $i18n{siteSettingsActionReset} 56 $i18n{siteSettingsActionReset}
56 </button> 57 </button>
57 </dialog> 58 </dialog>
58 59
59 <div class="list-frame" hidden$="[[hasSites_(sites)]]"> 60 <div class="list-frame" hidden$="[[hasSites_(sites)]]">
60 <div class="list-item secondary">$i18n{noSitesAdded}</div> 61 <div class="list-item secondary">$i18n{noSitesAdded}</div>
61 </div> 62 </div>
62 <div class="list-frame menu-content vertical-list" id="listContainer"> 63 <div class="list-frame menu-content vertical-list" id="listContainer">
63 <template is="dom-repeat" items="[[sites]]"> 64 <template is="dom-repeat" items="[[sites]]">
64 <div class="list-item"> 65 <div class="list-item">
65 <div class="layout horizontal center flex" 66 <div class="layout horizontal center flex"
dschuyler 2017/04/27 21:57:26 I think "layout horizontal center flex" may be rep
dschuyler 2017/04/27 22:20:54 We just chatted about this and it's a bit more inv
66 actionable$="[[enableSiteSettings_]]" on-tap="onOriginTap_"> 67 actionable$="[[enableSiteSettings_]]" on-tap="onOriginTap_">
67 <div class="favicon-image" 68 <div class="favicon-image"
68 style$="[[computeSiteIcon(item.origin)]]"> 69 style$="[[computeSiteIcon(item.origin)]]">
69 </div> 70 </div>
70 <div class="middle no-min-width"> 71 <div class="middle no-min-width">
71 <div class="selectable text-elide">[[item.displayName]]</div> 72 <div class="selectable text-elide">[[item.displayName]]</div>
72 73
73 <!-- This div must not contain extra whitespace. --> 74 <!-- This div must not contain extra whitespace. -->
74 <div class="selectable secondary text-elide" 75 <div class="selectable secondary text-elide"
75 id="siteDescription">[[computeSiteDescription_(item)]]</div> 76 id="siteDescription">[[computeSiteDescription_(item)]]</div>
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 </div> 109 </div>
109 </div> 110 </div>
110 <template is="dom-if" if="[[showEditExceptionDialog_]]" restamp> 111 <template is="dom-if" if="[[showEditExceptionDialog_]]" restamp>
111 <settings-edit-exception-dialog model="[[actionMenuSite_]]" 112 <settings-edit-exception-dialog model="[[actionMenuSite_]]"
112 on-close="onEditExceptionDialogClosed_"> 113 on-close="onEditExceptionDialogClosed_">
113 </settings-edit-exception-dialog> 114 </settings-edit-exception-dialog>
114 </template> 115 </template>
115 </template> 116 </template>
116 <script src="site_list.js"></script> 117 <script src="site_list.js"></script>
117 </dom-module> 118 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698