Back out f68e1a3a3705 (bug 622288) a=bustage
authorPhil Ringnalda <philringnalda@gmail.com>
Tue, 25 Jan 2011 21:54:41 -0800
changeset 61306 84431e8293867784d04eded2eb75bfa187b0b82e
parent 61305 4d6554646378a04e911d00d53bc39f332027bb50
child 61307 21a7c88123caa715d161598cff269d828ab24fc8
push idunknown
push userunknown
push dateunknown
reviewersbustage
bugs622288
milestone2.0b11pre
backs outf68e1a3a37056152780d53552261e95ee5fcf880
Back out f68e1a3a3705 (bug 622288) a=bustage
browser/base/content/tabview/tabitems.js
browser/themes/gnomestripe/browser/tabview/tabview.css
browser/themes/pinstripe/browser/tabview/tabview.css
browser/themes/winstripe/browser/tabview/tabview.css
--- a/browser/base/content/tabview/tabitems.js
+++ b/browser/base/content/tabview/tabitems.js
@@ -733,17 +733,17 @@ TabItem.prototype = Utils.extend(new Ite
     if (!scaleCheat)
       scaleCheat = 1.7;
 
     let zoomWidth = orig.width + (window.innerWidth - orig.width) / scaleCheat;
     return {
       top:    orig.top    * (1 - 1/scaleCheat),
       left:   orig.left   * (1 - 1/scaleCheat),
       width:  zoomWidth,
-      height: (orig.width ? orig.height * zoomWidth / orig.width : 0)
+      height: orig.height * zoomWidth / orig.width
     };
   },
 
   // ----------
   // Function: setZoomPrep
   // Either go into or return from (depending on <value>) "zoom prep" mode,
   // where the tab fills a large portion of the screen in anticipation of
   // the zoom out animation.
--- a/browser/themes/gnomestripe/browser/tabview/tabview.css
+++ b/browser/themes/gnomestripe/browser/tabview/tabview.css
@@ -424,18 +424,20 @@ html[dir=rtl] input.name {
 input.name:focus {
   color: #555;
 }
 
 input.name:-moz-placeholder {
   font-style: italic !important;
   color: transparent;
   background-image: url(chrome://browser/skin/tabview/edit-light.png);
+  background-image-opacity: .1;
   background-repeat: no-repeat;
   -moz-padding-start: 20px;
+  -moz-padding-end: -20px;
 }
 
 .title-container:hover input.name:-moz-placeholder {
   color: #CCC;
 }
 
 .title-container {
   cursor: text;
--- a/browser/themes/pinstripe/browser/tabview/tabview.css
+++ b/browser/themes/pinstripe/browser/tabview/tabview.css
@@ -420,18 +420,20 @@ html[dir=rtl] input.name {
 input.name:focus {
   color: #555;
 }
 
 input.name:-moz-placeholder {
   font-style: italic !important;
   color: transparent;
   background-image: url(chrome://browser/skin/tabview/edit-light.png);
+  background-image-opacity: .1;
   background-repeat: no-repeat;
   -moz-padding-start: 20px;
+  -moz-margin-end: -20px;
 }
 
 .title-container:hover input.name:-moz-placeholder {
   color: #CCC;
 }
 
 .title-container {
   cursor: text;
--- a/browser/themes/winstripe/browser/tabview/tabview.css
+++ b/browser/themes/winstripe/browser/tabview/tabview.css
@@ -443,18 +443,20 @@ html[dir=rtl] input.name {
 input.name:focus {
   color: #555;
 }
 
 input.name:-moz-placeholder {
   font-style: italic !important;
   color: transparent;
   background-image: url(chrome://browser/skin/tabview/edit-light.png);
+  background-image-opacity: .1;
   background-repeat: no-repeat;
   -moz-padding-start: 20px;
+  -moz-padding-end: -20px;
 }
 
 .title-container:hover input.name:-moz-placeholder {
   color: #CCC;
 }
 
 .title-container {
   cursor: text;