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

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

Issue 1847273002: MD History: Update Search Icon Margins (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/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 <link rel="import" href="chrome://history/shared_style.html"> 6 <link rel="import" href="chrome://history/shared_style.html">
7 7
8 <dom-module id="history-toolbar"> 8 <dom-module id="history-toolbar">
9 <template> 9 <template>
10 <style include="shared-style"></style> 10 <style include="shared-style"></style>
(...skipping 19 matching lines...) Expand all
30 background: rgb(68, 136, 255); 30 background: rgb(68, 136, 255);
31 } 31 }
32 32
33 h1 { 33 h1 {
34 @apply(--layout-flex); 34 @apply(--layout-flex);
35 font-size: 16px; 35 font-size: 16px;
36 font-weight: 400; 36 font-weight: 400;
37 padding-left: 24px; 37 padding-left: 24px;
38 } 38 }
39 39
40 #search {
41 -webkit-padding-end: 10px;
42 box-sizing: border-box;
tsergeant 2016/04/04 00:10:34 I don't think that box-sizing, display:flex or jus
lshang 2016/04/05 00:21:52 Done.
43 display: flex;
44 justify-content: flex-end;
45 }
46
40 #items { 47 #items {
41 margin: 0 auto; 48 margin: 0 auto;
42 max-width: var(--card-max-width); 49 max-width: var(--card-max-width);
43 } 50 }
44 51
45 #number-selected { 52 #number-selected {
46 @apply(--layout-flex); 53 @apply(--layout-flex);
47 } 54 }
48 55
49 paper-icon-button { 56 paper-icon-button {
(...skipping 24 matching lines...) Expand all
74 min-width: 100px; 81 min-width: 100px;
75 } 82 }
76 83
77 #back-padding { 84 #back-padding {
78 flex: 1 1 0; 85 flex: 1 1 0;
79 } 86 }
80 </style> 87 </style>
81 <div id="toolbar-container"> 88 <div id="toolbar-container">
82 <div id="main-content" hidden$="[[itemsSelected_]]"> 89 <div id="main-content" hidden$="[[itemsSelected_]]">
83 <h1 id="title">$i18n{title}</h1> 90 <h1 id="title">$i18n{title}</h1>
84 <cr-search-field id="search-input" label="$i18n{search}" 91 <div id="search">
85 clear-label="$i18n{clearSearch}"> 92 <cr-search-field id="search-input" label="$i18n{search}"
86 </cr-search-field> 93 clear-label="$i18n{clearSearch}">
94 </cr-search-field>
95 </div>
87 </div> 96 </div>
88 97
89 <div id="items" hidden$="[[!itemsSelected_]]"> 98 <div id="items" hidden$="[[!itemsSelected_]]">
90 <paper-icon-button icon="clear" id="cancel-icon-button" 99 <paper-icon-button icon="clear" id="cancel-icon-button"
91 on-tap="onClearSelectionTap_"></paper-icon-button> 100 on-tap="onClearSelectionTap_"></paper-icon-button>
92 <div id="number-selected">[[numberOfItemsSelected_(count)]]</div> 101 <div id="number-selected">[[numberOfItemsSelected_(count)]]</div>
93 <paper-button id="cancel-button" on-tap="onClearSelectionTap_"> 102 <paper-button id="cancel-button" on-tap="onClearSelectionTap_">
94 $i18n{cancel} 103 $i18n{cancel}
95 </paper-button> 104 </paper-button>
96 <paper-button id="delete-button" on-tap="onDeleteTap_"> 105 <paper-button id="delete-button" on-tap="onDeleteTap_">
97 $i18n{delete} 106 $i18n{delete}
98 </paper-button> 107 </paper-button>
99 </div> 108 </div>
100 </div> 109 </div>
101 110
102 <div id="button-container" class="toolbar-overlay"> 111 <div id="button-container" class="toolbar-overlay">
103 <div id="front-padding"></div> 112 <div id="front-padding"></div>
104 <div id="centered-buttons" hidden$="[[itemsSelected_]]"> 113 <div id="centered-buttons" hidden$="[[itemsSelected_]]">
105 <paper-button on-tap="onClearBrowsingDataTap_" 114 <paper-button on-tap="onClearBrowsingDataTap_"
106 id="clear-browsing-data-button"> 115 id="clear-browsing-data-button">
107 $i18n{clearBrowsingData} 116 $i18n{clearBrowsingData}
108 </paper-button> 117 </paper-button>
109 </div> 118 </div>
110 <div id="back-padding"></div> 119 <div id="back-padding"></div>
111 </div> 120 </div>
112 </template> 121 </template>
113 <script src="chrome://history/history_toolbar.js"></script> 122 <script src="chrome://history/history_toolbar.js"></script>
114 </dom-module> 123 </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