Index: chrome/browser/resources/history.html |
diff --git a/chrome/browser/resources/history.html b/chrome/browser/resources/history.html |
index b156868b15249b67e7a613a25bbf44ac1033fd56..67b4f33496fc95aeb3bb2e7522f2730908c5ffc0 100644 |
--- a/chrome/browser/resources/history.html |
+++ b/chrome/browser/resources/history.html |
@@ -96,11 +96,13 @@ |
-webkit-box-orient: horizontal; |
cursor: default; |
display: -webkit-box; |
- float: left; |
+ float: left; /* Box will shrink to fit its content. */ |
line-height: 1.6em; |
-/* Don't allow it to be bigger than its parent but make the box shrink to fit |
- * its content. */ |
+ |
+ /* The box should be no bigger than its parent. NB: For this to work, the |
+ * box cannot have padding or a border. */ |
max-width: 100%; |
+ |
overflow: hidden; |
} |
@@ -108,11 +110,6 @@ html[dir=rtl] .entry-box { |
float: right; /* To make the box shrink to fit its content. */ |
} |
-.entry-box > label > * { |
- display: inline-block; |
- white-space: nowrap; |
-} |
- |
.search-results, .day-results { |
margin: 0 0 24px 0; |
padding: 0; |
@@ -127,16 +124,13 @@ html[dir=rtl] .entry-box { |
} |
.entry .domain { |
- -webkit-padding-end: 8px; |
- -webkit-padding-start: 20px; |
- background-position-y: center; |
- background-repeat: no-repeat; |
- color: #282; |
+ color: #9a9a9a; |
+ padding-left: 6px; |
+ padding-right: 6px; |
} |
.drop-down { |
-webkit-margin-end: 4px; |
- -webkit-margin-start: 8px; |
background: #fff -webkit-canvas(drop-down-arrow) no-repeat center center; |
border: 1px solid hsl(214, 91%, 85%); |
border-radius: 2px; |
@@ -157,7 +151,8 @@ html[dir=rtl] .entry-box { |
border-color: #6A86DE; |
} |
-html[dir='rtl'] .entry .domain { |
+html[dir='rtl'] .entry .title { |
+ /* Put the favicon on the right. */ |
background-position-x: right; |
} |
@@ -179,7 +174,6 @@ html[dir='rtl'] .entry .domain { |
/* 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) { |
- -webkit-transition: opacity 150ms; |
opacity: 0; |
} |
@@ -193,7 +187,6 @@ html[dir='rtl'] .entry .domain { |
} |
.entry-box { |
- -webkit-transition: background-color 150ms; |
background-color: none; |
} |
@@ -208,10 +201,18 @@ html[dir='rtl'] .entry .domain { |
white-space: nowrap; |
} |
-.entry .title > .starred { |
- -webkit-margin-start: 4px; |
- background: url('shared/images/star_small.png'); |
+.entry .title { |
+ /* Make room for the favicon. */ |
+ -webkit-padding-start: 20px; |
+ |
+ /* Control the favicon appearance. */ |
background-repeat: no-repeat; |
+ background-position-y: center; |
+} |
+ |
+.entry .starred { |
+ -webkit-margin-start: 4px; |
+ background: url('shared/images/star_small.png') no-repeat; |
display: inline-block; |
height: 11px; |
width: 11px; |