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

Side by Side Diff: chrome/browser/resources/history2.html

Issue 8079010: Change history2 to allow multi-deletion without entering a separate mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address arv's comments. Created 9 years, 2 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 | Annotate | Revision Log
OLDNEW
1 <!DOCTYPE HTML> 1 <!DOCTYPE HTML>
2 <html i18n-values="dir:textdirection;"> 2 <html i18n-values="dir:textdirection;">
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <include src="content_security_policy.html"/> 5 <include src="content_security_policy.html"/>
6 <title i18n-content="title"></title> 6 <title i18n-content="title"></title>
7 <link rel="icon" href="../../app/theme/history_favicon.png"> 7 <link rel="icon" href="../../app/theme/history_favicon.png">
8 8
9 <link rel="stylesheet" href="chrome://resources/css/menu.css"> 9 <link rel="stylesheet" href="chrome://resources/css/menu.css">
10 10
(...skipping 24 matching lines...) Expand all
35 } 35 }
36 #results-separator table { 36 #results-separator table {
37 width: 100%; 37 width: 100%;
38 } 38 }
39 #results-summary { 39 #results-summary {
40 overflow: hidden; 40 overflow: hidden;
41 white-space: nowrap; 41 white-space: nowrap;
42 text-overflow: ellipsis; 42 text-overflow: ellipsis;
43 width: 50%; 43 width: 50%;
44 } 44 }
45 #edit-button {
46 text-align: right;
47 overflow: hidden;
48 white-space: nowrap;
49 text-overflow: ellipsis;
50 width: 50%;
51 }
52 #editing-controls button { 45 #editing-controls button {
53 margin-top: 18px; 46 margin: 18px 0 -8px 0;
54 margin-bottom: -8px;
55 } 47 }
56 #results-display { 48 #results-display {
57 max-width: 740px; 49 max-width: 740px;
58 margin: 16px 4px 0 4px; 50 margin: 16px 0 0 0;
59 } 51 }
60 .day { 52 .day {
61 color: #6a6a6a; 53 color: #6a6a6a;
62 font-weight: bold; 54 font-weight: bold;
63 margin: 0 0 4px 0; 55 margin: 0 0 4px 0;
64 text-transform: uppercase; 56 text-transform: uppercase;
65 font-size: 13px; 57 font-size: 13px;
66 } 58 }
67 .edit-button { 59 .edit-button {
68 display: inline; 60 display: inline;
69 -webkit-appearance: none; 61 -webkit-appearance: none;
70 background: none; 62 background: none;
71 border: 0; 63 border: 0;
72 color: blue; /* -webkit-link makes it purple :'( */ 64 color: blue; /* -webkit-link makes it purple :'( */
73 cursor: pointer; 65 cursor: pointer;
74 text-decoration: underline; 66 text-decoration: underline;
75 padding:0px 9px; 67 padding:0px 9px;
76 display:inline-block; 68 display:inline-block;
77 font:inherit; 69 font:inherit;
78 } 70 }
79 .gap, 71 .gap,
80 .entry, 72 .entry,
81 .no-entries { 73 .no-entries {
82 margin: 0; 74 margin: 0;
83 padding: 0; 75 padding: 0;
84 list-style: none; 76 list-style: none;
85 } 77 }
86 .gap { 78 .gap {
87 width: 15px; 79 width: 35px;
88 -webkit-border-end: 1px solid #ddd; 80 -webkit-border-end: 1px solid #ddd;
89 height: 14px; 81 height: 14px;
90 } 82 }
91 .entry { 83 .entry {
92 overflow: auto; /* Make sure it's at least as large as its children. */ 84 overflow: auto; /* Make sure it's at least as large as its children. */
93 } 85 }
94 .entry-box { 86 .entry-box {
87 cursor: default;
95 line-height: 1.6em; 88 line-height: 1.6em;
96 89
97 display: -webkit-box; 90 display: -webkit-box;
98 -webkit-box-orient: horizontal; 91 -webkit-box-orient: horizontal;
99 max-width: 100%; /* Don't allow it to be bigger than its parent... */ 92 max-width: 100%; /* Don't allow it to be bigger than its parent... */
100 float: left; /* ..but make the box shrink to fit its content. */ 93 float: left; /* ..but make the box shrink to fit its content. */
101 overflow: hidden; 94 overflow: hidden;
102 } 95 }
103 html[dir=rtl] .entry-box { 96 html[dir=rtl] .entry-box {
104 float: right; /* To make the box shrink to fit its content. */ 97 float: right; /* To make the box shrink to fit its content. */
(...skipping 16 matching lines...) Expand all
121 background-repeat: no-repeat; 114 background-repeat: no-repeat;
122 background-position-y: center; 115 background-position-y: center;
123 } 116 }
124 .drop-down { 117 .drop-down {
125 background: #fff -webkit-canvas(drop-down-arrow) no-repeat center center; 118 background: #fff -webkit-canvas(drop-down-arrow) no-repeat center center;
126 border: 1px solid hsl(214, 91%, 85%); 119 border: 1px solid hsl(214, 91%, 85%);
127 border-radius: 2px; 120 border-radius: 2px;
128 width: 13px; 121 width: 13px;
129 height: 13px; 122 height: 13px;
130 -webkit-margin-start: 8px; 123 -webkit-margin-start: 8px;
124 -webkit-margin-end: 4px;
131 position: relative; 125 position: relative;
132 top: 2px; 126 top: 2px;
133 } 127 }
134 .drop-down:hover { 128 .drop-down:hover {
135 border-color: #6A86DE; 129 border-color: #6A86DE;
136 background-image: -webkit-canvas(drop-down-arrow-hover); 130 background-image: -webkit-canvas(drop-down-arrow-hover);
137 } 131 }
138 .drop-down[menu-shown], .drop-down:focus { 132 .drop-down[menu-shown], .drop-down:focus {
139 border-color: #6A86DE; 133 border-color: #6A86DE;
140 background-color: #6A86DE; 134 background-color: #6A86DE;
141 background-image: -webkit-canvas(drop-down-arrow-active); 135 background-image: -webkit-canvas(drop-down-arrow-active);
142 } 136 }
143 html[dir='rtl'] .entry .domain { 137 html[dir='rtl'] .entry .domain {
144 background-position-x: right; 138 background-position-x: right;
145 } 139 }
146 .entry .time { 140 .entry .time {
147 color:#9a9a9a; 141 color:#9a9a9a;
148 width: 90px; 142 width: 90px;
149 } 143 }
144 .entry input[type=checkbox] {
145 position: relative;
146 top: 1px;
147 }
148
149 /* Checkboxes are shown when checked or focused, or when the entry is hovered.
150 Fade in on focus, but not on hover, because it makes the UI feel laggy. */
151 .entry input[type=checkbox]:not(:checked) {
152 opacity: 0;
153 -webkit-transition: opacity 100ms;
arv (Not doing code reviews) 2011/10/05 21:30:08 the standard transition time in chrome is 150ms as
Patrick Dubroy 2011/10/06 09:38:45 Done.
154 }
155 .entry-box:hover input[type=checkbox], .entry-box input[type=checkbox]:focus {
arv (Not doing code reviews) 2011/10/05 21:30:08 line break after comma
Patrick Dubroy 2011/10/06 09:38:45 Done.
156 opacity: 1;
157 }
arv (Not doing code reviews) 2011/10/05 21:30:08 there should be an empty line between every rule
Patrick Dubroy 2011/10/06 09:38:45 Done.
158 .entry-box input[type=checkbox]:focus {
159 -webkit-transition: opacity 100ms;
160 }
161
162 .entry-box {
163 background-color: none;
164 -webkit-transition: background-color 100ms;
165 }
166
167 .entry-box:hover, .entry-box.contains-focus {
168 background-color: #e4ecf7;
169 border-radius: 2px;
170 }
150 .entry .title { 171 .entry .title {
151 -webkit-box-flex: 1; 172 -webkit-box-flex: 1;
152 overflow: hidden; 173 overflow: hidden;
153 white-space: nowrap; 174 white-space: nowrap;
154 text-overflow: ellipsis; 175 text-overflow: ellipsis;
155 } 176 }
156 .entry .title > .starred { 177 .entry .title > .starred {
157 background:url('shared/images/star_small.png'); 178 background:url('shared/images/star_small.png');
158 background-repeat:no-repeat; 179 background-repeat:no-repeat;
159 display:inline-block; 180 display:inline-block;
160 -webkit-margin-start: 4px; 181 -webkit-margin-start: 4px;
161 width:11px; 182 width:11px;
162 height:11px; 183 height:11px;
163 } 184 }
164 .entry .title > a { 185 .entry .title > a {
165 color: #11c; 186 color: #11c;
166 text-decoration: none; 187 text-decoration: none;
167 } 188 }
168 .entry .title > a.to-be-removed { 189 .entry .title > a.to-be-removed {
169 text-decoration: line-through; 190 text-decoration: line-through;
170 } 191 }
171 .entry .title > a:hover { 192 .entry .title > a:hover {
172 text-decoration: underline; 193 text-decoration: underline;
173 } 194 }
174 /* Since all history links are visited, we can make them blue. */ 195 /* Since all history links are visited, we can make them blue. */
175 .entry .title > a:visted { 196 .entry .title > a:visted {
176 color: #11c; 197 color: #11c;
177 } 198 }
199 .fade-out {
200 opacity: 0;
201 -webkit-transition: opacity 200ms;
202 }
178 </style> 203 </style>
179 </head> 204 </head>
180 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> 205 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
181 <div class="header"> 206 <div class="header">
182 <a id="history-section" href=""> 207 <a id="history-section" href="">
183 <img src="shared/images/history_section.png" 208 <img src="shared/images/history_section.png"
184 width="67" height="67" class="logo" border="0"></a> 209 width="67" height="67" class="logo" border="0"></a>
185 <form id="search-form" method="post" action="" class="form"> 210 <form id="search-form" method="post" action="" class="form">
186 <input type="text" name="term" id="term"> 211 <input type="text" name="term" id="term">
187 <input type="submit" name="submit" i18n-values="value:searchbutton"> 212 <input type="submit" name="submit" i18n-values="value:searchbutton">
188 </form> 213 </form>
189 </div> 214 </div>
190 <div class="main"> 215 <div class="main">
191 <div id="results-separator"> 216 <div id="results-separator">
192 <table border="0" cellPadding="0" cellSpacing="0"> 217 <table border="0" cellPadding="0" cellSpacing="0">
193 <tr><td id="results-summary"></td><td id="edit-button"><p></p></td></tr> 218 <tr><td id="results-summary"></td><td id="edit-button"><p></p></td></tr>
194 </table> 219 </table>
195 </div> 220 </div>
196 <div id="editing-controls"></div> 221 <div id="editing-controls">
222 <button id="clear-browsing-data" i18n-content="clearallhistory"></button>
223 <button id="remove-selected"
224 disabled="disabled"
225 i18n-content="removeselected"></button>
226 </div>
197 <div id="results-display"></div> 227 <div id="results-display"></div>
198 <div id="results-pagination"></div> 228 <div id="results-pagination"></div>
199 </div> 229 </div>
200 <div class="footer"> 230 <div class="footer">
201 </div> 231 </div>
202 232
203 <menu id="action-menu"> 233 <menu id="action-menu">
204 <button id="more-from-site" i18n-content="moreFromSite"></button> 234 <button id="more-from-site" i18n-content="moreFromSite"></button>
205 <button id="remove-page" i18n-content="removeFromHistory"></button> 235 <button id="remove-page" i18n-content="removeFromHistory"></button>
206 </menu> 236 </menu>
207 237
208 <script src="chrome://resources/js/i18n_template.js"></script> 238 <script src="chrome://resources/js/i18n_template.js"></script>
209 <script src="chrome://resources/js/i18n_process.js"></script> 239 <script src="chrome://resources/js/i18n_process.js"></script>
210 </body> 240 </body>
211 </html> 241 </html>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/history2.js » ('j') | chrome/browser/resources/history2.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698