From 665c6cb9189a14f73d823fa9487d5363774594ef Mon Sep 17 00:00:00 2001 From: Drew Willcoxon Date: Thu, 16 Sep 2010 15:04:00 -0700 Subject: [PATCH] Backed out changeset 05d3282d1e7a due to orange. a=bustage --- browser/base/content/browser.css | 15 ++++++--------- browser/base/content/urlbarBindings.xml | 24 +++--------------------- 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css index 4fa84d438fa0..b2138a3f5e14 100644 --- a/browser/base/content/browser.css +++ b/browser/base/content/browser.css @@ -156,19 +156,11 @@ html|*.urlbar-input { /* over-link in location bar */ -/* Delay transitions on mouseout. (Mouseover transitions are delayed by a - timeout in urlbarBindings.xml.) */ -.urlbar-textbox-container:not([overlinkstate]), -.urlbar-over-link-layer:not([overlinkstate]), -.urlbar-textbox-container-children:not([overlinkstate]), -.urlbar-over-link-box:not([overlinkstate]) { - -moz-transition-delay: 100ms; -} - .urlbar-over-link-layer[overlinkstate="fade-in"], .urlbar-textbox-container:not([overlinkstate]) { -moz-transition-property: color; -moz-transition-duration: 150ms; + -moz-transition-delay: 50ms; -moz-transition-timing-function: cubic-bezier(0.0, 0.6, 1.0, 1.0); } @@ -176,6 +168,7 @@ html|*.urlbar-input { .urlbar-over-link-layer:not([overlinkstate]) { -moz-transition-property: color; -moz-transition-duration: 150ms; + -moz-transition-delay: 50ms; -moz-transition-timing-function: linear; color: transparent; } @@ -184,6 +177,8 @@ html|*.urlbar-input { .urlbar-textbox-container-children:not([overlinkstate]) { -moz-transition-property: opacity; -moz-transition-duration: 150ms; + -moz-transition-delay: 50ms; + -moz-transition-timing-function: cubic-bezier(0.0, 0.6, 1.0, 1.0); opacity: 1; } @@ -191,6 +186,8 @@ html|*.urlbar-input { .urlbar-over-link-box:not([overlinkstate]) { -moz-transition-property: opacity; -moz-transition-duration: 150ms; + -moz-transition-delay: 50ms; + -moz-transition-timing-function: linear; opacity: 0; } diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml index 561a596d3845..1352705b06f3 100644 --- a/browser/base/content/urlbarBindings.xml +++ b/browser/base/content/urlbarBindings.xml @@ -596,26 +596,12 @@ "textbox-container"); ]]> - - - -