Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1385913 - Remove MOZ_PHOTON_ANIMATIONS ifdef. r=Gijs

Browse Source 
MozReview-Commit-ID: 40TP43EKPCU

--HG--
extra : rebase_source : 203f7449e8345ed5c779dfc4fd5e9bd515b89da8
This commit is contained in:
Jared Wein 2017-08-07 12:37:34 -04:00
parent 990481538b
commit 76f886b972
29 changed files with 13 additions and 431 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
browser/base/content/browser-places.js
View File

@ -142,7 +142,6 @@ var StarUI = {
.transact().catch(Cu.reportError);
} else if (this._isNewBookmark &&
Services.prefs.getBoolPref("toolkit.cosmeticAnimations.enabled") &&
AppConstants.MOZ_PHOTON_ANIMATIONS &&
(libraryButton = document.getElementById("library-button")) &&
libraryButton.getAttribute("cui-areatype") != "menu-panel" &&
libraryButton.getAttribute("overflowedItem") != "true" &&
@ -1705,8 +1704,7 @@ var BookmarkingUI = {
this._updateCustomizationState();
}
if (AppConstants.MOZ_PHOTON_ANIMATIONS &&
Services.prefs.getBoolPref("toolkit.cosmeticAnimations.enabled")) {
if (Services.prefs.getBoolPref("toolkit.cosmeticAnimations.enabled")) {
let starButtonBox = document.getElementById("star-button-box");
starButtonBox.setAttribute("animationsenabled", "true");
this.star.addEventListener("mouseover", this, {once: true});
@ -1719,9 +1717,7 @@ var BookmarkingUI = {
this.updateBookmarkPageMenuItem(true);
CustomizableUI.removeListener(this);
if (AppConstants.MOZ_PHOTON_ANIMATIONS) {
this.star.removeEventListener("mouseover", this);
}
this.star.removeEventListener("mouseover", this);
this._uninitView();
@ -1800,9 +1796,7 @@ var BookmarkingUI = {
this.button.setAttribute("label", this._starButtonOverflowedStarredLabel);
}
} else {
if (AppConstants.MOZ_PHOTON_ANIMATIONS) {
this.star.removeAttribute("animate");
}
this.star.removeAttribute("animate");
this.broadcaster.removeAttribute("starred");
this.broadcaster.setAttribute("buttontooltiptext", this._unstarredTooltip);
this.broadcaster.setAttribute("tooltiptext", this._unstarredTooltip);
@ -1938,7 +1932,7 @@ var BookmarkingUI = {
if (!isBookmarked && !AppConstants.MOZ_PHOTON_THEME)
this._showBookmarkedNotification();
// Set up variables for new animation in Photon
if (!isBookmarked && AppConstants.MOZ_PHOTON_ANIMATIONS) {
if (!isBookmarked) {
BrowserUtils.setToolbarButtonHeightProperty(this.star);
this.star.setAttribute("animate", "true");
}
@ -1953,9 +1947,7 @@ var BookmarkingUI = {
handleEvent: function BUI_handleEvent(aEvent) {
switch (aEvent.type) {
case "mouseover":
if (AppConstants.MOZ_PHOTON_ANIMATIONS) {
this.star.setAttribute("preloadanimations", "true");
}
this.star.setAttribute("preloadanimations", "true");
break;
case "ViewShowing":
this.onPanelMenuViewShowing(aEvent);

81
browser/base/content/browser.css
View File

@ -1134,7 +1134,6 @@ toolbarpaletteitem[place="palette"] > #downloads-button[indicator] > #downloads-
-moz-image-region: auto;
}
%ifdef MOZ_PHOTON_ANIMATIONS
%ifdef MOZ_WIDGET_COCOA
/* On Mac, use the properties "-moz-window-transform" and "-moz-window-opacity"
@ -1198,86 +1197,6 @@ toolbarpaletteitem[place="palette"] > #downloads-button[indicator] > #downloads-
}
%endif
%else
%ifdef MOZ_WIDGET_COCOA
#BMB_bookmarksPopup {
-moz-window-transform: scale(.4);
-moz-window-opacity: 0;
transition-property: -moz-window-transform, -moz-window-opacity;
transition-duration: 0.15s;
transition-timing-function: ease-out;
}
#BMB_bookmarksPopup[animate="open"] {
-moz-window-transform: none;
-moz-window-opacity: 1.0;
}
#BMB_bookmarksPopup[animate="cancel"] {
-moz-window-transform: none;
}
#BMB_bookmarksPopup[arrowposition="after_start"]:-moz-locale-dir(ltr),
#BMB_bookmarksPopup[arrowposition="after_end"]:-moz-locale-dir(rtl) {
-moz-window-transform-origin: 20px top;
}
#BMB_bookmarksPopup[arrowposition="after_end"]:-moz-locale-dir(ltr),
#BMB_bookmarksPopup[arrowposition="after_start"]:-moz-locale-dir(rtl) {
-moz-window-transform-origin: calc(100% - 20px) top;
}
#BMB_bookmarksPopup[arrowposition="before_start"]:-moz-locale-dir(ltr),
#BMB_bookmarksPopup[arrowposition="before_end"]:-moz-locale-dir(rtl) {
-moz-window-transform-origin: 20px bottom;
}
#BMB_bookmarksPopup[arrowposition="before_end"]:-moz-locale-dir(ltr),
#BMB_bookmarksPopup[arrowposition="before_start"]:-moz-locale-dir(rtl) {
-moz-window-transform-origin: calc(100% - 20px) bottom;
}
%elifndef MOZ_WIDGET_GTK
#BMB_bookmarksPopup {
transform: scale(.4);
opacity: 0;
transition-property: transform, opacity;
transition-duration: 0.15s;
transition-timing-function: ease-out;
}
#BMB_bookmarksPopup[animate="open"] {
transform: none;
opacity: 1.0;
}
#BMB_bookmarksPopup[animate="cancel"] {
transform: none;
}
#BMB_bookmarksPopup[arrowposition="after_start"]:-moz-locale-dir(ltr),
#BMB_bookmarksPopup[arrowposition="after_end"]:-moz-locale-dir(rtl) {
transform-origin: 20px top;
}
#BMB_bookmarksPopup[arrowposition="after_end"]:-moz-locale-dir(ltr),
#BMB_bookmarksPopup[arrowposition="after_start"]:-moz-locale-dir(rtl) {
transform-origin: calc(100% - 20px) top;
}
#BMB_bookmarksPopup[arrowposition="before_start"]:-moz-locale-dir(ltr),
#BMB_bookmarksPopup[arrowposition="before_end"]:-moz-locale-dir(rtl) {
transform-origin: 20px bottom;
}
#BMB_bookmarksPopup[arrowposition="before_end"]:-moz-locale-dir(ltr),
#BMB_bookmarksPopup[arrowposition="before_start"]:-moz-locale-dir(rtl) {
transform-origin: calc(100% - 20px) bottom;
}
%endif
%endif
/* Customize mode */
%ifndef MOZ_PHOTON_THEME
#navigator-toolbox,

6
browser/base/content/browser.js
View File

@ -5062,8 +5062,7 @@ var CombinedStopReload = {
this.timeWhenSwitchedToStop = window.performance.now();
}
let shouldAnimate = AppConstants.MOZ_PHOTON_ANIMATIONS &&
aRequest &&
let shouldAnimate = aRequest &&
aWebProgress.isTopLevel &&
aWebProgress.isLoadingDocument &&
!gBrowser.tabAnimationsInProgress &&
@ -5086,8 +5085,7 @@ var CombinedStopReload = {
return;
}
let shouldAnimate = AppConstants.MOZ_PHOTON_ANIMATIONS &&
aRequest &&
let shouldAnimate = aRequest &&
aWebProgress.isTopLevel &&
!aWebProgress.isLoadingDocument &&
!gBrowser.tabAnimationsInProgress &&

2
browser/base/content/browser.xul
View File

@ -1067,11 +1067,9 @@
class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button"
skipintoolbarset="true"
tooltiptext="&navbarOverflow.label;">
#ifdef MOZ_PHOTON_ANIMATIONS
<box class="toolbarbutton-animatable-box">
<image class="toolbarbutton-animatable-image"/>
</box>
#endif
</toolbarbutton>
<toolbaritem id="PanelUI-button"

3
browser/components/customizableui/CustomizeMode.jsm
View File

@ -666,8 +666,7 @@ CustomizeMode.prototype = {
CustomizableUI.dispatchToolboxEvent("customizationchange");
}
if (AppConstants.MOZ_PHOTON_ANIMATIONS &&
Services.prefs.getBoolPref("toolkit.cosmeticAnimations.enabled")) {
if (Services.prefs.getBoolPref("toolkit.cosmeticAnimations.enabled")) {
let overflowButton = this.document.getElementById("nav-bar-overflow-button");
BrowserUtils.setToolbarButtonHeightProperty(overflowButton).then(() => {
overflowButton.setAttribute("animate", "true");

8
browser/components/downloads/content/indicator.js
View File

@ -346,7 +346,7 @@ const DownloadsIndicatorView = {
// Note: no notifier animation for download finished in Photon
let notifier = this.notifier;
if (aType == "start" || !AppConstants.MOZ_PHOTON_ANIMATIONS) {
if (aType == "start") {
// Show the notifier before measuring for size/placement. Being hidden by default
// avoids the interference with scrolling/APZ when the notifier element is
// tall enough to overlap the tabbrowser element
@ -369,11 +369,7 @@ const DownloadsIndicatorView = {
let animationDuration;
// This value is determined by the overall duration of animation in CSS.
if (AppConstants.MOZ_PHOTON_ANIMATIONS) {
animationDuration = aType == "start" ? 760 : 850;
} else {
animationDuration = 2000;
}
animationDuration = aType == "start" ? 760 : 850;
this._notificationTimeout = setTimeout(() => {
notifier.setAttribute("hidden", "true");

2
browser/components/downloads/content/indicatorOverlay.xul
View File

@ -25,9 +25,7 @@
its arrow unexpectedly. -->
<stack id="downloads-indicator-anchor"
consumeanchor="downloads-button">
#ifdef MOZ_PHOTON_ANIMATIONS
<box id="downloads-indicator-icon"/>
#endif
<stack id="downloads-indicator-progress-outer">
<box id="downloads-indicator-progress-inner"/>
</stack>

2
browser/components/downloads/jar.mn
View File

@ -8,7 +8,7 @@ browser.jar:
content/browser/downloads/downloads.js (content/downloads.js)
* content/browser/downloads/downloadsOverlay.xul (content/downloadsOverlay.xul)
content/browser/downloads/indicator.js (content/indicator.js)
* content/browser/downloads/indicatorOverlay.xul (content/indicatorOverlay.xul)
content/browser/downloads/indicatorOverlay.xul (content/indicatorOverlay.xul)
* content/browser/downloads/allDownloadsViewOverlay.xul (content/allDownloadsViewOverlay.xul)
content/browser/downloads/allDownloadsViewOverlay.js (content/allDownloadsViewOverlay.js)
* content/browser/downloads/contentAreaDownloadsView.xul (content/contentAreaDownloadsView.xul)

3
browser/extensions/pocket/bootstrap.js vendored
View File

@ -120,8 +120,7 @@ function CreatePocketWidget(reason) {
doc.getElementById("PanelUI-multiView").appendChild(view);
},
onCreated(node) {
if (Services.prefs.getBoolPref("toolkit.cosmeticAnimations.enabled") &&
AppConstants.MOZ_PHOTON_ANIMATIONS) {
if (Services.prefs.getBoolPref("toolkit.cosmeticAnimations.enabled")) {
let doc = node.ownerDocument;
let box = doc.createElement("box");
box.classList.add("toolbarbutton-animatable-box");

BIN
browser/themes/linux/downloads/download-notification-finish.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.8 KiB

BIN
browser/themes/linux/downloads/download-notification-start.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.1 KiB

4
browser/themes/linux/jar.mn
View File

@ -40,10 +40,6 @@ browser.jar:
* skin/classic/browser/customizableui/panelUI.css (customizableui/panelUI.css)
* skin/classic/browser/downloads/allDownloadsViewOverlay.css (downloads/allDownloadsViewOverlay.css)
skin/classic/browser/downloads/download-glow-menuPanel.png (downloads/download-glow-menuPanel.png)
#ifndef MOZ_PHOTON_ANIMATIONS
skin/classic/browser/downloads/download-notification-finish.png (downloads/download-notification-finish.png)
skin/classic/browser/downloads/download-notification-start.png (downloads/download-notification-start.png)
#endif
* skin/classic/browser/downloads/downloads.css (downloads/downloads.css)
skin/classic/browser/feeds/feedIcon.png (feeds/feedIcon.png)
skin/classic/browser/feeds/feedIcon16.png (feeds/feedIcon16.png)

BIN
browser/themes/osx/downloads/download-notification-finish.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.0 KiB

BIN
browser/themes/osx/downloads/download-notification-finish@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.0 KiB

BIN
browser/themes/osx/downloads/download-notification-start.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.1 KiB

BIN
browser/themes/osx/downloads/download-notification-start@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 19 KiB

16
browser/themes/osx/downloads/indicator.css
View File

@ -10,19 +10,3 @@
list-style-image: url("chrome://browser/skin/downloads/download-glow-menuPanel@2x.png");
}
}
%ifndef MOZ_PHOTON_ANIMATIONS
@media (min-resolution: 2dppx) {
#downloads-notification-anchor[notification="start"] > #downloads-indicator-notification {
background-image: url("chrome://browser/skin/downloads/download-notification-start@2x.png");
}
}
@media (min-resolution: 2dppx) {
#downloads-notification-anchor[notification="finish"] > #downloads-indicator-notification {
background-image: url("chrome://browser/skin/downloads/download-notification-finish@2x.png");
}
}
%endif

6
browser/themes/osx/jar.mn
View File

@ -60,12 +60,6 @@ browser.jar:
* skin/classic/browser/downloads/allDownloadsViewOverlay.css (downloads/allDownloadsViewOverlay.css)
skin/classic/browser/downloads/download-glow-menuPanel.png (downloads/download-glow-menuPanel.png)
skin/classic/browser/downloads/download-glow-menuPanel@2x.png (downloads/download-glow-menuPanel@2x.png)
#ifndef MOZ_PHOTON_ANIMATIONS
skin/classic/browser/downloads/download-notification-finish.png (downloads/download-notification-finish.png)
skin/classic/browser/downloads/download-notification-finish@2x.png (downloads/download-notification-finish@2x.png)
skin/classic/browser/downloads/download-notification-start.png (downloads/download-notification-start.png)
skin/classic/browser/downloads/download-notification-start@2x.png (downloads/download-notification-start@2x.png)
#endif
* skin/classic/browser/downloads/downloads.css (downloads/downloads.css)
skin/classic/browser/feeds/subscribe.css (feeds/subscribe.css)
skin/classic/browser/feeds/feedIcon.png (feeds/feedIcon.png)

124
browser/themes/shared/downloads/indicator.inc.css
View File

@ -22,47 +22,32 @@
height: 16px;
background-size: 16px;
-moz-context-properties: fill;
%ifdef MOZ_PHOTON_ANIMATIONS
background: url("chrome://browser/skin/downloads/download-icons.svg#default-bar") center no-repeat;
%else
background: var(--downloads-indicator-image) center no-repeat;
%endif
}
%ifdef MOZ_PHOTON_ANIMATIONS
#downloads-button[attention="success"] > #downloads-indicator-anchor > #downloads-indicator-icon,
%endif
#downloads-button[attention="success"] > #downloads-indicator-anchor > #downloads-indicator-progress-outer {
fill: var(--toolbarbutton-icon-fill-attention);
}
%ifdef MOZ_PHOTON_ANIMATIONS
#downloads-button[progress] > #downloads-indicator-anchor > #downloads-indicator-progress-outer {
background: url("chrome://browser/skin/downloads/download-icons.svg#progress-bar-bg") center no-repeat;
}
%endif
#downloads-button[attention="success"] {
list-style-image: url("chrome://browser/skin/downloads/download-glow-menuPanel.png");
-moz-image-region: auto;
}
%ifdef MOZ_PHOTON_ANIMATIONS
#downloads-indicator-icon {
-moz-context-properties: fill;
background-image: url("chrome://browser/skin/downloads/download-icons.svg#arrow");
width: 16px;
height: 16px;
}
%endif
#downloads-indicator-progress-inner {
%ifdef MOZ_PHOTON_ANIMATIONS
background: url("chrome://browser/skin/downloads/download-icons.svg#progress-bar-fg") left no-repeat;
margin-right: 16px;
%else
background: var(--downloads-indicator-image) bottom no-repeat;
margin-top: 16px;
%endif
-moz-context-properties: fill;
fill: var(--toolbarbutton-icon-fill-attention);
background-size: 16px;
@ -77,40 +62,21 @@
animation-name: indicatorArrowProgress;
}
%ifndef MOZ_PHOTON_ANIMATIONS
toolbar[brighttext] #downloads-indicator-progress-inner {
animation-name: indicatorArrowProgressDark;
}
%endif
%ifdef MOZ_PHOTON_ANIMATIONS
#downloads-indicator-progress-inner:-moz-locale-dir(rtl) {
animation-name: indicatorArrowProgressRTL;
margin-left: 16px;
margin-right: 0;
}
%endif
@keyframes indicatorArrowProgress {
0% {
%ifdef MOZ_PHOTON_ANIMATIONS
margin-right: 14px;
%else
margin-top: 12px;
filter: brightness(1.2);
%endif
}
100% {
%ifdef MOZ_PHOTON_ANIMATIONS
margin-right: 2px;
%else
margin-top: 2px;
filter: brightness(1);
%endif
}
}
%ifdef MOZ_PHOTON_ANIMATIONS
@keyframes indicatorArrowProgressRTL {
0% {
margin-left: 14px;
@ -119,18 +85,6 @@ toolbar[brighttext] #downloads-indicator-progress-inner {
margin-left: 2px;
}
}
%else
@keyframes indicatorArrowProgressDark {
0% {
margin-top: 12px;
filter: brightness(0.7);
}
100% {
margin-top: 2px;
filter: brightness(1);
}
}
%endif
/*** Status badges ***/
@ -166,7 +120,6 @@ toolbar[brighttext] #downloads-indicator-progress-inner {
/*** Download notifications ***/
%ifdef MOZ_PHOTON_ANIMATIONS
#downloads-button[notification="start"] > #downloads-indicator-anchor > #downloads-indicator-icon {
animation-name: downloadsIndicatorStartDip;
/* Upon changing the duration_delay below, please keep the delay time of
@ -178,18 +131,7 @@ toolbar[brighttext] #downloads-indicator-progress-inner {
animation-delay: 400ms;
animation-iteration-count: 1;
}
%else
#downloads-button[notification="start"] > #downloads-indicator-anchor > #downloads-indicator-progress-outer {
animation-name: downloadsIndicatorStartJump;
/* Upon changing the overall duration below, please keep the delay time of
setTimeout() identical in indicator.js for this animation. */
animation-duration: 0.5s;
animation-delay: 1s;
animation-iteration-count: 2;
}
%endif
%ifdef MOZ_PHOTON_ANIMATIONS
@keyframes downloadsIndicatorStartDip {
0% {
transform: translateY(0);
@ -213,31 +155,13 @@ toolbar[brighttext] #downloads-indicator-progress-inner {
37.5% { transform: scale(1.4); animation-timing-function: ease-out; }
to { transform: scale(1); animation-timing-function: ease-in; }
}
%else
@keyframes downloadsIndicatorStartJump {
0% {
transform: translateY(0);
animation-timing-function: ease-out;
}
50% {
transform: translateY(-3px);
animation-timing-function: ease-in;
}
100% {
transform: translateY(0);
}
}
%endif
%ifdef MOZ_PHOTON_ANIMATIONS
#downloads-button[notification="finish"] > #downloads-indicator-anchor > #downloads-indicator-icon {
animation-name: downloadsIndicatorFinishPulse;
animation-delay: 250ms;
animation-duration: 300ms;
animation-iteration-count: 2;
}
%endif
#downloads-animation-container {
min-height: 1px;
@ -252,7 +176,6 @@ toolbar[brighttext] #downloads-indicator-progress-inner {
z-index: 5;
}
%ifdef MOZ_PHOTON_ANIMATIONS
/* download start animation */
#downloads-notification-anchor {
@ -266,25 +189,15 @@ toolbar[brighttext] #downloads-indicator-progress-inner {
/* animation is not directional and shouldn't be reversed in RTL */
direction: ltr;
}
%endif
#downloads-indicator-notification {
opacity: 0;
%ifdef MOZ_PHOTON_ANIMATIONS
min-width: 1344px;
height: 98px; /* Height is equal to height of each frame in the SVG animation */
-moz-context-properties: fill;
fill: #737373;
%else
background-size: 16px;
background-position: center;
background-repeat: no-repeat;
width: 16px;
height: 16px;
%endif
}
%ifdef MOZ_PHOTON_ANIMATIONS
@keyframes downloadsIndicatorNotificationStart {
from {
transform: translateX(0);
@ -293,28 +206,8 @@ toolbar[brighttext] #downloads-indicator-progress-inner {
transform: translateX(-1302px);
}
}
%else
@keyframes downloadsIndicatorNotificationStartRight {
from { opacity: 0; transform: translate(-128px, 128px) scale(8); }
20% { opacity: .85; animation-timing-function: ease-out; }
to { opacity: 0; transform: translate(0) scale(1); }
}
@keyframes downloadsIndicatorNotificationStartLeft {
from { opacity: 0; transform: translate(128px, 128px) scale(8); }
20% { opacity: .85; animation-timing-function: ease-out; }
to { opacity: 0; transform: translate(0) scale(1); }
}
@keyframes downloadsIndicatorNotificationFinish {
from { opacity: 0; transform: scale(1); }
20% { opacity: .65; animation-timing-function: ease-in; }
to { opacity: 0; transform: scale(8); }
}
%endif
#downloads-notification-anchor[notification="start"] > #downloads-indicator-notification {
%ifdef MOZ_PHOTON_ANIMATIONS
opacity: 1;
background: url("chrome://browser/skin/downloads/notification-start-animation.svg") 0 center no-repeat;
transform: translateX(0px);
@ -322,21 +215,4 @@ toolbar[brighttext] #downloads-indicator-progress-inner {
animation-duration: 540ms;
animation-delay: 64ms;
animation-timing-function: steps(31);
%else
background-image: url("chrome://browser/skin/downloads/download-notification-start.png");
animation-name: downloadsIndicatorNotificationStartRight;
animation-duration: 1s;
%endif
}
%ifndef MOZ_PHOTON_ANIMATIONS
#downloads-notification-anchor[notification="start"]:-moz-locale-dir(rtl) > #downloads-indicator-notification {
animation-name: downloadsIndicatorNotificationStartLeft;
}
#downloads-notification-anchor[notification="finish"] > #downloads-indicator-notification {
background-image: url("chrome://browser/skin/downloads/download-notification-finish.png");
animation-name: downloadsIndicatorNotificationFinish;
animation-duration: 1s;
}
%endif

12
browser/themes/shared/jar.inc.mn
View File

@ -61,9 +61,7 @@
#ifdef MOZ_PHOTON_THEME
skin/classic/browser/downloads/download-icons.svg (../shared/downloads/download-icons.svg)
#endif
#ifdef MOZ_PHOTON_ANIMATIONS
skin/classic/browser/downloads/notification-start-animation.svg (../shared/downloads/notification-start-animation.svg)
#endif
skin/classic/browser/drm-icon.svg (../shared/drm-icon.svg)
skin/classic/browser/fullscreen/insecure.svg (../shared/fullscreen/insecure.svg)
skin/classic/browser/fullscreen/secure.svg (../shared/fullscreen/secure.svg)
@ -124,9 +122,7 @@
#endif
skin/classic/browser/back-12.svg (../shared/icons/back-12.svg)
skin/classic/browser/bookmark.svg (../shared/icons/bookmark.svg)
#ifdef MOZ_PHOTON_ANIMATIONS
skin/classic/browser/bookmark-animation.svg (../shared/icons/bookmark-animation.svg)
#endif
skin/classic/browser/bookmark-hollow.svg (../shared/icons/bookmark-hollow.svg)
#ifndef MOZ_PHOTON_THEME
skin/classic/browser/bookmarksMenu.svg (../shared/icons/bookmarksMenu.svg)
@ -135,9 +131,7 @@
#endif
skin/classic/browser/characterEncoding.svg (../shared/icons/characterEncoding.svg)
skin/classic/browser/chevron.svg (../shared/icons/chevron.svg)
#ifdef MOZ_PHOTON_ANIMATIONS
skin/classic/browser/chevron-animation.svg (../shared/icons/chevron-animation.svg)
#endif
skin/classic/browser/check.svg (../shared/icons/check.svg)
skin/classic/browser/containers.svg (../shared/icons/containers.svg)
skin/classic/browser/customize.svg (../shared/icons/customize.svg)
@ -166,9 +160,7 @@
skin/classic/browser/history.svg (../shared/icons/history.svg)
skin/classic/browser/home.svg (../shared/icons/home.svg)
skin/classic/browser/library.svg (../shared/icons/library.svg)
#ifdef MOZ_PHOTON_ANIMATIONS
skin/classic/browser/library-bookmark-animation.svg (../shared/icons/library-bookmark-animation.svg)
#endif
#ifdef MOZ_PHOTON_THEME
skin/classic/browser/link.svg (../shared/icons/link.svg)
#endif
@ -184,18 +176,14 @@
skin/classic/browser/privateBrowsing.svg (../shared/icons/privateBrowsing.svg)
skin/classic/browser/quit.svg (../shared/icons/quit.svg)
skin/classic/browser/reload.svg (../shared/icons/reload.svg)
#ifdef MOZ_PHOTON_ANIMATIONS
skin/classic/browser/reload-to-stop.svg (../shared/icons/reload-to-stop.svg)
#endif
skin/classic/browser/save.svg (../shared/icons/save.svg)
skin/classic/browser/settings.svg (../shared/icons/settings.svg)
skin/classic/browser/share.svg (../shared/icons/share.svg)
skin/classic/browser/sidebars.svg (../shared/icons/sidebars.svg)
skin/classic/browser/sidebars-right.svg (../shared/icons/sidebars-right.svg)
skin/classic/browser/stop.svg (../shared/icons/stop.svg)
#ifdef MOZ_PHOTON_ANIMATIONS
skin/classic/browser/stop-to-reload.svg (../shared/icons/stop-to-reload.svg)
#endif
skin/classic/browser/sync.svg (../shared/icons/sync.svg)
skin/classic/browser/synced-tabs.svg (../shared/icons/synced-tabs.svg)
skin/classic/browser/webIDE.svg (../shared/icons/webIDE.svg)

7
browser/themes/shared/toolbarbutton-icons.inc.css
View File

@ -35,7 +35,6 @@ toolbar[brighttext] .toolbarbutton-1 {
}
%ifdef MOZ_PHOTON_THEME
%ifdef MOZ_PHOTON_ANIMATIONS
.toolbarbutton-animatable-box > .toolbarbutton-animatable-image {
animation-fill-mode: forwards;
animation-iteration-count: 1;
@ -171,7 +170,7 @@ toolbar[brighttext] .toolbarbutton-1 {
#reload-button[displaystop] + #stop-button:-moz-locale-dir(rtl) > .toolbarbutton-animatable-box > .toolbarbutton-animatable-image {
transform: scaleX(-1) translateX(-450px);
}
%endif
#reload-button {
list-style-image: url("chrome://browser/skin/reload.svg");
}
@ -329,7 +328,6 @@ toolbar:not([brighttext]) #bookmarks-menu-button@attributeSelectorForToolbar@[st
list-style-image: url("chrome://browser/skin/chevron.svg");
}
%ifdef MOZ_PHOTON_ANIMATIONS
#nav-bar-overflow-button[animate] > .toolbarbutton-icon {
fill: transparent;
}
@ -415,7 +413,6 @@ toolbar:not([brighttext]) #bookmarks-menu-button@attributeSelectorForToolbar@[st
#nav-bar-overflow-button[animate][fade]:-moz-locale-dir(rtl) > .toolbarbutton-animatable-box > .toolbarbutton-animatable-image {
transform: scaleX(-1);
}
%endif
#email-link-button@attributeSelectorForToolbar@ {
list-style-image: url("chrome://browser/skin/mail.svg");
@ -446,7 +443,6 @@ toolbar:not([brighttext]) #bookmarks-menu-button@attributeSelectorForToolbar@[st
list-style-image: url("chrome://browser/skin/library.svg");
}
%ifdef MOZ_PHOTON_ANIMATIONS
@keyframes library-bookmark-animation {
from {
transform: translateX(0);
@ -533,4 +529,3 @@ toolbar:not([brighttext]) #bookmarks-menu-button@attributeSelectorForToolbar@[st
animation-duration: 2s;
animation-timing-function: ease-out;
}
%endif

2
browser/themes/shared/toolbarbuttons.inc.css
View File

@ -29,12 +29,10 @@
--toolbarbutton-inner-padding: 3px;
%endif
%ifdef MOZ_PHOTON_ANIMATIONS
/* This default value of --toolbarbutton-height is defined to prevent
CSS errors for an invalid variable. The value should not get used,
as a more specific value should be set when the value will be used. */
--toolbarbutton-height: 0;
%endif
}
/* Larger buttons in touch mode */

