Bug 1172987 - Incorrect padding for various locales. r=Mardak.

browser/base/content/newtab/intro.js

@@ -147,10 +147,14 @@ let gIntro = {
       let imageClass = "";
       switch (this._imageTypes[type]) {
         case this._imageTypes.COG:
-          image = document.getElementById("newtab-customize-panel").cloneNode(true);
-          image.removeAttribute("hidden");
-          image.removeAttribute("type");
+          // Copy the customize panel's subnodes over so that it can be styled
+          // appropriately for the intro.
+          image = document.createElementNS(HTML_NAMESPACE, "div");
           image.classList.add("newtab-intro-image-customize");
+          let imageToCopy = document.getElementById("newtab-customize-panel").cloneNode(true);
+          while (imageToCopy.firstChild) {
+            image.appendChild(imageToCopy.firstChild);
+          }
           break;
         case this._imageTypes.PIN_REMOVE:
           imageClass = "-hover";

browser/base/content/newtab/newTab.css

@@ -478,12 +478,14 @@ input[type=button] {
   color: #7A7A7A;
   font-size: 14px;
   background-color: #FFFFFF;
-  height: 52px;
-  line-height: 52px;
-  padding-left: 15px;
+  line-height: 25px;
+  padding: 15px;
   font-weight: 600;
   cursor: default;
   border-radius: 5px 5px 0px 0px;
+  max-width: 300px;
+  overflow: hidden;
+  display: table-cell;
 }
 
 #newtab-customize-title > label {
@@ -498,15 +500,15 @@ input[type=button] {
 .newtab-customize-panel-item,
 .newtab-search-panel-engine,
 #newtab-search-manage {
-  line-height: 54px;
-  padding-left: 40px;
+  line-height: 25px;
+  padding: 15px 15px 15px 40px;
   font-size: 14px;
   cursor: pointer;
 }
 
-.newtab-customize-panel-item:not(:last-child),
+.newtab-customize-panel-item:not(:first-child),
 .newtab-search-panel-engine {
-  border-bottom: 1px solid threedshadow;
+  border-top: 1px solid threedshadow;
 }
 
 .newtab-search-panel-engine > image {
@@ -529,6 +531,15 @@ input[type=button] {
 .newtab-customize-panel-item,
 .newtab-customize-complex-option {
   width: 100%;
+  display: block;
+  text-align: left;
+  max-width: 300px;
+  background-color: #F9F9F9;
+}
+
+.newtab-intro-image-customize .newtab-customize-panel-item,
+.newtab-intro-image-customize .newtab-customize-complex-option {
+  max-width: 100%;
 }
 
 .newtab-customize-panel-item:not([selected]),
@@ -578,19 +589,22 @@ input[type=button] {
 
 .newtab-customize-panel-subitem {
   font-size: 12px;
-  padding-left: 40px;
-  padding-bottom: 15px;
-  border-bottom: 1px solid threedshadow;
+  padding: 0px 15px 15px 40px;
+  display: block;
 }
 
 .newtab-customize-panel-subitem > label {
   padding-left: 10px;
+  line-height: 20px;
+  vertical-align: middle;
+  max-width: 225px;
 }
 
 .newtab-customize-panel-superitem {
-  line-height: 14px;
+  line-height: 20px;
   border-bottom: medium none !important;
-  padding: 15px 0px 10px 40px;
+  padding: 15px 15px 10px 40px;
+  border-top: 1px solid threedshadow;
 }
 
 .searchSuggestionTable {
@@ -614,11 +628,11 @@ input[type=button] {
   transition: opacity .5s linear;
   overflow: auto;
   display: none;
+  text-align: center;
 }
 
 #newtab-intro-modal {
   font-family: "Helvetica";
-  width: 700px;
   height: 500px;
   position: fixed;
   left: 0;
@@ -629,6 +643,11 @@ input[type=button] {
   background: linear-gradient(#FFFFFF, #F9F9F9);
   box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.7);
   border-radius: 8px 8px 0px 0px;
+  min-width: 715px;
+  position: relative;
+  display: inline-block;
+  top: 50%;
+  transform: translateY(-50%);
 }
 
 #newtab-intro-header {
@@ -639,10 +658,10 @@ input[type=button] {
   position: relative;
   border-bottom: 2px solid #E0DFE0;
   padding-bottom: 10px;
-  width: 600px;
   display: block;
   margin: 0px auto;
   font-weight: 100;
+  padding: 0px 15px;
 }
 
 #newtab-intro-header .bold {
@@ -690,7 +709,7 @@ input[type=button] {
 }
 
 #newtab-intro-body {
-  height: 300px;
+  height: 310px;
   position: relative;
   display: block;
   top: 50px;
@@ -707,10 +726,12 @@ input[type=button] {
 }
 
 #newtab-intro-buttons {
-  height: 90px;
   text-align: center;
   vertical-align: middle;
-  line-height: 90px;
+  position: absolute;
+  display: block;
+  bottom: 0px;
+  width: 100%;
 }
 
 #newtab-intro-tile {
@@ -718,29 +739,43 @@ input[type=button] {
   height: 100%;
 }
 
+#newtab-intro-text {
+  text-align: left;
+  right: 0px;
+  width: 270px;
+}
+
 #newtab-intro-text,
 #newtab-intro-image {
   height: 100%;
-  width: 270px;
   right: 0px;
-  position: absolute;
   font-size: 14px;
   line-height: 20px;
   margin-top: -12px;
+  min-width: 270px;
 }
 
 #newtab-intro-image {
   left: 0px;
   right: auto;
-}
-
-.newtab-intro-image-tile {
+  float: left;
+  margin-right: 40px;
 }
 
 .newtab-intro-image-customize {
-  display: block;
   box-shadow: 3px 3px 5px #888;
   margin: 0 !important;
+  background-color: #FFF;
+  float: left;
+  z-index: 101;
+  margin-top: -5px;
+  min-width: 270px;
+  padding: 0;
+}
+
+.newtab-intro-image-customize #newtab-customize-title {
+  display: block;
+  max-height: 72px;
 }
 
 .newtab-intro-image-customize .newtab-customize-panel-item:not([selected]):hover {
@@ -763,7 +798,7 @@ input[type=button] {
 }
 
 #newtab-intro-buttons > input {
-  width: 150px;
+  min-width: 150px;
   height: 50px;
   margin: 0px 5px;
   vertical-align: bottom;
@@ -772,6 +807,7 @@ input[type=button] {
   background-color: #FFFFFF;
   color: #4A90E2;
   -moz-user-focus: normal;
+  padding: 0px 10px;
 }
 
 #newtab-intro-buttons > input[default] {