Backed out changeset da039c0c66bc (bug 971116) for mochitest-bc failures.

CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2014-03-10 13:49:42 -04:00
parent 8f1c73487e
commit 042ee1f1a7
2 changed files with 8 additions and 13 deletions

View File

@ -1009,13 +1009,10 @@ toolbarpaletteitem[place="palette"][hidden] {
@keyframes uitour-wobble {
from {
transform: rotate(0deg) translateX(3px) rotate(0deg);
}
50% {
transform: rotate(360deg) translateX(3px) rotate(-360deg);
transform: rotate(0deg) translateX(2px) rotate(0deg);
}
to {
transform: rotate(720deg) translateX(0px) rotate(-720deg);
transform: rotate(360deg) translateX(2px) rotate(-360deg);
}
}
@ -1057,9 +1054,7 @@ toolbarpaletteitem[place="palette"][hidden] {
#UITourHighlight[active="wobble"] {
animation-name: uitour-wobble;
animation-delay: 0s;
animation-duration: 1.5s;
animation-iteration-count: 1;
animation-duration: 1s;
}
#UITourHighlight[active="zoom"] {
animation-name: uitour-zoom;

View File

@ -71,7 +71,7 @@ this.UITour = {
widgetName: "PanelUI-fxa-status",
}],
["addons", {query: "#add-ons-button"}],
["appMenu", {query: "#PanelUI-button"}],
["appMenu", {query: "#PanelUI-menu-button"}],
["backForward", {
query: "#back-button",
widgetName: "urlbar-container",
@ -703,7 +703,7 @@ this.UITour = {
// Handle the non-customizable buttons at the bottom of the menu which aren't proper widgets.
return targetElement.id.startsWith("PanelUI-")
&& targetElement.id != "PanelUI-button";
&& targetElement.id != "PanelUI-menu-button";
},
/**
@ -811,9 +811,9 @@ this.UITour = {
let minDimension = Math.min(highlightHeight, highlightWidth);
let maxDimension = Math.max(highlightHeight, highlightWidth);
// If the dimensions are within 110% of each other (to include the bookmark button),
// make the highlight a circle with the largest dimension as the diameter.
if (maxDimension / minDimension <= 2.1) {
// If the dimensions are within 40% of eachother, make the highlight a circle with the
// largest dimension as the diameter.
if (maxDimension / minDimension <= 1.4) {
highlightHeight = highlightWidth = maxDimension;
highlighter.style.borderRadius = "100%";
} else {