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

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: 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>
(...skipping 11 matching lines...) Expand all
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 {
31 @apply(--layout-flex); 31 @apply(--layout-flex);
32 @apply(--layout-horizontal);
calamity 2016/02/08 00:11:37 Remove.
32 font-size: 16px; 33 font-size: 16px;
33 font-weight: 400; 34 font-weight: 400;
34 padding-left: 24px; 35 padding-left: 24px;
35 } 36 }
36 37
37 #items { 38 #items {
38 margin: 0 auto; 39 margin: 0 auto;
39 max-width: 960px; 40 max-width: 960px;
40 } 41 }
41 42
42 #number-selected { 43 #number-selected {
43 @apply(--layout-flex); 44 @apply(--layout-flex);
44 } 45 }
45 46
46 paper-icon-button { 47 paper-icon-button {
47 height: 36px; 48 height: 36px;
48 margin: 0 24px 0 2px; 49 margin: 0 24px 0 2px;
49 min-width: 36px; 50 min-width: 36px;
50 width: 36px; 51 width: 36px;
51 } 52 }
52 53
54 #clear-browsing-data {
55 flex: 1 1 960px;
56 max-width: 960px;
57 }
58
59 #clear-browsing-data-button {
60 pointer-events: auto;
61 }
calamity 2016/02/08 00:11:37 I think paper-button { pointer-events: auto; }
yingran 2016/02/09 02:17:17 Done.
62
63 #button-container {
64 @apply(--layout-horizontal);
65 @apply(--layout-center);
66 height: inherit;
67 left: 0;
68 pointer-events: none;
69 position: absolute;
70 top: 0;
71 width: 100%;
72 }
73
74 #toolbar-container {
75 @apply(--layout-horizontal);
76 @apply(--layout-center);
77 width: 100%;
78 }
79
80 #front-padding {
81 flex: 1 1 0;
82 min-width: 100px;
83 }
84
85 #back-padding {
86 flex: 1 1 0;
87 }
88
53 [hidden] { 89 [hidden] {
54 display: none !important; 90 display: none !important;
55 } 91 }
56 </style> 92 </style>
57 93
58 <div id="main-content" hidden$="{{itemsSelected_}}"> 94 <div id="toolbar-container">
59 <h1 i18n-content="title" id="title"></h1> 95 <div id="main-content" hidden$="{{itemsSelected_}}">
60 <cr-search-field id="search-input" 96 <h1 i18n-content="title" id="title"></h1>
61 i18n-values="label:search;clear-label:clearSearch"></cr-search-field> 97 <cr-search-field id="search-input"
98 i18n-values="label:search;clear-label:clearSearch"></cr-search-field >
99 </div>
100
101 <div id="items" hidden$="{{!itemsSelected_}}">
102 <paper-icon-button icon="clear" id="cancel-icon-button"
103 on-tap="onClearSelectionTap_"></paper-icon-button>
104 <div id="number-selected">{{numberOfItemsSelected_(count)}}</div>
105 <paper-button id="cancel-button" on-tap="onClearSelectionTap_"
106 i18n-content="cancel"></paper-button>
107 <paper-button id="delete-button" i18n-content="delete"></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_}}">
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"></paper-button> 117 </paper-button>
118 </div>
119 <div id="back-padding"></div>
71 </div> 120 </div>
72
73 </template> 121 </template>
74 <script src="chrome://history/history_toolbar.js"></script> 122 <script src="chrome://history/history_toolbar.js"></script>
75 </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