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

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

Issue 2044963003: Site Settings Desktop: Change how adding site exceptions work. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address feedback Created 4 years, 6 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/icons.html"> 1 <link rel="import" href="chrome://resources/cr_elements/icons.html">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> 4 <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/paper-button/paper-butt on.html">
5 <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">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submen u.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submen u.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu-button/paper -menu-button.html"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu-button/paper -menu-button.html">
9 <link rel="import" href="/i18n_setup.html"> 10 <link rel="import" href="/i18n_setup.html">
10 <link rel="import" href="/icons.html"> 11 <link rel="import" href="/icons.html">
11 <link rel="import" href="/settings_shared_css.html"> 12 <link rel="import" href="/settings_shared_css.html">
13 <link rel="import" href="/site_settings/add_site_dialog.html">
12 <link rel="import" href="/site_settings/constants.html"> 14 <link rel="import" href="/site_settings/constants.html">
13 <link rel="import" href="/site_settings/site_settings_behavior.html"> 15 <link rel="import" href="/site_settings/site_settings_behavior.html">
14 <link rel="import" href="/site_settings/site_settings_prefs_browser_proxy.html"> 16 <link rel="import" href="/site_settings/site_settings_prefs_browser_proxy.html">
15 17
16 <dom-module id="settings-site-list"> 18 <dom-module id="settings-site-list">
17 <template> 19 <template>
18 <style include="settings-shared"> 20 <style include="settings-shared">
19 paper-menu-button { 21 paper-menu-button {
20 left: 8px; 22 left: 8px;
21 margin: 0; 23 margin: 0;
22 padding: 0; 24 padding: 0;
23 } 25 right: 8px;
26 }
27
28 .button-container {
29 -webkit-margin-start: -4px;
30 }
31
32 .no-upper {
33 text-transform: none;
34 }
24 </style> 35 </style>
25 <paper-submenu id="category" hidden 36 <paper-submenu id="category" hidden
26 on-paper-submenu-open="onToggle_" on-paper-submenu-close="onToggle_"> 37 on-paper-submenu-open="onToggle_" on-paper-submenu-close="onToggle_">
27 <div class="menu-trigger settings-box" hidden$="[[allSites]]"> 38 <div class="menu-trigger settings-box" hidden$="[[allSites]]">
28 <div class="flex" id="header"> 39 <div class="flex" id="header">
29 [[computeSiteListHeader_(sites, categoryEnabled)]] 40 [[computeSiteListHeader_(sites, categoryEnabled)]]
30 </div> 41 </div>
31 <iron-icon id="icon" icon="cr:expand-more"></iron-icon> 42 <iron-icon id="icon" icon="cr:expand-more"></iron-icon>
32 </div> 43 </div>
33 44
(...skipping 20 matching lines...) Expand all
54 hidden="[[!showBlockAction_]]"> 65 hidden="[[!showBlockAction_]]">
55 [[i18n_.blockAction]] 66 [[i18n_.blockAction]]
56 </paper-item> 67 </paper-item>
57 <paper-item value="[[actions_.RESET]]"> 68 <paper-item value="[[actions_.RESET]]">
58 [[i18n_.resetAction]] 69 [[i18n_.resetAction]]
59 </paper-item> 70 </paper-item>
60 </paper-menu> 71 </paper-menu>
61 </paper-menu-button> 72 </paper-menu-button>
62 </div> 73 </div>
63 </template> 74 </template>
75
76 <div class="button-container">
77 <paper-button on-tap="onAddSiteTap_" class="primary-button no-upper">
78 $i18n{addSiteLink}
79 </paper-button>
80 </div>
64 </div> 81 </div>
65 </paper-submenu> 82 </paper-submenu>
66 </template> 83 </template>
67 <script src="site_list.js"></script> 84 <script src="site_list.js"></script>
68 </dom-module> 85 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698