Bug 612828 - Link target and current URL in location bar should transition at same non-linear rate. r=dao, a=gavin

browser/base/content/browser.css

@@ -166,35 +166,46 @@ html|*.urlbar-input {
 
 /* over-link in location bar */
 
-.urlbar-over-link-layer[overlinkstate="fade-in"],
-.urlbar-textbox-container[overlinkstate="fade-out"] {
-  -moz-transition-property: color;
-  -moz-transition-duration: 150ms;
-  -moz-transition-timing-function: cubic-bezier(0.0, 0.6, 1.0, 1.0);
-}
-
 .urlbar-textbox-container[overlinkstate="fade-in"],
 .urlbar-over-link-layer[overlinkstate="fade-out"] {
   -moz-transition-property: color;
   -moz-transition-duration: 150ms;
-  -moz-transition-timing-function: linear;
   color: transparent;
 }
 
-.urlbar-over-link-box[overlinkstate="fade-in"],
-.urlbar-textbox-container-children[overlinkstate="fade-out"] {
+.urlbar-over-link-layer[overlinkstate="fade-in"],
+.urlbar-textbox-container[overlinkstate="fade-out"] {
+  -moz-transition-property: color;
+  -moz-transition-duration: 150ms;
+  -moz-transition-timing-function: cubic-bezier(0.0, 1.0, 1.0, 1.0);
+}
+
+.urlbar-over-link-box[overlinkstate="fade-in"] {
   -moz-transition-property: opacity;
   -moz-transition-duration: 150ms;
   opacity: 1;
 }
 
-.urlbar-textbox-container-children[overlinkstate="fade-in"],
 .urlbar-over-link-box[overlinkstate="fade-out"] {
   -moz-transition-property: opacity;
   -moz-transition-duration: 150ms;
+  -moz-transition-timing-function: cubic-bezier(0.0, 1.0, 1.0, 1.0);
   opacity: 0;
 }
 
+.urlbar-textbox-container-children[overlinkstate="fade-in"] {
+  -moz-transition-property: opacity;
+  -moz-transition-duration: 150ms;
+  opacity: 0;
+}
+
+.urlbar-textbox-container-children[overlinkstate="fade-out"] {
+  -moz-transition-property: opacity;
+  -moz-transition-duration: 150ms;
+  -moz-transition-timing-function: cubic-bezier(0.0, 1.0, 1.0, 1.0);
+  opacity: 1;
+}
+
 .urlbar-textbox-container[overlinkstate="showing"] {
   color: transparent;
 }