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

[Australis] Backed out changeset 3d0775f7bd0f (bug 897496) for the same error it caused last time.

Browse Source
This commit is contained in:
Wes Kocher 2014-01-30 19:09:08 -08:00
parent 26d5aedfa8
commit 39881bb81f
2 changed files with 10 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1051,7 +1051,6 @@ CustomizeMode.prototype = {
// before this fires, which leaves us with placeholders inserted after
// we've exited. So we need to check that we are indeed customizing.
if (this._customizing && !this._transitioning) {
item.removeAttribute("dragstarting");
item.hidden = true;
this._showPanelCustomizationPlaceholders();
DragPositionManager.start(this.window);
@ -1062,8 +1061,6 @@ CustomizeMode.prototype = {
this._initializeDragAfterMove = null;
this.window.clearTimeout(this._dragInitializeTimeout);
}.bind(this);
item.setAttribute("dragstarting", true);
item.clientTop; // Force a layout flush to remove the overflow gradient.
this._dragInitializeTimeout = this.window.setTimeout(this._initializeDragAfterMove, 0);
},

78
browser/themes/shared/customizableui/panelUIOverlay.inc.css
View File

@ -152,71 +152,14 @@ panelview:not([mainview]) .toolbarbutton-text,
toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item),
.panelUI-grid .toolbarbutton-1,
.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button,
.customization-palette .toolbarbutton-1,
.panel-customization-placeholder-child {
-moz-appearance: none;
-moz-box-orient: vertical;
width: calc(@menuPanelWidth@ / 3);
height: calc(40px + 4em);
}
toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item),
.panelUI-grid .toolbarbutton-1:not([type="menu-button"]),
.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button,
.customization-palette .toolbarbutton-1,
.panel-customization-placeholder-child {
overflow: hidden;
}
toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item)::after,
.panelUI-grid .toolbarbutton-1:not([type="menu-button"])::after,
.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button::after,
.panelUI-grid #personal-bookmarks > toolbarbutton::after {
content: "";
position: absolute;
height: 1.5em;
margin-top: calc(-40px - 4em);
margin-bottom: -0.5em;
%ifdef XP_MACOSX
background-image: linear-gradient(rgba(242,242,242,0), rgb(242,242,242) 75%);
%elif XP_WIN
background-image: linear-gradient(rgba(255,255,255,0), rgb(255,255,255) 75%);
%else
background-image: linear-gradient(rgba(242,241,240,0), rgb(242,241,240) 75%);
%endif
}
toolbarpaletteitem[place="panel"][dragstarting] > toolbarbutton:not([type="menu-button"])::after,
toolbarpaletteitem[place="panel"][dragstarting] > toolbaritem > toolbarbutton::after,
toolbarpaletteitem[place="panel"][dragstarting] > toolbarbutton > toolbarbutton::after {
content: none !important;
}
toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item)@buttonStateHover@::after,
.panelUI-grid .toolbarbutton-1:not([type="menu-button"])@buttonStateHover@::after,
.panelUI-grid .toolbarbutton-1@buttonStateHover@ > .toolbarbutton-menubutton-button::after,
.panelUI-grid #personal-bookmarks > toolbarbutton@buttonStateHover@::after {
%ifdef XP_MACOSX
background-image: linear-gradient(rgba(220,220,220,0), rgb(220,220,220) 75%);
%elif XP_WIN
background-image: linear-gradient(rgba(236,236,237,0), rgb(236,236,237) 75%);
%else
background-image: linear-gradient(rgba(224,223,223,0), rgb(224,223,223) 75%);
%endif
}
toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item)@buttonStateActive@::after,
.panelUI-grid .toolbarbutton-1:not([type="menu-button"])@buttonStateActive@::after,
.panelUI-grid .toolbarbutton-1@buttonStateActive@ > .toolbarbutton-menubutton-button::after,
.panelUI-grid #personal-bookmarks > toolbarbutton@buttonStateActive@::after {
%ifdef XP_MACOSX
background-image: linear-gradient(rgba(202,202,202,0), rgb(202,202,202) 75%);
%elif XP_WIN
background-image: linear-gradient(rgba(220,220,220,0), rgb(220,220,220) 75%);
%else
background-image: linear-gradient(rgba(209,208,207,0), rgb(209,208,207) 75%);
%endif
min-width: calc(@menuPanelWidth@ / 3);
max-width: calc(@menuPanelWidth@ / 3);
height: calc(40px + 2.4em);
max-height: calc(40px + 2.4em);
}
.panel-customization-placeholder-child {
@ -230,15 +173,10 @@ toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-it
width: 16px;
-moz-margin-start: -16px;
height: 40px;
margin-bottom: 4em;
max-height: 40px;
padding: 0;
}
.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button {
margin-top: 3px; /* Hack needed to get type=menu-button to properly align vertically. */
border: 0;
}
.panelUI-grid .toolbarbutton-1:not([buttonover])@buttonStateHover@ > .toolbarbutton-menubutton-dropmarker {
background-color: hsla(210,4%,10%,.1) !important;
border-radius: 0 0 0 2px;
@ -279,7 +217,7 @@ toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-it
.panel-customization-placeholder-child > .toolbarbutton-icon {
min-width: 32px;
min-height: 32px;
margin: 4px calc(@menuPanelWidth@ / 6 - 23px);
margin: 4px;
}
toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
@ -511,6 +449,10 @@ panelview .toolbarbutton-1,
margin-top: 6px;
}
.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button {
border: 0;
}
panelview .toolbarbutton-1@buttonStateHover@,
.subviewbutton@buttonStateHover@,
.widget-overflow-list .toolbarbutton-1@buttonStateHover@,