Merge branch 'firefox-42-beta'42.2015110341.20151103

1 files changed, 19 insertions, 13 deletions

diff --git a/arc-firefox-theme/chrome/browser/newtab/newTab.css b/arc-firefox-theme/chrome/browser/newtab/newTab.css
index 81042b4..4073cd9 100644
--- a/arc-firefox-theme/chrome/browser/newtab/newTab.css
+++ b/arc-firefox-theme/chrome/browser/newtab/newTab.css
@@ -12,16 +12,6 @@
   background-color: transparent;
 }
 
-/* SCROLLBOX */
-#newtab-scrollbox:not([page-disabled]) {
-  color: rgb(0,0,0);
-  background-color: #f9f9f9;
-}
-
-#newtab-scrollbox:not([page-disabled]) #newtab-margin-bottom {
-  background: inherit;
-}
-
 /* UNDO */
 #newtab-undo-container {
   padding: 4px 3px;
@@ -61,8 +51,24 @@
   border: none;
 }
 
-#newtab-undo-close-button:-moz-focusring {
-  outline: 1px dotted;
+#newtab-undo-close-button {
+  -moz-appearance: none;
+  padding: 0;
+  border: none;
+  height: 16px;
+  width: 16px;
+  float: right;
+  right: 0;
+  background-image: -moz-image-rect(url(chrome://browser/skin/newtab/close.png), 0, 16, 16, 0);
+  background-color: transparent;
+}
+
+#newtab-undo-close-button:hover {
+  background-image: -moz-image-rect(url(chrome://browser/skin/newtab/close.png), 0, 32, 16, 16);
+}
+
+#newtab-undo-close-button:hover:active {
+  background-image: -moz-image-rect(url(chrome://browser/skin/newtab/close.png), 0, 48, 16, 32);
 }
 
 /* CUSTOMIZE */
@@ -184,7 +190,7 @@
   margin-top: 6px;
 }
 
-.newtab-site[pinned] .newtab-title:-moz-locale-dir(rtl)::before {
+.newtab-site[pinned] .newtab-title:-moz-dir(rtl)::before {
   left: auto;
   right: 0;
 }