Backed out changeset 0d2f538bddde (bug 1036284) for Windows 7 bc1 crashes.
authorEd Lee <edilee@mozilla.com>
Sat, 19 Jul 2014 08:34:48 -0700
changeset 216992 3b09d30c885fd9cb778e6951b32b7b976b9fd715
parent 216991 35d54b6a84f68b9f723b7cd41be8bab330412876
child 216993 0a952f186c98c6cc1a07261c29bee05eed2b2e28
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1036284
milestone33.0a1
backs out0d2f538bddde4e7fd0a8663aebba3c2b925de796
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 0d2f538bddde (bug 1036284) for Windows 7 bc1 crashes.
browser/base/content/newtab/newTab.css
browser/base/content/newtab/sites.js
browser/base/content/test/newtab/head.js
browser/themes/linux/jar.mn
browser/themes/osx/jar.mn
browser/themes/shared/newtab/newTab.inc.css
browser/themes/shared/newtab/texture.png
browser/themes/windows/jar.mn
--- a/browser/base/content/newtab/newTab.css
+++ b/browser/base/content/newtab/newTab.css
@@ -78,17 +78,17 @@ input[type=button] {
   -moz-box-flex: 1;
 }
 
 #newtab-margin-bottom {
   -moz-box-flex: 2;
 }
 
 .newtab-side-margin {
-  min-width: 10px;
+  min-width: 16px;
   -moz-box-flex: 1;
 }
 
 /* GRID */
 #newtab-grid {
   -moz-box-flex: 5;
   overflow: hidden;
   text-align: center;
