Chromium Code Reviews| Index: chrome/browser/resources/history2.html |
| diff --git a/chrome/browser/resources/history2.html b/chrome/browser/resources/history2.html |
| index 36bdfe63684d939f8199b7a3ac2a524e926ab30e..41ec1eda75d66160cb60fa854237fa46277e0c53 100644 |
| --- a/chrome/browser/resources/history2.html |
| +++ b/chrome/browser/resources/history2.html |
| @@ -42,20 +42,12 @@ |
| text-overflow: ellipsis; |
| width: 50%; |
| } |
| -#edit-button { |
| - text-align: right; |
| - overflow: hidden; |
| - white-space: nowrap; |
| - text-overflow: ellipsis; |
| - width: 50%; |
| -} |
| #editing-controls button { |
| - margin-top: 18px; |
| - margin-bottom: -8px; |
| + margin: 18px 0 -8px 0; |
| } |
| #results-display { |
| max-width: 740px; |
| - margin: 16px 4px 0 4px; |
| + margin: 16px 0 0 0; |
| } |
| .day { |
| color: #6a6a6a; |
| @@ -84,7 +76,7 @@ |
| list-style: none; |
| } |
| .gap { |
| - width: 15px; |
| + width: 35px; |
| -webkit-border-end: 1px solid #ddd; |
| height: 14px; |
| } |
| @@ -92,6 +84,7 @@ |
| overflow: auto; /* Make sure it's at least as large as its children. */ |
| } |
| .entry-box { |
| + cursor: default; |
| line-height: 1.6em; |
| display: -webkit-box; |
| @@ -128,6 +121,7 @@ html[dir=rtl] .entry-box { |
| width: 13px; |
| height: 13px; |
| -webkit-margin-start: 8px; |
| + -webkit-margin-end: 4px; |
| position: relative; |
| top: 2px; |
| } |
| @@ -147,6 +141,33 @@ html[dir='rtl'] .entry .domain { |
| color:#9a9a9a; |
| width: 90px; |
| } |
| +.entry input[type=checkbox] { |
| + position: relative; |
| + top: 1px; |
| +} |
| + |
| +/* Checkboxes are shown when checked or focused, or when the entry is hovered. |
| + Fade in on focus, but not on hover, because it makes the UI feel laggy. */ |
| +.entry input[type=checkbox]:not(:checked) { |
| + opacity: 0; |
| + -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.
|
| +} |
| +.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.
|
| + opacity: 1; |
| +} |
|
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.
|
| +.entry-box input[type=checkbox]:focus { |
| + -webkit-transition: opacity 100ms; |
| +} |
| + |
| +.entry-box { |
| + background-color: none; |
| + -webkit-transition: background-color 100ms; |
| +} |
| + |
| +.entry-box:hover, .entry-box.contains-focus { |
| + background-color: #e4ecf7; |
| + border-radius: 2px; |
| +} |
| .entry .title { |
| -webkit-box-flex: 1; |
| overflow: hidden; |
| @@ -175,6 +196,10 @@ html[dir='rtl'] .entry .domain { |
| .entry .title > a:visted { |
| color: #11c; |
| } |
| +.fade-out { |
| + opacity: 0; |
| + -webkit-transition: opacity 200ms; |
| +} |
| </style> |
| </head> |
| <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> |
| @@ -193,7 +218,12 @@ html[dir='rtl'] .entry .domain { |
| <tr><td id="results-summary"></td><td id="edit-button"><p></p></td></tr> |
| </table> |
| </div> |
| - <div id="editing-controls"></div> |
| + <div id="editing-controls"> |
| + <button id="clear-browsing-data" i18n-content="clearallhistory"></button> |
| + <button id="remove-selected" |
| + disabled="disabled" |
| + i18n-content="removeselected"></button> |
| + </div> |
| <div id="results-display"></div> |
| <div id="results-pagination"></div> |
| </div> |