2
browser/themes/shared/urlbar-searchbar.inc.css
View File

@ -132,7 +132,6 @@
list-style-image: url("chrome://browser/skin/page-action.svg");
}
%ifdef MOZ_PHOTON_ANIMATIONS
@keyframes bookmark-animation {
from {
transform: translateX(0);
@ -201,7 +200,6 @@
#star-button-box[animationsenabled] > #star-button[starred][animate]:-moz-locale-dir(rtl) + #star-button-animatable-box > #star-button-animatable-image {
animation-name: bookmark-animation-rtl;
}
%endif /* MOZ_PHOTON_ANIMATIONS */
%endif /* MOZ_PHOTON_THEME */
/* Zoom button */

BIN
browser/themes/windows/downloads/download-notification-finish.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.8 KiB

BIN
browser/themes/windows/downloads/download-notification-start.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

4
browser/themes/windows/jar.mn
View File

@ -65,10 +65,6 @@ browser.jar:
* skin/classic/browser/downloads/allDownloadsViewOverlay.css (downloads/allDownloadsViewOverlay.css)
skin/classic/browser/downloads/download-glow-menuPanel.png (downloads/download-glow-menuPanel.png)
skin/classic/browser/downloads/download-glow-menuPanel-win7.png (downloads/download-glow-menuPanel-win7.png)
#ifndef MOZ_PHOTON_ANIMATIONS
skin/classic/browser/downloads/download-notification-finish.png (downloads/download-notification-finish.png)
skin/classic/browser/downloads/download-notification-start.png (downloads/download-notification-start.png)
#endif
* skin/classic/browser/downloads/downloads.css (downloads/downloads.css)
skin/classic/browser/feeds/feedIcon.png (feeds/feedIcon.png)
skin/classic/browser/feeds/feedIcon16.png (feeds/feedIcon16.png)

123
toolkit/content/xul.css
View File

@ -441,7 +441,6 @@ panel[type="arrow"] {
-moz-binding: url("chrome://global/content/bindings/popup.xml#arrowpanel");
}
%ifdef MOZ_PHOTON_ANIMATIONS
%ifdef MOZ_WIDGET_COCOA
/* On Mac, use the properties "-moz-window-transform" and "-moz-window-opacity"
@ -509,128 +508,6 @@ panel[type="arrow"][animating] {
pointer-events: none;
}
%else
%ifdef MOZ_WIDGET_COCOA
panel[type="arrow"]:not([animate="false"]) {
-moz-window-transform: scale(.4);
-moz-window-opacity: 0;
transition-property: -moz-window-transform, -moz-window-opacity;
transition-duration: 0.15s;
transition-timing-function: ease-out;
}
panel[type="arrow"][animate="open"] {
-moz-window-transform: none;
-moz-window-opacity: 1.0;
}
panel[type="arrow"][animate="cancel"] {
-moz-window-transform: none;
}
panel[arrowposition="after_start"]:-moz-locale-dir(ltr),
panel[arrowposition="after_end"]:-moz-locale-dir(rtl) {
-moz-window-transform-origin: 20px top;
}
panel[arrowposition="after_end"]:-moz-locale-dir(ltr),
panel[arrowposition="after_start"]:-moz-locale-dir(rtl) {
-moz-window-transform-origin: calc(100% - 20px) top;
}
panel[arrowposition="before_start"]:-moz-locale-dir(ltr),
panel[arrowposition="before_end"]:-moz-locale-dir(rtl) {
-moz-window-transform-origin: 20px bottom;
}
panel[arrowposition="before_end"]:-moz-locale-dir(ltr),
panel[arrowposition="before_start"]:-moz-locale-dir(rtl) {
-moz-window-transform-origin: calc(100% - 20px) bottom;
}
panel[arrowposition="start_before"]:-moz-locale-dir(ltr),
panel[arrowposition="end_before"]:-moz-locale-dir(rtl) {
-moz-window-transform-origin: right 20px;
}
panel[arrowposition="start_after"]:-moz-locale-dir(ltr),
panel[arrowposition="end_after"]:-moz-locale-dir(rtl) {
-moz-window-transform-origin: right calc(100% - 20px);
}
panel[arrowposition="end_before"]:-moz-locale-dir(ltr),
panel[arrowposition="start_before"]:-moz-locale-dir(rtl) {
-moz-window-transform-origin: left 20px;
}
panel[arrowposition="end_after"]:-moz-locale-dir(ltr),
panel[arrowposition="start_after"]:-moz-locale-dir(rtl) {
-moz-window-transform-origin: left calc(100% - 20px);
}
%elifndef MOZ_WIDGET_GTK
panel[type="arrow"]:not([animate="false"]) {
transform: scale(.4);
opacity: 0;
transition-property: transform, opacity;
transition-duration: 0.15s;
transition-timing-function: ease-out;
}
panel[type="arrow"][animate="open"] {
transform: none;
opacity: 1.0;
}
panel[type="arrow"][animate="cancel"] {
transform: none;
}
panel[arrowposition="after_start"]:-moz-locale-dir(ltr),
panel[arrowposition="after_end"]:-moz-locale-dir(rtl) {
transform-origin: 20px top;
}
panel[arrowposition="after_end"]:-moz-locale-dir(ltr),
panel[arrowposition="after_start"]:-moz-locale-dir(rtl) {
transform-origin: calc(100% - 20px) top;
}
panel[arrowposition="before_start"]:-moz-locale-dir(ltr),
panel[arrowposition="before_end"]:-moz-locale-dir(rtl) {
transform-origin: 20px bottom;
}
panel[arrowposition="before_end"]:-moz-locale-dir(ltr),
panel[arrowposition="before_start"]:-moz-locale-dir(rtl) {
transform-origin: calc(100% - 20px) bottom;
}
panel[arrowposition="start_before"]:-moz-locale-dir(ltr),
panel[arrowposition="end_before"]:-moz-locale-dir(rtl) {
transform-origin: right 20px;
}
panel[arrowposition="start_after"]:-moz-locale-dir(ltr),
panel[arrowposition="end_after"]:-moz-locale-dir(rtl) {
transform-origin: right calc(100% - 20px);
}
panel[arrowposition="end_before"]:-moz-locale-dir(ltr),
panel[arrowposition="start_before"]:-moz-locale-dir(rtl) {
transform-origin: left 20px;
}
panel[arrowposition="end_after"]:-moz-locale-dir(ltr),
panel[arrowposition="start_after"]:-moz-locale-dir(rtl) {
transform-origin: left calc(100% - 20px);
}
%endif
%endif
%ifdef XP_MACOSX
.statusbar-resizerpanel {
display: none;

7
toolkit/modules/AppConstants.jsm
View File

@ -358,13 +358,6 @@ this.AppConstants = Object.freeze({
false,
#endif
MOZ_PHOTON_ANIMATIONS:
#ifdef MOZ_PHOTON_ANIMATIONS
true,
#else
false,
#endif
MOZ_PHOTON_PREFERENCES:
#ifdef MOZ_PHOTON_PREFERENCES
true,

12
toolkit/moz.configure
View File

@ -510,18 +510,6 @@ project_flag('MOZ_ALLOW_LEGACY_EXTENSIONS',
help='Allow legacy browser extensions',
default=True, set_as_define=True)
option(env='MOZ_PHOTON_ANIMATIONS',
help='Enable Photon UI animations',
default=milestone.is_nightly)
@depends('MOZ_PHOTON_ANIMATIONS')
def photon_animations(value):
if value:
return bool(value)
set_config('MOZ_PHOTON_ANIMATIONS', photon_animations)
set_define('MOZ_PHOTON_ANIMATIONS', photon_animations)
option(env='MOZ_PHOTON_PREFERENCES',
help='Enable Photon preferences',
default=milestone.is_nightly)