@@ -103,19 +103,19 @@ input[type=button] {
 #newtab-grid[locked],
 #newtab-grid[page-disabled] {
   pointer-events: none;
 }
 
 /* CELLS */
 .newtab-cell {
   display: -moz-box;
-  height: 180px;
-  margin: 16px 10px;
-  width: 290px;
+  height: 150px;
+  margin: 16px;
+  width: 243px;
 }
 
 /* SITES */
 .newtab-site {
   position: relative;
   -moz-box-flex: 1;
   transition: 100ms ease-out;
   transition-property: top, left, opacity;
@@ -136,28 +136,38 @@ input[type=button] {
 .newtab-thumbnail {
   position: absolute;
   left: 0;
   top: 0;
   right: 0;
   bottom: 0;
 }
 
+.newtab-thumbnail {
+  opacity: .8;
+  transition: opacity 100ms ease-out;
+}
+
+.newtab-thumbnail[dragged],
+.newtab-link:-moz-focusring > .newtab-thumbnail,
+.newtab-cell:not([ignorehover]) > .newtab-site:hover > .newtab-link > .newtab-thumbnail {
+  opacity: 1;
+}
+
 /* TITLES */
 .newtab-title {
   bottom: -21px;
-  font-size: 13px;
+  position: absolute;
   left: 0;
+  line-height: 21px;
+  right: 0;
+  text-align: start;
+  white-space: nowrap;
   overflow: hidden;
-  padding-top: 14px;
-  position: absolute;
-  right: 0;
-  text-align: center;
   text-overflow: ellipsis;
-  white-space: nowrap;
 }
 
 /* CONTROLS */
 .newtab-control {
   position: absolute;
   top: 4px;
   opacity: 0;
   transition: opacity 100ms ease-out;
@@ -271,17 +281,17 @@ input[type=button] {
 #newtab-search-logo[active],
 #newtab-search-logo:hover {
   background-color: #e9e9e9;
   border: 1px solid rgb(226, 227, 229);
   border-radius: 2.5px;
 }
 
 #newtab-search-text {
-  height: 38px;
+  height: 32px;
   -moz-box-flex: 1;
 
   padding: 0 8px;
   background: hsla(0,0%,100%,.9) padding-box;
   border: 1px solid;
   border-color: hsla(210,54%,20%,.15) hsla(210,54%,20%,.17) hsla(210,54%,20%,.2);
   box-shadow: 0 1px 0 hsla(210,65%,9%,.02) inset,
               0 0 2px hsla(210,65%,9%,.1) inset,
@@ -295,18 +305,17 @@ input[type=button] {
 }
 
 #newtab-search-text:focus,
 #newtab-search-text[autofocus] {
   border-color: hsla(206,100%,60%,.6) hsla(206,76%,52%,.6) hsla(204,100%,40%,.6);
 }
 
 #newtab-search-submit {
-  height: 38px;
-  font-size: 13px !important;
+  height: 32px;
 
   -moz-margin-start: -1px;
   background: linear-gradient(hsla(0,0%,100%,.8), hsla(0,0%,100%,.1)) padding-box;
   padding: 0 9px;
   border: 1px solid;
   border-color: hsla(210,54%,20%,.15) hsla(210,54%,20%,.17) hsla(210,54%,20%,.2);
   -moz-border-start: 1px solid transparent;
   border-radius: 0 2.5px 2.5px 0;
--- a/browser/base/content/newtab/sites.js
+++ b/browser/base/content/newtab/sites.js
@@ -103,20 +103,20 @@ Site.prototype = {
    * Updates attributes for all nodes which status depends on this site being
    * pinned or unpinned.
    * @param aPinned Whether this site is now pinned or unpinned.
    */
   _updateAttributes: function (aPinned) {
     let control = this._querySelector(".newtab-control-pin");
 
     if (aPinned) {
-      this.node.setAttribute("pinned", true);
+      control.setAttribute("pinned", true);
       control.setAttribute("title", newTabString("unpin"));
     } else {
-      this.node.removeAttribute("pinned");
+      control.removeAttribute("pinned");
       control.setAttribute("title", newTabString("pin"));
     }
   },
 
   /**
    * Renders the site's data (fills the HTML fragment).
    */
   _render: function Site_render() {
--- a/browser/base/content/test/newtab/head.js
+++ b/browser/base/content/test/newtab/head.js
@@ -27,17 +27,17 @@ let gWindow = window;
 // Default to dummy/empty directory links
 let gDirectorySource = 'data:application/json,{"test":1}';
 
 // The tests assume all three rows of sites are shown, but the window may be too
 // short to actually show three rows.  Resize it if necessary.
 let requiredInnerHeight =
   40 + 32 + // undo container + bottom margin
   44 + 32 + // search bar + bottom margin
-  (3 * (180 + 32)) + // 3 rows * (tile height + title and bottom margin)
+  (3 * (150 + 32)) + // 3 rows * (tile height + title and bottom margin)
   100; // breathing room
 
 let oldInnerHeight = null;
 if (gBrowser.contentWindow.innerHeight < requiredInnerHeight) {
   oldInnerHeight = gBrowser.contentWindow.innerHeight;
   info("Changing browser inner height from " + oldInnerHeight + " to " +
        requiredInnerHeight);
   gBrowser.contentWindow.innerHeight = requiredInnerHeight;
@@ -344,17 +344,18 @@ function addNewTabPageTab() {
 function checkGrid(aSitesPattern, aSites) {
   let length = aSitesPattern.split(",").length;
   let sites = (aSites || getGrid().sites).slice(0, length);
   let current = sites.map(function (aSite) {
     if (!aSite)
       return "";
 
     let pinned = aSite.isPinned();
-    let hasPinnedAttr = aSite.node.hasAttribute("pinned");
+    let pinButton = aSite.node.querySelector(".newtab-control-pin");
+    let hasPinnedAttr = pinButton.hasAttribute("pinned");
 
     if (pinned != hasPinnedAttr)
       ok(false, "invalid state (site.isPinned() != site[pinned])");
 
     return aSite.url.replace(/^http:\/\/example\.com\/#(\d+)$/, "$1") + (pinned ? "p" : "");
   });
 
   is(current, aSitesPattern, "grid status = " + aSitesPattern);
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -109,17 +109,16 @@ browser.jar:
   skin/classic/browser/feeds/videoFeedIcon16.png      (feeds/feedIcon16.png)
   skin/classic/browser/feeds/audioFeedIcon.png        (feeds/feedIcon.png)
   skin/classic/browser/feeds/audioFeedIcon16.png      (feeds/feedIcon16.png)
   skin/classic/browser/feeds/subscribe.css            (feeds/subscribe.css)
   skin/classic/browser/feeds/subscribe-ui.css         (feeds/subscribe-ui.css)
 * skin/classic/browser/newtab/newTab.css              (newtab/newTab.css)
   skin/classic/browser/newtab/controls.png            (../shared/newtab/controls.png)
   skin/classic/browser/newtab/controls@2x.png         (../shared/newtab/controls@2x.png)
-  skin/classic/browser/newtab/texture.png             (../shared/newtab/texture.png)
   skin/classic/browser/places/bookmarksMenu.png       (places/bookmarksMenu.png)
   skin/classic/browser/places/bookmarksToolbar.png    (places/bookmarksToolbar.png)
   skin/classic/browser/places/bookmarksToolbar-menuPanel.png (places/bookmarksToolbar-menuPanel.png)
   skin/classic/browser/places/bookmarks-notification-finish.png  (places/bookmarks-notification-finish.png)
   skin/classic/browser/places/bookmarks-menu-arrow.png           (places/bookmarks-menu-arrow.png)
   skin/classic/browser/places/calendar.png            (places/calendar.png)
 * skin/classic/browser/places/editBookmarkOverlay.css (places/editBookmarkOverlay.css)
   skin/classic/browser/places/livemark-item.png       (places/livemark-item.png)
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -177,17 +177,16 @@ browser.jar:
   skin/classic/browser/feeds/feedIcon16.png                 (feeds/feedIcon16.png)
   skin/classic/browser/feeds/videoFeedIcon.png              (feeds/feedIcon.png)
   skin/classic/browser/feeds/videoFeedIcon16.png            (feeds/feedIcon16.png)
   skin/classic/browser/feeds/audioFeedIcon.png              (feeds/feedIcon.png)
   skin/classic/browser/feeds/audioFeedIcon16.png            (feeds/feedIcon16.png)
 * skin/classic/browser/newtab/newTab.css                    (newtab/newTab.css)
   skin/classic/browser/newtab/controls.png                  (../shared/newtab/controls.png)
   skin/classic/browser/newtab/controls@2x.png               (../shared/newtab/controls@2x.png)
-  skin/classic/browser/newtab/texture.png                   (../shared/newtab/texture.png)
   skin/classic/browser/setDesktopBackground.css
   skin/classic/browser/monitor.png
   skin/classic/browser/monitor_16-10.png
   skin/classic/browser/places/allBookmarks.png              (places/allBookmarks.png)
 * skin/classic/browser/places/places.css                    (places/places.css)
 * skin/classic/browser/places/organizer.css                 (places/organizer.css)
   skin/classic/browser/places/query.png                     (places/query.png)
   skin/classic/browser/places/query@2x.png                  (places/query@2x.png)
--- a/browser/themes/shared/newtab/newTab.inc.css
+++ b/browser/themes/shared/newtab/newTab.inc.css
@@ -7,17 +7,17 @@
   font-size: 75%;
   background-color: transparent;
 }
 
 /* SCROLLBOX */
 #newtab-scrollbox:not([page-disabled]),
 #newtab-scrollbox:not([page-disabled]) #newtab-margin-bottom {
   color: rgb(0,0,0);
-  background-image: url(chrome://browser/skin/newtab/texture.png);
+  background-color: hsl(0,0%,95%);
 }
 
 /* UNDO */
 #newtab-undo-container {
   padding: 4px 3px;
   border: 1px solid;
   border-color: rgba(8,22,37,.12) rgba(8,22,37,.14) rgba(8,22,37,.16);
   background-color: rgba(255,255,255,.4);
@@ -76,92 +76,64 @@
     background-image: url(chrome://browser/skin/newtab/controls@2x.png);
     background-size: 296px;
   }
 }
 
 /* CELLS */
 .newtab-cell {
   background-color: rgba(255,255,255,.2);
-  border-radius: 12px;
+  border: 1px solid #dee0e1;
+  transition: border-color 100ms ease-out;
 }
 
 .newtab-cell:empty {
-  outline: 2px dashed #c1c1c1;
-  -moz-outline-radius: 12px;
+  border: 1px dashed;
+  border-color: rgba(8,22,37,.15) rgba(8,22,37,.17) rgba(8,22,37,.19);
+}
+
+.newtab-cell:hover:not(:empty):not([dragged]):not([ignorehover]) {
+  border-color: rgba(8,22,37,.25) rgba(8,22,37,.27) rgba(8,22,37,.3);
 }
 
 /* SITES */
 .newtab-site {
-  border-radius: inherit;
-  box-shadow: 0 1px 3px #c1c1c1;
   text-decoration: none;
   transition-property: top, left, opacity, box-shadow, background-color;
 }
 
 .newtab-cell:not([ignorehover]) > .newtab-site:hover,
 .newtab-site[dragged] {
-  border: 2px solid #4a90e2;
-  box-shadow: 0 0 10px 3px #4cb1ff;
-  margin: -2px;
+  box-shadow: 0 0 10px rgba(8,22,37,.3);
 }
 
 .newtab-site[dragged] {
   transition-property: box-shadow, background-color;
   background-color: rgb(242,242,242);
 }
 
-/* LINKS */
-.newtab-link {
-  border-radius: 10px;
-}
-
 /* THUMBNAILS */
 .newtab-thumbnail {
   background-origin: padding-box;
   background-clip: padding-box;
   background-repeat: no-repeat;
   background-size: cover;
-  border-radius: inherit;
-  transition: opacity 100ms ease-out;
 }
 
 .newtab-site[type=affiliate] .newtab-thumbnail,
 .newtab-site[type=organic] .newtab-thumbnail,
 .newtab-site[type=sponsored] .newtab-thumbnail {
   background-position: center center;
   background-size: auto;
 }
 
-/* Use a pseudo-element to overlay a gradient on the thumbnail */
-.newtab-site[type=history]:not(:hover) .newtab-thumbnail:first-child::after {
-  background-image: linear-gradient(0deg, rgba(251, 251, 251, 0.8), rgba(251, 251, 251, 0) 50%);
-  border-radius: inherit;
-  bottom: 0;
-  content: "";
-  left: 0;
-  pointer-events: none;
-  position: absolute;
-  right: 0;
-  top: 0;
-}
-
 /* TITLES */
 .newtab-title {
-  color: #9b9b9b;
-}
-
-.newtab-site:hover .newtab-title {
-  color: #4a4a4a;
-}
-
-.newtab-site[pinned] .newtab-title {
-  color: #d0021b;
-  font-style: italic;
-  font-weight: bold;
+  color: #525c66;
+  font-size: 13px;
 }
 
 .newtab-site[type=sponsored] .newtab-title {
   -moz-padding-end: 24px;
 }
 
 /* CONTROLS */
 .newtab-control {
@@ -182,25 +154,25 @@
 .newtab-control-pin:hover {
   background-position: -24px 0;
 }
 
 .newtab-control-pin:active {
   background-position: -48px 0;
 }
 
-.newtab-site[pinned] .newtab-control-pin {
+.newtab-control-pin[pinned] {
   background-position: -72px 0;
 }
 
-.newtab-site[pinned] .newtab-control-pin:hover {
+.newtab-control-pin[pinned]:hover {
   background-position: -96px 0;
 }
 
-.newtab-site[pinned] .newtab-control-pin:active {
+.newtab-control-pin[pinned]:active {
   background-position: -120px 0;
 }
 
 .newtab-control-block {
   background-position: -144px 0;
 }
 
 .newtab-control-block:hover {
deleted file mode 100644
index 84468be240e021d6242a698f60f0375aab2a1b26..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -131,17 +131,16 @@ browser.jar:
         skin/classic/browser/feeds/audioFeedIcon16.png               (feeds/feedIcon16.png)
         skin/classic/browser/feeds/videoFeedIcon.png                 (feeds/feedIcon.png)
         skin/classic/browser/feeds/videoFeedIcon16.png               (feeds/feedIcon16.png)
         skin/classic/browser/feeds/subscribe.css                     (feeds/subscribe.css)
         skin/classic/browser/feeds/subscribe-ui.css                  (feeds/subscribe-ui.css)
 *       skin/classic/browser/newtab/newTab.css                       (newtab/newTab.css)
         skin/classic/browser/newtab/controls.png                     (../shared/newtab/controls.png)
         skin/classic/browser/newtab/controls@2x.png                  (../shared/newtab/controls@2x.png)
-        skin/classic/browser/newtab/texture.png                      (../shared/newtab/texture.png)
         skin/classic/browser/places/places.css                       (places/places.css)
 *       skin/classic/browser/places/organizer.css                    (places/organizer.css)
         skin/classic/browser/places/bookmark.png                     (places/bookmark.png)
         skin/classic/browser/places/query.png                        (places/query.png)
         skin/classic/browser/places/bookmarksMenu.png                (places/bookmarksMenu.png)
         skin/classic/browser/places/bookmarksToolbar.png             (places/bookmarksToolbar.png)
         skin/classic/browser/places/bookmarksToolbar-menuPanel.png   (places/bookmarksToolbar-menuPanel.png)
         skin/classic/browser/places/bookmarks-notification-finish.png (places/bookmarks-notification-finish.png)
@@ -546,17 +545,16 @@ browser.jar:
         skin/classic/aero/browser/feeds/audioFeedIcon16.png          (feeds/feedIcon16-aero.png)
         skin/classic/aero/browser/feeds/videoFeedIcon.png            (feeds/feedIcon-aero.png)
         skin/classic/aero/browser/feeds/videoFeedIcon16.png          (feeds/feedIcon16-aero.png)
         skin/classic/aero/browser/feeds/subscribe.css                (feeds/subscribe.css)
         skin/classic/aero/browser/feeds/subscribe-ui.css             (feeds/subscribe-ui.css)
 *       skin/classic/aero/browser/newtab/newTab.css                  (newtab/newTab.css)
         skin/classic/aero/browser/newtab/controls.png                (../shared/newtab/controls.png)
         skin/classic/aero/browser/newtab/controls@2x.png             (../shared/newtab/controls@2x.png)
-        skin/classic/aero/browser/newtab/texture.png                 (../shared/newtab/texture.png)
 *       skin/classic/aero/browser/places/places.css                  (places/places-aero.css)
 *       skin/classic/aero/browser/places/organizer.css               (places/organizer-aero.css)
         skin/classic/aero/browser/places/bookmark.png                (places/bookmark-aero.png)
         skin/classic/aero/browser/places/query.png                   (places/query-aero.png)
         skin/classic/aero/browser/places/bookmarksMenu.png           (places/bookmarksMenu-aero.png)
         skin/classic/aero/browser/places/bookmarksToolbar.png        (places/bookmarksToolbar-aero.png)
         skin/classic/aero/browser/places/bookmarksToolbar-menuPanel.png (places/bookmarksToolbar-menuPanel-aero.png)
         skin/classic/aero/browser/places/bookmarks-notification-finish.png   (places/bookmarks-notification-finish.png)