Bug 770135 - Follow-up to use correct cut/copy/paste/zoom button graphics on OSX and Linux, also makes grid background work on Linux. r=jaws

This commit is contained in:
Mike Conley 2013-03-26 19:37:47 -04:00
parent 12458680bc
commit 349ee2af76
5 changed files with 101 additions and 32 deletions

View File

@ -2168,6 +2168,7 @@ chatbox {
/* Customization mode */
#main-window[customizing] {
-moz-appearance: none;
background-image: url("chrome://browser/skin/customization/customization-mode-background.jpg");
background-size: 100% 100%;
background-repeat: no-repeat;

View File

@ -3,6 +3,39 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
%filter substitution
%define menuPanelWidth 23em
%define menuPanelWidth 21em
%include ../shared/panelUIOverlay.inc.css
#PanelUI-cut-btn {
list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar");
}
#PanelUI-cut-btn[disabled="true"] {
list-style-image: url("moz-icon://stock/gtk-cut?size=toolbar&state=disabled");
}
#PanelUI-copy-btn {
list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar");
}
#PanelUI-copy-btn[disabled="true"] {
list-style-image: url("moz-icon://stock/gtk-copy?size=toolbar&state=disabled");
}
#PanelUI-paste-btn {
list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar");
}
#PanelUI-paste-btn[disabled="true"] {
list-style-image: url("moz-icon://stock/gtk-paste?size=toolbar&state=disabled");
}
#PanelUI-zoomOut-btn {
list-style-image: url("moz-icon://stock/gtk-zoom-out?size=toolbar");
padding-left: 12px;
padding-right: 12px;
}
#PanelUI-zoomIn-btn {
list-style-image: url("moz-icon://stock/gtk-zoom-in?size=toolbar");
padding-left: 12px;
padding-right: 12px;
}

View File

@ -3,6 +3,44 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
%filter substitution
%define menuPanelWidth 23em
%define menuPanelWidth 26em
%include ../shared/panelUIOverlay.inc.css
.PanelUI-pageControls toolbarbutton {
list-style-image: url("chrome://browser/skin/Toolbar.png");
}
#PanelUI-cut-btn {
-moz-image-region: rect(0, 260px, 20px, 240px);
}
#PanelUI-copy-btn {
-moz-image-region: rect(0, 280px, 20px, 260px);
}
#PanelUI-paste-btn {
-moz-image-region: rect(0, 300px, 20px, 280px);
}
#PanelUI-zoomOut-btn {
-moz-image-region: rect(0, 400px, 20px, 380px);
padding-left: 12px;
padding-right: 12px;
}
#PanelUI-zoomIn-btn {
-moz-image-region: rect(0, 420px, 20px, 400px);
padding-left: 12px;
padding-right: 12px;
}
.PanelUI-editControls #PanelUI-copy-btn,
.PanelUI-zoomControls #PanelUI-zoomReset-btn {
border-left: none;
border-right: none;
border-radius: 0;
}
#PanelUI-zoomIn-btn .toolbarbutton-text,
#PanelUI-zoomOut-btn .toolbarbutton-text,
#PanelUI-zoomReset-btn .toolbarbutton-icon {
display: none;
}

View File

@ -145,32 +145,6 @@
padding: 6px 0;
}
.PanelUI-pageControls toolbarbutton {
list-style-image: url("chrome://browser/skin/Toolbar.png");
}
#PanelUI-cut-btn {
-moz-image-region: rect(0, 216px, 18px, 198px);
}
#PanelUI-copy-btn {
-moz-image-region: rect(0, 234px, 18px, 216px);
}
#PanelUI-paste-btn {
-moz-image-region: rect(0, 252px, 18px, 234px);
}
#PanelUI-zoomOut-btn {
-moz-image-region: rect(0, 288px, 18px, 270px);
padding-left: 12px;
padding-right: 12px;
}
#PanelUI-zoomIn-btn {
-moz-image-region: rect(0, 306px, 18px, 288px);
padding-left: 12px;
padding-right: 12px;
}
.PanelUI-editControls #PanelUI-copy-btn,
.PanelUI-zoomControls #PanelUI-zoomReset-btn {
border-left: none;
@ -207,7 +181,7 @@
display: none;
}
#PanelUI-subViews toolbarbutton,
#PanelUI-subViews toolbarbutton,
#PanelUI-mainView toolbarbutton {
-moz-appearance: none;
padding: 2px 6px;
@ -244,6 +218,4 @@
0 0 2px hsla(210,54%,20%,0);
text-shadow: none;
transition: none;
}
}

View File

@ -6,3 +6,28 @@
%define menuPanelWidth 23em
%include ../shared/panelUIOverlay.inc.css
.PanelUI-pageControls toolbarbutton {
list-style-image: url("chrome://browser/skin/Toolbar.png");
}
#PanelUI-cut-btn {
-moz-image-region: rect(0, 216px, 18px, 198px);
}
#PanelUI-copy-btn {
-moz-image-region: rect(0, 234px, 18px, 216px);
}
#PanelUI-paste-btn {
-moz-image-region: rect(0, 252px, 18px, 234px);
}
#PanelUI-zoomOut-btn {
-moz-image-region: rect(0, 288px, 18px, 270px);
padding-left: 12px;
padding-right: 12px;
}
#PanelUI-zoomIn-btn {
-moz-image-region: rect(0, 306px, 18px, 288px);
padding-left: 12px;
padding-right: 12px;
}