[Pkg-mozext-commits] [compactheader] 228/441: Remove flat buttons in windows. Check, if dispMUA addon is really installed.
David Prévot
taffit at moszumanska.debian.org
Wed Mar 18 12:29:02 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository compactheader.
commit 1277ee131d1a7bc2c37d3df9d17e46432304c345
Author: Joachim.Herb at gmx.de <Joachim.Herb at gmx.de>
Date: Sat Jul 23 20:28:29 2011 +0200
Remove flat buttons in windows.
Check, if dispMUA addon is really installed.
--HG--
branch : B_DispMUA
---
.../CompactHeader/content/compactHeaderOverlay.js | 9 +-
chrome/CompactHeader/content/preferences.js | 46 ++---
chrome/CompactHeader/content/preferences.xul | 16 +-
chrome/CompactHeader/content/toolbar.js | 171 +++++++++----------
chrome/CompactHeader/skin/global/CompactHeader.css | 44 ++++-
chrome/CompactHeader/skin/gnome/osdef.css | 69 +-------
chrome/CompactHeader/skin/mac/osdef.css | 28 ----
.../CompactHeader/skin/windows/buttonsOverlay.css | 15 +-
chrome/CompactHeader/skin/windows/osdef.css | 186 +--------------------
9 files changed, 166 insertions(+), 418 deletions(-)
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index 5194333..4683b27 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -203,18 +203,18 @@ org.mozdev.compactHeader.pane = function() {
var headerViewToolbox = document.getElementById("header-view-toolbox");
if (headerViewToolbox) {
- headerViewToolbox.addEventListener("DOMAttrModified",
+ headerViewToolbox.addEventListener("DOMAttrModified",
onDoCustomizationHeaderViewToolbox, false);
}
-
+
var mailToolbox = document.getElementById("mail-toolbox");
if (mailToolbox) {
- mailToolbox.addEventListener("DOMAttrModified",
+ mailToolbox.addEventListener("DOMAttrModified",
onDoCustomizationHeaderViewToolbox, false);
}
var dispMUAicon = document.getElementById("dispMUAicon");
if (dispMUAicon) {
- dispMUAicon.addEventListener("DOMAttrModified",
+ dispMUAicon.addEventListener("DOMAttrModified",
org.mozdev.compactHeader.toolbar.onChangeDispMUAicon, false);
}
@@ -265,6 +265,7 @@ org.mozdev.compactHeader.pane = function() {
org.mozdev.compactHeader.toolbar.setButtonStyle();
org.mozdev.customizeHeaderToolbar.messenger.saveToolboxData();
org.mozdev.compactHeader.toolbar.dispMUACheck();
+ org.mozdev.compactHeader.debug.log("stop coheOnLoadMsgHeaderPane");
}
var coheMessageListener =
diff --git a/chrome/CompactHeader/content/preferences.js b/chrome/CompactHeader/content/preferences.js
index 8c718b2..74f2ade 100644
--- a/chrome/CompactHeader/content/preferences.js
+++ b/chrome/CompactHeader/content/preferences.js
@@ -29,20 +29,20 @@ org.mozdev.compactHeader.preferences = function() {
// Called when the preferences dialog has finished loading. Initializes the
// controls according to current configuration settings.
//
-
+
pub.onLoad = function()
- {
+ {
prefBranch = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefService)
.getBranch("extensions.CompactHeader.");
-
- loadPrefCheckbox("headersize.twolineview", "checkbox.Compact.TwolineView");
- loadPrefCheckbox("headersize.linkify", "checkbox.Linkify");
- //loadPrefInt("headersize.addressstyle", "AddressStyle");
- loadPrefCheckbox("headersize.addressstyle", "checkbox.ShowOnlyAddress");
- loadPrefCheckbox("headersize.flatButtons", "checkbox.flatButtons");
+
+ loadPrefCheckbox("headersize.twolineview", "checkboxCompactTwolineView");
+ loadPrefCheckbox("headersize.linkify", "checkboxLinkify");
+ //loadPrefInt("headersize.addressstyle", "AddressStyle");
+ loadPrefCheckbox("headersize.addressstyle", "checkboxShowOnlyAddress");
+ loadPrefCheckbox("headersize.flatButtons", "checkboxflatButtons");
}
-
+
///////////////////////////////////////////////////////////////////////////////
//
// onDialogAccept
@@ -50,48 +50,48 @@ org.mozdev.compactHeader.preferences = function() {
// Called when the preferences dialog is closed by pressing the OK button.
// Saves the configuration settings.
//
-
+
pub.onDialogAccept = function ()
{
- savePrefCheckbox("headersize.twolineview", "checkbox.Compact.TwolineView");
- savePrefCheckbox("headersize.linkify", "checkbox.Linkify");
- //savePrefInt("headersize.addressstyle", "AddressStyle");
- savePrefCheckbox("headersize.addressstyle", "checkbox.ShowOnlyAddress");
- savePrefCheckbox("headersize.flatButtons", "checkbox.flatButtons");
+ savePrefCheckbox("headersize.twolineview", "checkboxCompactTwolineView");
+ savePrefCheckbox("headersize.linkify", "checkboxLinkify");
+ //savePrefInt("headersize.addressstyle", "AddressStyle");
+ savePrefCheckbox("headersize.addressstyle", "checkboxShowOnlyAddress");
+ savePrefCheckbox("headersize.flatButtons", "checkboxflatButtons");
return true;
}
-
-
+
+
///////////////////////////////////////////////////////////////////////////////
//
// loadPrefCheckbox
//
// Loads the given boolean preference value into the given checkbox element.
//
-
+
function loadPrefCheckbox(pref, idCheckbox)
{
document.getElementById(idCheckbox).checked = prefBranch.getBoolPref(pref);
}
-
-
+
+
function loadPrefInt(pref, idCheckbox)
{
document.getElementById(idCheckbox).value = prefBranch.getIntPref(pref);
}
-
+
///////////////////////////////////////////////////////////////////////////////
//
// savePrefCheckbox
//
// Saves the given boolean preference value from the given checkbox element.
//
-
+
function savePrefCheckbox(pref, idCheckbox)
{
prefBranch.setBoolPref(pref, document.getElementById(idCheckbox).checked);
}
-
+
function savePrefInt(pref, idCheckbox)
{
prefBranch.setIntPref(pref, document.getElementById(idCheckbox).value);
diff --git a/chrome/CompactHeader/content/preferences.xul b/chrome/CompactHeader/content/preferences.xul
index f17eb34..aa9a95b 100644
--- a/chrome/CompactHeader/content/preferences.xul
+++ b/chrome/CompactHeader/content/preferences.xul
@@ -3,6 +3,7 @@
<?xml-stylesheet type="text/css" href="chrome://global/skin/"?>
<?xml-stylesheet type="text/css" href="chrome://communicator/skin/"?>
<?xml-stylesheet type="text/css" href="chrome://CompactHeader/skin/preferences.css"?>
+<?xml-stylesheet type="text/css" href="chrome://CompactHeader-os/skin/osdef.css"?>
<!DOCTYPE window [
<!ENTITY % CompactHeaderDTD SYSTEM "chrome://CompactHeader/locale/preferences.dtd">
@@ -17,22 +18,21 @@
void(openDialog("chrome://CompactHeader/content/preferences.xul"))
-->
-<dialog id="cohePreferences"
- title="&dialog.title;"
+<dialog id="cohePreferences"
+ title="&dialog.title;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
- onload="org.mozdev.compactHeader.preferences.onLoad();"
+ onload="org.mozdev.compactHeader.preferences.onLoad();"
ondialogaccept="return org.mozdev.compactHeader.preferences.onDialogAccept();">
<script type="application/x-javascript" src="chrome://CompactHeader/content/preferences.js"/>
- <checkbox id="checkbox.Compact.TwolineView"
+ <checkbox id="checkboxCompactTwolineView"
label="&checkbox.Compact.TwolineView.caption;"/>
-
- <checkbox id="checkbox.Linkify"
+ <checkbox id="checkboxLinkify"
label="&menu.Linkify.caption;"/>
- <checkbox id="checkbox.ShowOnlyAddress"
+ <checkbox id="checkboxShowOnlyAddress"
label="&menu.ShowOnlyAddress.caption;"/>
- <checkbox id="checkbox.flatButtons"
+ <checkbox id="checkboxflatButtons"
label="&menu.flatButtons.caption;"/>
</dialog>
diff --git a/chrome/CompactHeader/content/toolbar.js b/chrome/CompactHeader/content/toolbar.js
index ff2b920..3cd77f2 100644
--- a/chrome/CompactHeader/content/toolbar.js
+++ b/chrome/CompactHeader/content/toolbar.js
@@ -59,11 +59,11 @@ org.mozdev.compactHeader.toolbar = function() {
removeButtonDispMUA();
var hdrToolbar = document.getElementById("header-view-toolbar");
var hdrToolbox = document.getElementById("header-view-toolbox");
- var buttons = ["button-reply", "button-replyall", "button-replylist",
+ var buttons = ["button-reply", "button-replyall", "button-replylist",
"button-tag", "button-forward", "button-archive", "button-file",
"button-print", "button-mark", "button-starMessages",
"button-newmsg", "button-goback", "button-goforward",
- "button-previous", "button-next", "button-compact",
+ "button-previous", "button-next", "button-compact",
"button-address", "button-stop", "button-getmsg",
"button-getPartialMessages",
"stylish-toolbar-button",
@@ -81,7 +81,7 @@ org.mozdev.compactHeader.toolbar = function() {
hdrToolbar.currentSet = currentSet;
for (var i=0; i<buttons.length; i++) {
var buttonName = buttons[i];
- var button = document.getElementById(buttonName) ||
+ var button = document.getElementById(buttonName) ||
document.getElementById("mail-toolbox").palette.getElementsByAttribute("id", buttonName)[0];
if (button) {
var hdrButton = button.cloneNode(true);
@@ -89,13 +89,15 @@ org.mozdev.compactHeader.toolbar = function() {
if (hdrButton.localName == "toolbaritem") {
var subButtons = hdrButton.querySelectorAll(".toolbarbutton-1");
for (var j=0; j<subButtons.length; j++) {
- addClass(subButtons[j], "msgHeaderView-button-out");
+// addClass(subButtons[j], "msgHeaderView-button-out");
+ addClass(subButtons[j], "msgHeaderView-button");
}
} else {
if (hdrButton.type != "menu-button") {
addClass(hdrButton, "msgHeaderView-button");
} else {
- addClass(hdrButton, "msgHeaderView-button-out");
+// addClass(hdrButton, "msgHeaderView-button-out");
+ addClass(hdrButton, "msgHeaderView-button");
}
}
//hdrButton.id = "hdr" + hdrButton.id;
@@ -116,18 +118,18 @@ org.mozdev.compactHeader.toolbar = function() {
//"hdrReplyAllButton", "hdrReplyListButton"];
for (var i=0; i<buttonsRemove.length; i++) {
var buttonName = buttonsRemove[i];
- var button = document.getElementById(buttonName) ||
+ var button = document.getElementById(buttonName) ||
document.getElementById("header-view-toolbox").palette.getElementsByAttribute("id", buttonName)[0];
if (button) {
button.setAttribute("collapsed", "true");
}
}
-
+
var target = "hdrOtherActionsButton";
-
- var newParent = document.getElementById(target) ||
+
+ var newParent = document.getElementById(target) ||
document.getElementById("header-view-toolbox").palette.getElementsByAttribute("id", target)[0];
-
+
if (newParent != null) {
var myElement;
myElement= document.getElementById("otherActionsPopup");
@@ -142,13 +144,15 @@ org.mozdev.compactHeader.toolbar = function() {
org.mozdev.compactHeader.debug.log("setButtonStyle start");
var hdrToolbar = document.getElementById("header-view-toolbar");
var hdrToolbox = document.getElementById("header-view-toolbox");
- var buttons = hdrToolbar.querySelectorAll("toolbarbutton");
+ var buttons1 = Array.prototype.slice.call(hdrToolbar.querySelectorAll("toolbarbutton"));
+ var buttons2 = Array.prototype.slice.call(hdrToolbox.palette.querySelectorAll("toolbarbutton"));
+ var buttons = buttons1.concat(buttons2);
for (var i=0; i<buttons.length; i++) {
var button = buttons[i];
if (button) {
addClass(button, "customize-header-toolbar-button");
addClass(button, "customize-header-toolbar-" + button.id)
- if (cohePrefBranch.getBoolPref("headersize.flatButtons")) {
+ if (flatButtons()) {
if (button.type != "menu-button") {
addClass(button, "msgHeaderView-flat-button");
} else {
@@ -164,7 +168,8 @@ org.mozdev.compactHeader.toolbar = function() {
removeClass(button, "msgHeaderView-flat-button");
removeClass(button, "msgHeaderView-button");
removeClass(button, "msgHeaderView-flat-button-out");
- addClass(button, "msgHeaderView-button-out");
+// addClass(button, "msgHeaderView-button-out");
+ addClass(button, "msgHeaderView-button");
}
}
}
@@ -172,13 +177,15 @@ org.mozdev.compactHeader.toolbar = function() {
org.mozdev.compactHeader.debug.log("setButtonStyle start 1");
- var buttons = hdrToolbar.querySelectorAll("toolbaritem");
+ var buttons1 = Array.prototype.slice.call(hdrToolbar.querySelectorAll("toolbaritem"));
+ var buttons2 = Array.prototype.slice.call(hdrToolbox.palette.querySelectorAll("toolbaritem"));
+ var buttons = buttons1.concat(buttons2);
for (var i=0; i<buttons.length; i++) {
var button = buttons[i];
if (button) {
addClass(button, "customize-header-toolbar-button");
addClass(button, "customize-header-toolbar-" + button.id)
- if (cohePrefBranch.getBoolPref("headersize.flatButtons")) {
+ if (flatButtons()) {
removeClass(button, "msgHeaderView-button-out-item");
addClass(button, "msgHeaderView-flat-button-out-item");
} else {
@@ -187,54 +194,10 @@ org.mozdev.compactHeader.toolbar = function() {
}
}
}
-
- buttons = hdrToolbox.palette.querySelectorAll("toolbarbutton");
- for (var i=0; i<buttons.length; i++) {
- var button = buttons[i];
- if (button) {
- addClass(button, "customize-header-toolbar-button");
- addClass(button, "customize-header-toolbar-" + button.id)
- if (cohePrefBranch.getBoolPref("headersize.flatButtons")) {
- if (button.getAttribute("type") != "menu-button") {
- addClass(button, "msgHeaderView-flat-button");
- } else {
- removeClass(button, "msgHeaderView-flat-button");
- removeClass(button, "msgHeaderView-button");
- removeClass(button, "msgHeaderView-button-out");
- addClass(button, "msgHeaderView-flat-button-out");
- }
- } else {
- if (button.getAttribute("type") != "menu-button") {
- removeClass(button, "msgHeaderView-flat-button");
- } else {
- removeClass(button, "msgHeaderView-flat-button");
- removeClass(button, "msgHeaderView-button");
- removeClass(button, "msgHeaderView-flat-button-out");
- addClass(button, "msgHeaderView-button-out");
- }
- }
- }
- }
- org.mozdev.compactHeader.debug.log("setButtonStyle start 2");
- buttons = hdrToolbox.palette.querySelectorAll("toolbaritem");
- for (var i=0; i<buttons.length; i++) {
- var button = buttons[i];
- if (button) {
- addClass(button, "customize-header-toolbar-button");
- addClass(button, "customize-header-toolbar-" + button.id)
- if (cohePrefBranch.getBoolPref("headersize.flatButtons")) {
- removeClass(button, "msgHeaderView-button-out-item");
- addClass(button, "msgHeaderView-flat-button-out-item");
- } else {
- removeClass(button, "msgHeaderView-flat-button-out-item");
- addClass(button, "msgHeaderView-button-out-item");
- }
- }
- }
org.mozdev.compactHeader.debug.log("setButtonStyle stop");
};
-
+
pub.toggle = function(aHeaderViewMode) {
org.mozdev.compactHeader.debug.log("toolbar toggle start");
var hdrToolbox = document.getElementById("header-view-toolbox");
@@ -286,10 +249,47 @@ org.mozdev.compactHeader.toolbar = function() {
pub.dispMUACheck = function() {
org.mozdev.compactHeader.debug.log("dispMUACheck start");
var dispMUAButton = document.getElementById("button-dispMUA");
- var dispMUABox = document.getElementById("dispMUA");
- dispMUABox.setAttribute("collapsed", "true"); // hide original
- var IconContainerDispMUA = null;
- if (dispMUAButton) {
+ var dispMUABox = document.getElementById("dispMUA");
+ if (dispMUABox) {
+ dispMUABox.setAttribute("collapsed", "true"); // hide original
+ var IconContainerDispMUA = null;
+ if (dispMUAButton) {
+ /* expanded view 48 * 48 */
+ if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
+ IconContainerDispMUA.setAttribute("collapsed", "true");
+ }
+ /* two line view 32 * 32 */
+ if (IconContainerDispMUA = document.getElementById("dispMUAicon2line")) {
+ IconContainerDispMUA.setAttribute("collapsed", "true");
+ }
+ /* compact view 24 * 24 */
+ if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact")) {
+ IconContainerDispMUA.setAttribute("collapsed", "true");
+ }
+ }
+ else if (dispMUABox){
+ /* expanded view 48 * 48 */
+ if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
+ IconContainerDispMUA.removeAttribute("collapsed");
+ }
+ if (cohePrefBranch.getBoolPref("headersize.twolineview")) {
+ /* two line view 32 * 32 */
+ if (IconContainerDispMUA = document.getElementById("dispMUAicon2line"))
+ IconContainerDispMUA.removeAttribute("collapsed");
+ if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact"))
+ IconContainerDispMUA.setAttribute("collapsed", "true");
+ }
+ else {
+ /* compact view 24 * 24 */
+ if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact"))
+ IconContainerDispMUA.removeAttribute("collapsed");
+ if (IconContainerDispMUA = document.getElementById("dispMUAicon2line"))
+ IconContainerDispMUA.setAttribute("collapsed", "true");
+ }
+ }
+ }
+ else {
+ var IconContainerDispMUA = null;
/* expanded view 48 * 48 */
if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
IconContainerDispMUA.setAttribute("collapsed", "true");
@@ -302,28 +302,6 @@ org.mozdev.compactHeader.toolbar = function() {
if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact")) {
IconContainerDispMUA.setAttribute("collapsed", "true");
}
-
- }
- else if (dispMUABox){
-
- /* expanded view 48 * 48 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconExp")) {
- IconContainerDispMUA.removeAttribute("collapsed");
- }
- if (cohePrefBranch.getBoolPref("headersize.twolineview")) {
- /* two line view 32 * 32 */
- if (IconContainerDispMUA = document.getElementById("dispMUAicon2line"))
- IconContainerDispMUA.removeAttribute("collapsed");
- if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact"))
- IconContainerDispMUA.setAttribute("collapsed", "true");
- }
- else {
- /* compact view 24 * 24 */
- if (IconContainerDispMUA = document.getElementById("dispMUAiconCompact"))
- IconContainerDispMUA.removeAttribute("collapsed");
- if (IconContainerDispMUA = document.getElementById("dispMUAicon2line"))
- IconContainerDispMUA.setAttribute("collapsed", "true");
- }
}
org.mozdev.compactHeader.debug.log("dispMUACheck stop");
};
@@ -373,7 +351,7 @@ org.mozdev.compactHeader.toolbar = function() {
org.mozdev.compactHeader.debug.log("onChangeDispMUAicon stop");
}
};
-
+
// function onChangeHeaderToolbar(event) {
// if (event.attrName == "currentset") {
// if (document.getElementById("button-dispMUA")) {
@@ -383,7 +361,7 @@ org.mozdev.compactHeader.toolbar = function() {
// org.mozdev.compactHeader.buttons.coheToggleStar();
// }
// }
-
+
removeButtonDispMUA = function() {
org.mozdev.compactHeader.debug.log("removeButtonDispMUA start");
if (!document.getElementById("dispMUA")) {
@@ -391,7 +369,7 @@ org.mozdev.compactHeader.toolbar = function() {
if (button) {
button.parentNode.removeChild(button);
}
-
+
var button1 = document.getElementById("mail-toolbox").palette.getElementsByAttribute("id", "button-dispMUA")[0];
if (button1) {
button1.parentNode.removeChild(button1);
@@ -404,19 +382,26 @@ org.mozdev.compactHeader.toolbar = function() {
}
org.mozdev.compactHeader.debug.log("removeButtonDispMUA stop");
};
-
+
function addClass(el, strClass) {
- var testnew = new RegExp('\\b'+strClass+'\\b').test(el.className);
+ var testnew = new RegExp('\\b'+strClass+'\\b').test(el.className);
if (!testnew) {
el.className += el.className?' '+strClass:strClass;
}
}
-
+
function removeClass(el, strClass) {
var str = new RegExp('(\\s|^)'+strClass+'(\\s|$)', 'g');
el.className = el.className.replace(str, ' ');
}
-
+
+ function flatButtons() {
+ var result = cohePrefBranch.getBoolPref("headersize.flatButtons");
+ if (navigator.appVersion.indexOf("Win")!=-1) {
+ result = false;
+ }
+ return result;
+ }
return pub;
}();
diff --git a/chrome/CompactHeader/skin/global/CompactHeader.css b/chrome/CompactHeader/skin/global/CompactHeader.css
index 7228762..b5c90da 100644
--- a/chrome/CompactHeader/skin/global/CompactHeader.css
+++ b/chrome/CompactHeader/skin/global/CompactHeader.css
@@ -83,12 +83,13 @@
font-weight: bold;
}
+/*
#expandedButtonBox .button-menubutton-button,
#collapsed1LButtonBox .button-menubutton-button {
background-color: transparent;
border: transparent;
}
-
+*/
#expandedButtonBox .msgHeaderView-flat-button,
#collapsedButtonBox .msgHeaderView-flat-button {
padding: 0px;
@@ -169,7 +170,7 @@
}
#expandedfromBox,
-#collapsed1LtoCcBccRow,
+#collapsed1LtoCcBccRow,
#collapsed1LsubjectOutBox, #collapsed1LfromOutBox,#collapsedButtonBox,
#expandedButtonBox,
#collapsed1LsubjectBox, #collapsed1LfromBox {
@@ -181,9 +182,9 @@
-moz-box-align: start;
}
-#expandedfromBox, #collapsed1LfromOutBox, #collapsed1LtoCcBccOutBox,
-#collapsed2LfromOutBox,
-#collapsed2LtoCcBccOutBox {
+#expandedfromBox, #collapsed1LfromOutBox, #collapsed1LtoCcBccOutBox,
+#collapsed2LfromOutBox,
+#collapsed2LtoCcBccOutBox {
margin-top: 2px;
}
@@ -200,20 +201,49 @@
display: none;
}
+/*
#collapsedButtonBox[OnlyIcon="Text"] .msgHeaderView-button .button-text,
#expandedButtonBox[OnlyIcon="Text"] .msgHeaderView-button .button-text {
-moz-padding-start: 5px;
-moz-margin-end: 1px;
}
-
+*/
/* set button margins */
+/*
#collapsedButtonBox .msgHeaderView-button .msgHeaderView-flat-button .button-icon,
#expandedButtonBox .msgHeaderView-button .msgHeaderView-flat-button .button-icon {
-moz-margin-start: 1px;
-moz-margin-end: 1px;
}
-
+*/
#otherActionsTopSpacer {
display: none;
}
+#collapsedHeaderView #signedHdrIcon[signed="ok"] {
+ list-style-image: url("chrome://messenger/skin/smime/icons/sbSignOk.png");
+}
+
+#collapsedHeaderView #signedHdrIcon[signed="unknown"] {
+ list-style-image: url("chrome://messenger/skin/smime/icons/sbSignUnknown.png");
+}
+
+#collapsedHeaderView #signedHdrIcon[signed="mismatch"] {
+ list-style-image: url("chrome://messenger/skin/smime/icons/sbSignUnknown.png");
+}
+
+#collapsedHeaderView #signedHdrIcon[signed="notok"] {
+ list-style-image: url("chrome://messenger/skin/smime/icons/sbSignNotOk.png");
+}
+
+#collapsedHeaderView #encryptedHdrIcon[encrypted="ok"] {
+ list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoOk.png");
+}
+
+#collapsedHeaderView #encryptedHdrIcon[encrypted="notok"] {
+ list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoNotOk.png");
+}
+
+#collapsedHeaderView #signedHdrIcon {
+ -moz-margin-end: 3px;
+}
diff --git a/chrome/CompactHeader/skin/gnome/osdef.css b/chrome/CompactHeader/skin/gnome/osdef.css
index 3a740c3..23be058 100644
--- a/chrome/CompactHeader/skin/gnome/osdef.css
+++ b/chrome/CompactHeader/skin/gnome/osdef.css
@@ -41,41 +41,11 @@
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-.hdrOtherActionsButton {
- list-style-image: url("chrome://CompactHeader-os/skin/other-action.png");
-}
-
-toolbar[iconsize="small"] .hdrOtherActionsButton {
- list-style-image: url("chrome://CompactHeader-os/skin/other-action-small.png");
-}
-
#expandedButtonBox {
margin: 0px;
padding: 0px;
}
-/*
-toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton .toolbarbutton-icon,
-toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton .toolbarbutton-icon {
- display: -moz-box;
-}
-
-toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton .toolbarbutton-text,
-toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton .toolbarbutton-text {
- -moz-margin-start: 2px !important;
-}
-
-toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton,
-toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton {
- padding-top: 0px !important;
- padding-bottom: 0px !important;
-}
-*/
-/*
-toolbarpaletteitem[place="palette"] .msgHeaderView-button-out {
- -moz-appearance: button;
-}
-*/
.msgHeaderView-button-out-item .msgHeaderView-button-out,
.msgHeaderView-button-out {
-moz-appearance: none;
@@ -108,15 +78,6 @@ toolbar[mode="text"] toolbarpaletteitem .msgHeaderView-button .toolbarbutton-tex
-moz-padding-end: 0px !important;
}
-/*
-toolbarpaletteitem[place="palette"] .msgHeaderView-flat-button-out-item,
-toolbarpaletteitem[place="palette"] .msgHeaderView-flat-button-out-item .msgHeaderView-flat-button-out,
-toolbarpaletteitem[place="palette"] .msgHeaderView-flat-button-out,
-toolbarpaletteitem[place="palette"] .msgHeaderView-flat-button {
- -moz-appearance: button;
-}
-*/
-
.msgHeaderView-flat-button-out-item .msgHeaderView-flat-button-out,
.msgHeaderView-flat-button-out {
-moz-appearance: none;
@@ -178,34 +139,6 @@ toolbox[labelalign="end"] toolbar[mode="full"] .msgHeaderView-flat-button-out .t
-moz-margin-start: 2px !important;
}
-#collapsedHeaderView #signedHdrIcon[signed="ok"] {
- list-style-image: url("chrome://messenger/skin/smime/icons/sbSignOk.png");
-}
-
-#collapsedHeaderView #signedHdrIcon[signed="unknown"] {
- list-style-image: url("chrome://messenger/skin/smime/icons/sbSignUnknown.png");
-}
-
-#collapsedHeaderView #signedHdrIcon[signed="mismatch"] {
- list-style-image: url("chrome://messenger/skin/smime/icons/sbSignUnknown.png");
-}
-
-#collapsedHeaderView #signedHdrIcon[signed="notok"] {
- list-style-image: url("chrome://messenger/skin/smime/icons/sbSignNotOk.png");
-}
-
-#collapsedHeaderView #encryptedHdrIcon[encrypted="ok"] {
- list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoOk.png");
-}
-
-#collapsedHeaderView #encryptedHdrIcon[encrypted="notok"] {
- list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoNotOk.png");
-}
-
-#collapsedHeaderView #signedHdrIcon {
- -moz-margin-end: 3px;
-}
-
#collapsedHeaderView #dispMUAicon {
height: 20px !important;
width: 20px !important;
@@ -230,4 +163,4 @@ toolbar[orient="vertical"] toolbarpaletteitem[dragover="right"] {
#header-view-toolbar[orient="vertical"] toolbarbutton {
-moz-box-orient: vertical !important;
-}
\ No newline at end of file
+}
diff --git a/chrome/CompactHeader/skin/mac/osdef.css b/chrome/CompactHeader/skin/mac/osdef.css
index 62502f0..1f517af 100644
--- a/chrome/CompactHeader/skin/mac/osdef.css
+++ b/chrome/CompactHeader/skin/mac/osdef.css
@@ -185,34 +185,6 @@ toolbox[labelalign="end"] toolbar[mode="full"] .msgHeaderView-flat-button-out .t
-moz-margin-start: 2px !important;
}
-#collapsedHeaderView #signedHdrIcon[signed="ok"] {
- list-style-image: url("chrome://messenger/skin/smime/icons/sbSignOk.png");
-}
-
-#collapsedHeaderView #signedHdrIcon[signed="unknown"] {
- list-style-image: url("chrome://messenger/skin/smime/icons/sbSignUnknown.png");
-}
-
-#collapsedHeaderView #signedHdrIcon[signed="mismatch"] {
- list-style-image: url("chrome://messenger/skin/smime/icons/sbSignUnknown.png");
-}
-
-#collapsedHeaderView #signedHdrIcon[signed="notok"] {
- list-style-image: url("chrome://messenger/skin/smime/icons/sbSignNotOk.png");
-}
-
-#collapsedHeaderView #encryptedHdrIcon[encrypted="ok"] {
- list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoOk.png");
-}
-
-#collapsedHeaderView #encryptedHdrIcon[encrypted="notok"] {
- list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoNotOk.png");
-}
-
-#collapsedHeaderView #signedHdrIcon {
- -moz-margin-end: 3px;
-}
-
#collapsedHeaderView #dispMUAicon {
height: 20px !important;
width: 20px !important;
diff --git a/chrome/CompactHeader/skin/windows/buttonsOverlay.css b/chrome/CompactHeader/skin/windows/buttonsOverlay.css
index 738211a..aa29de1 100644
--- a/chrome/CompactHeader/skin/windows/buttonsOverlay.css
+++ b/chrome/CompactHeader/skin/windows/buttonsOverlay.css
@@ -59,11 +59,20 @@ toolbar[iconsize="small"] #button-starMessages .toolbarbutton-icon {
}
#button-dispMUA .toolbarbutton-icon {
- width:24px;
+ width:24px;
height:24px;
}
toolbar[iconsize="small"] #button-dispMUA .toolbarbutton-icon {
- width:18px;
- height:18px;
+ width:16px;
+ height:16px;
}
+
+.hdrOtherActionsButton {
+ list-style-image: url("chrome://CompactHeader-os/skin/other-action.png");
+}
+
+toolbar[iconsize="small"] .hdrOtherActionsButton {
+ list-style-image: url("chrome://CompactHeader-os/skin/other-action-small.png");
+}
+
diff --git a/chrome/CompactHeader/skin/windows/osdef.css b/chrome/CompactHeader/skin/windows/osdef.css
index 15a641e..dd4a4ed 100644
--- a/chrome/CompactHeader/skin/windows/osdef.css
+++ b/chrome/CompactHeader/skin/windows/osdef.css
@@ -42,188 +42,6 @@
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-.hdrOtherActionsButton {
- list-style-image: url("chrome://CompactHeader-os/skin/other-action.png");
+#checkboxflatButtons {
+ display: none;
}
-
-toolbar[iconsize="small"] .hdrOtherActionsButton {
- list-style-image: url("chrome://CompactHeader-os/skin/other-action-small.png");
-}
-
-/*
-toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton,
-toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton {
- padding-top: 3px !important;
- -moz-padding-start: 4px !important;
-}
-
-toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton .toolbarbutton-icon,
-toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton .toolbarbutton-icon {
- display: -moz-box;
-}
-*/
-/*
-toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton,
-toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton {
-}*/
-
-/*
-toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton .toolbarbutton-text,
-toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton .toolbarbutton-text {
- /*-moz-margin-start: 2px !important; */
-/*}*/
-
-/*
-toolbarpaletteitem[place="palette"] .msgHeaderView-button-out {
- -moz-appearance: button;
-}
-*/
-.msgHeaderView-button-out-item .msgHeaderView-button-out,
-.msgHeaderView-button-out {
- /*-moz-appearance: button; */
- margin-top: 1px;
- margin-bottom: 2px;
- -moz-margin-start: 2px !important;
- -moz-margin-end: 2px !important;
-}
-
-.msgHeaderView-button-out-item .msgHeaderView-button-out .toolbarbutton-menubutton-button,
-.msgHeaderView-button-out .toolbarbutton-menubutton-button {
- -moz-appearance: button;
- min-width: 1em;
- min-height: 1ex;
- margin: 0px;
- /* important required to override messenger.css rules */
- -moz-padding-start: 3px !important;
- -moz-padding-end: 3px !important;
- padding-top: 3px !important;
- padding-bottom: 2px !important;
-}
-
-toolbar[mode="text"] .msgHeaderView-button-out .toolbarbutton-text,
-toolbar[mode="text"] toolbarpaletteitem .msgHeaderView-button-out .toolbarbutton-text {
- margin: 0 !important;
- padding-top: 1px !important;
- padding-bottom: 0px !important;
- -moz-padding-start: 0px !important;
- -moz-padding-end: 0px !important;
-}
-
-/*
-toolbarpaletteitem[place="palette"] .msgHeaderView-flat-button-out-item,
-toolbarpaletteitem[place="palette"] .msgHeaderView-flat-button-out-item .msgHeaderView-flat-button-out,
-toolbarpaletteitem[place="palette"] .msgHeaderView-flat-button-out,
-toolbarpaletteitem[place="palette"] .msgHeaderView-flat-button {
- -moz-appearance: button;
-}
-*/
-
-.msgHeaderView-flat-button-out-item .msgHeaderView-flat-button-out,
-.msgHeaderView-flat-button-out {
- -moz-appearance: none;
- margin: 1px 2px !important;
- padding: 0px !important;
- border: 1px !important;
- min-width: 1px;
- color: ButtonText;
- -moz-border-radius: 4px;
- min-height: 1ex;
-}
-
-.msgHeaderView-flat-button-out-item .msgHeaderView-flat-button-out:hover,
-.msgHeaderView-flat-button-out:hover {
- margin: 0px 1px !important;
- border: 1px solid ButtonShadow !important;
-}
-
-.msgHeaderView-flat-button-out-item .msgHeaderView-flat-button-out .toolbarbutton-menubutton-button,
-.msgHeaderView-flat-button-out .toolbarbutton-menubutton-button {
- -moz-appearance: none;
- background-color: transparent;
- margin: 0px 1px;
- padding-top: 6px !important;
- padding-bottom: 5px !important;
- -moz-padding-start: 5px !important;
- -moz-padding-end: 5px !important;
- border: 3px !important;
-}
-
-.msgHeaderView-flat-button-out-item .msgHeaderView-flat-button-out .toolbarbutton-menubutton-button:hover,
-.msgHeaderView-flat-button-out .toolbarbutton-menubutton-button:hover {
- -moz-appearance: button;
- background-color: -moz-buttonhovertext;
- -moz-padding-start: 3px !important;
- -moz-padding-end: 3px !important;
- padding-top: 3px !important;
- padding-bottom: 2px !important;
- margin: 0px !important;
-}
-
-
-toolbar[mode="text"] .msgHeaderView-flat-button-out .toolbarbutton-text,
-toolbar[mode="text"] toolbarpaletteitem .msgHeaderView-flat-button-out .toolbarbutton-text {
- margin: 0 !important;
- padding-top: 1px !important;
- padding-bottom: 0px !important;
- -moz-padding-start: 0px !important;
- -moz-padding-end: 0px !important;
-}
-
-toolbox[labelalign="end"] toolbar[mode="full"] .msgHeaderView-button-out .toolbarbutton-text,
-toolbox[labelalign="end"] toolbar[mode="full"] .msgHeaderView-flat-button-out .toolbarbutton-text {
- -moz-margin-start: 2px !important;
-}
-
-#collapsedHeaderView #signedHdrIcon[signed="ok"] {
- list-style-image: url("chrome://messenger/skin/smime/icons/sbSignOk.png");
-}
-
-#collapsedHeaderView #signedHdrIcon[signed="unknown"] {
- list-style-image: url("chrome://messenger/skin/smime/icons/sbSignUnknown.png");
-}
-
-#collapsedHeaderView #signedHdrIcon[signed="mismatch"] {
- list-style-image: url("chrome://messenger/skin/smime/icons/sbSignUnknown.png");
-}
-
-#collapsedHeaderView #signedHdrIcon[signed="notok"] {
- list-style-image: url("chrome://messenger/skin/smime/icons/sbSignNotOk.png");
-}
-
-#collapsedHeaderView #encryptedHdrIcon[encrypted="ok"] {
- list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoOk.png");
-}
-
-#collapsedHeaderView #encryptedHdrIcon[encrypted="notok"] {
- list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoNotOk.png");
-}
-
-#collapsedHeaderView #signedHdrIcon {
- -moz-margin-end: 3px;
-}
-
-#collapsedHeaderView #dispMUAicon {
- height: 20px !important;
- width: 20px !important;
-}
-
-toolbar[orient="vertical"] toolbarpaletteitem {
- margin: -2px 0px;
- border: none;
- border-top: 2px solid transparent;
- border-bottom: 2px solid transparent;
-}
-
-toolbar[orient="vertical"] toolbarpaletteitem[dragover="left"] {
- border-color: transparent;
- border-top-color: #000000;
-}
-
-toolbar[orient="vertical"] toolbarpaletteitem[dragover="right"] {
- border-color: transparent;
- border-bottom-color: #000000;
-}
-
-#header-view-toolbar[orient="vertical"] toolbarbutton {
- -moz-box-orient: vertical !important;
-}
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/compactheader.git
More information about the Pkg-mozext-commits
mailing list