Bug 612828 - Link target and current URL in location bar should transition at same non-linear rate. r=dao, a=gavin
authorDrew Willcoxon <adw@mozilla.com>
Wed, 17 Nov 2010 18:07:01 -0800
changeset 57843 2c5363747246cd55a2a572cc607790674d22f7e9
parent 57842 b433764562cc063de9d5164b1cc6239b1f15096f
child 57844 c7128de9595a8bdc160f033682213d9178d6fe7b
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersdao, gavin
bugs612828
milestone2.0b8pre
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
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -161,45 +161,56 @@ toolbar[mode="icons"] > #reload-button[d
 }
 
 html|*.urlbar-input {
   direction: ltr;
 }
 
 /* over-link in location bar */
 
+.urlbar-textbox-container[overlinkstate="fade-in"],
+.urlbar-over-link-layer[overlinkstate="fade-out"] {
+  -moz-transition-property: color;
+  -moz-transition-duration: 150ms;
+  color: transparent;
+}
+
 .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);
+  -moz-transition-timing-function: cubic-bezier(0.0, 1.0, 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-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;
 }
 
 .urlbar-over-link-box[overlinkstate="showing"] {
   opacity: 1;
 }