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

Side by Side Diff: chrome/browser/resources/md_history/history_toolbar.html

Issue 1585473003: MD History: Added a clear browsing data button (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@second_patch
Patch Set: address comments Created 4 years, 10 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 | chrome/browser/resources/md_history/history_toolbar.js » ('j') | 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/polymer/v1_0/polymer/polymer.html"> 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">
5 <link rel="import" href="chrome://resources/cr_elements/cr_search_field/cr_searc h_field.html"> 5 <link rel="import" href="chrome://resources/cr_elements/cr_search_field/cr_searc h_field.html">
6 6
7 <dom-module id="history-toolbar"> 7 <dom-module id="history-toolbar">
8 <template> 8 <template>
9 9
10 <style> 10 <style>
11 :host { 11 :host {
12 background: rgb(63, 85, 102); 12 background: rgb(63, 85, 102);
13 color: #fff; 13 color: #fff;
14 height: 56px; 14 height: 56px;
15 transition: background-color 150ms; 15 transition: background-color 150ms;
16 } 16 }
17 17
18 :host, 18 :host,
19 #items, 19 #items,
20 #main-content { 20 #main-content {
tsergeant 2016/02/09 03:17:52 Add #button-container and #toolbar-container to th
yingran 2016/02/09 04:28:06 Done.
21 @apply(--layout-center); 21 @apply(--layout-center);
22 @apply(--layout-horizontal); 22 @apply(--layout-horizontal);
23 width: 100%; 23 width: 100%;
24 } 24 }
25 25
26 :host([items-selected_]) { 26 :host([items-selected_]) {
27 background: rgb(68, 136, 255); 27 background: rgb(68, 136, 255);
28 } 28 }
29 29
30 h1 { 30 h1 {
(...skipping 12 matching lines...) Expand all
43 @apply(--layout-flex); 43 @apply(--layout-flex);
44 } 44 }
45 45
46 paper-icon-button { 46 paper-icon-button {
47 height: 36px; 47 height: 36px;
48 margin: 0 24px 0 2px; 48 margin: 0 24px 0 2px;
49 min-width: 36px; 49 min-width: 36px;
50 width: 36px; 50 width: 36px;
51 } 51 }
52 52
53 #clear-browsing-data {
54 flex: 1 1 960px;
55 max-width: 960px;
56 }
57
58 paper-button {
59 pointer-events: auto;
60 }
61
62 #button-container {
63 @apply(--layout-horizontal);
64 @apply(--layout-center);
65 height: inherit;
66 left: 0;
67 pointer-events: none;
68 position: absolute;
69 top: 0;
70 width: 100%;
71 }
72
73 #toolbar-container {
74 @apply(--layout-horizontal);
75 @apply(--layout-center);
76 width: 100%;
77 }
78
79 #front-padding {
80 flex: 1 1 0;
81 min-width: 100px;
82 }
83
84 #back-padding {
85 flex: 1 1 0;
86 }
87
53 [hidden] { 88 [hidden] {
54 display: none !important; 89 display: none !important;
55 } 90 }
56 </style> 91 </style>
57 92
58 <div id="main-content" hidden$="{{itemsSelected_}}"> 93 <div id="toolbar-container">
59 <h1 i18n-content="title" id="title"></h1> 94 <div id="main-content" hidden$="{{itemsSelected_}}">
60 <cr-search-field id="search-input" 95 <h1 i18n-content="title" id="title"></h1>
61 i18n-values="label:search;clear-label:clearSearch"></cr-search-field> 96 <cr-search-field id="search-input"
97 i18n-values="label:search;clear-label:clearSearch"></cr-search-field >
98 </div>
99
100 <div id="items" hidden$="{{!itemsSelected_}}">
101 <paper-icon-button icon="clear" id="cancel-icon-button"
102 on-tap="onClearSelectionTap_"></paper-icon-button>
103 <div id="number-selected">{{numberOfItemsSelected_(count)}}</div>
104 <paper-button id="cancel-button" on-tap="onClearSelectionTap_"
105 i18n-content="cancel"></paper-button>
106 <paper-button id="delete-button" i18n-content="delete"
107 on-tap="onDeleteTap_"></paper-button>
108 </div>
62 </div> 109 </div>
63 110
64 <div id="items" hidden$="{{!itemsSelected_}}"> 111 <div id="button-container">
65 <paper-icon-button icon="clear" id="cancel-icon-button" 112 <div id="front-padding"></div>
66 on-tap="onClearSelectionTap_"></paper-icon-button> 113 <div id="clear-browsing-data" hidden$="{{itemsSelected_}}">
tsergeant 2016/02/09 03:17:52 Maybe rename this div to something more generic, i
yingran 2016/02/09 04:28:06 Done.
67 <div id="number-selected">{{numberOfItemsSelected_(count)}}</div> 114 <paper-button on-tap="onClearBrowsingDataTap_"
68 <paper-button id="cancel-button" on-tap="onClearSelectionTap_" 115 i18n-content="clearBrowsingData"
69 i18n-content="cancel"></paper-button> 116 id="clear-browsing-data-button">
70 <paper-button id="delete-button" i18n-content="delete" 117 </paper-button>
71 on-tap="onDeleteTap_"></paper-button> 118 </div>
119 <div id="back-padding"></div>
72 </div> 120 </div>
73
74 </template> 121 </template>
75 <script src="chrome://history/history_toolbar.js"></script> 122 <script src="chrome://history/history_toolbar.js"></script>
76 </dom-module> 123 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/md_history/history_toolbar.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698