From feaaa1abec22f3fe486b59367d6569db3f9d7861 Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Sun, 18 Jan 2004 04:33:28 +0000 Subject: [PATCH] Add -moz-image-region:auto to cut off inheritance where needed (and not previously noticed due to an inheritance bug with -moz-image-region). b=231293, 220717 r+sr=bzbarsky git-svn-id: svn://10.0.0.236/trunk@151480 18797224-902f-48f8-a5cc-f745e15eee43 --- .../classic/editor/editorFormatToolbar.css | 17 +++++++++++++++++ .../themes/classic/global/mac/toolbarbutton.css | 1 + .../classic/global/unix/toolbarbutton.css | 1 + .../themes/classic/global/win/toolbarbutton.css | 1 + .../modern/editor/editorFormatToolbar.css | 15 +++++++++++++++ mozilla/themes/modern/global/toolbarbutton.css | 1 + mozilla/toolkit/skin/mac/toolbarbutton.css | 1 + mozilla/toolkit/skin/unix/toolbarbutton.css | 1 + mozilla/toolkit/skin/win/toolbarbutton.css | 1 + 9 files changed, 39 insertions(+) diff --git a/mozilla/themes/classic/editor/editorFormatToolbar.css b/mozilla/themes/classic/editor/editorFormatToolbar.css index a8ce115e042..c66d64fb108 100644 --- a/mozilla/themes/classic/editor/editorFormatToolbar.css +++ b/mozilla/themes/classic/editor/editorFormatToolbar.css @@ -419,70 +419,87 @@ .insert-smile > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/smile_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-tongue > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/tongue_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-frown > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/frown_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-wink > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/wink_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-laughing > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/laughing_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-embarrassed > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/embarrassed_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-undecided > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/undecided_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-surprise > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/surprise_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-kiss > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/kiss_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-yell > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/yell_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-cool > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/cool_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-undecided > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/undecided_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-money > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/money_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-foot > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/foot_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-innocent > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/innocent_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-cry > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/cry_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-sealed > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/sealed_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } diff --git a/mozilla/themes/classic/global/mac/toolbarbutton.css b/mozilla/themes/classic/global/mac/toolbarbutton.css index b41153ff00a..8c67c2a7e3f 100644 --- a/mozilla/themes/classic/global/mac/toolbarbutton.css +++ b/mozilla/themes/classic/global/mac/toolbarbutton.css @@ -102,6 +102,7 @@ toolbarbutton[checked="true"] { .toolbarbutton-menu-dropmarker { list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .toolbarbutton-menu-dropmarker[disabled="true"] { diff --git a/mozilla/themes/classic/global/unix/toolbarbutton.css b/mozilla/themes/classic/global/unix/toolbarbutton.css index a24b3a30196..4a84f8d0fb5 100644 --- a/mozilla/themes/classic/global/unix/toolbarbutton.css +++ b/mozilla/themes/classic/global/unix/toolbarbutton.css @@ -99,6 +99,7 @@ toolbarbutton[checked="true"] { .toolbarbutton-menu-dropmarker { list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .toolbarbutton-menu-dropmarker[disabled="true"] { diff --git a/mozilla/themes/classic/global/win/toolbarbutton.css b/mozilla/themes/classic/global/win/toolbarbutton.css index f073f5b9e93..8b30268dcc3 100644 --- a/mozilla/themes/classic/global/win/toolbarbutton.css +++ b/mozilla/themes/classic/global/win/toolbarbutton.css @@ -101,6 +101,7 @@ toolbarbutton[checked="true"] { .toolbarbutton-menu-dropmarker { list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .toolbarbutton-menu-dropmarker[disabled="true"] { diff --git a/mozilla/themes/modern/editor/editorFormatToolbar.css b/mozilla/themes/modern/editor/editorFormatToolbar.css index 9e07e776f78..e51cad88fea 100644 --- a/mozilla/themes/modern/editor/editorFormatToolbar.css +++ b/mozilla/themes/modern/editor/editorFormatToolbar.css @@ -450,62 +450,77 @@ .insert-tongue > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/tongue_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-frown > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/frown_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-wink > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/wink_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-laughing > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/laughing_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-embarrassed > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/embarrassed_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-undecided > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/undecided_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-surprise > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/surprise_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-kiss > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/kiss_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-yell > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/yell_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-cool > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/cool_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-money > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/money_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-foot > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/foot_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-innocent > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/innocent_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-cry > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/cry_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .insert-sealed > .menu-iconic-left { list-style-image: url("chrome://editor/content/images/sealed_n.gif"); + -moz-image-region: auto; /* cut off inheritance */ } diff --git a/mozilla/themes/modern/global/toolbarbutton.css b/mozilla/themes/modern/global/toolbarbutton.css index 0cdc240a44f..befd56f5d2c 100644 --- a/mozilla/themes/modern/global/toolbarbutton.css +++ b/mozilla/themes/modern/global/toolbarbutton.css @@ -102,6 +102,7 @@ toolbarbutton[checked="true"]:hover:active { .toolbarbutton-menu-dropmarker { list-style-image: url("chrome://global/skin/button/tbmenu-arrow.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .toolbarbutton-menu-dropmarker[disabled="true"] { diff --git a/mozilla/toolkit/skin/mac/toolbarbutton.css b/mozilla/toolkit/skin/mac/toolbarbutton.css index b2b965d085e..1c97c62a0db 100755 --- a/mozilla/toolkit/skin/mac/toolbarbutton.css +++ b/mozilla/toolkit/skin/mac/toolbarbutton.css @@ -80,6 +80,7 @@ toolbarbutton[checked="true"] { .toolbarbutton-menu-dropmarker { list-style-image: url("chrome://global/skin/arrow/arrow-dn.png"); + -moz-image-region: auto; /* cut off inheritance */ padding-left: 2px; } diff --git a/mozilla/toolkit/skin/unix/toolbarbutton.css b/mozilla/toolkit/skin/unix/toolbarbutton.css index a24b3a30196..4a84f8d0fb5 100644 --- a/mozilla/toolkit/skin/unix/toolbarbutton.css +++ b/mozilla/toolkit/skin/unix/toolbarbutton.css @@ -99,6 +99,7 @@ toolbarbutton[checked="true"] { .toolbarbutton-menu-dropmarker { list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .toolbarbutton-menu-dropmarker[disabled="true"] { diff --git a/mozilla/toolkit/skin/win/toolbarbutton.css b/mozilla/toolkit/skin/win/toolbarbutton.css index 374149db555..179193fb239 100644 --- a/mozilla/toolkit/skin/win/toolbarbutton.css +++ b/mozilla/toolkit/skin/win/toolbarbutton.css @@ -82,6 +82,7 @@ toolbarbutton[checked="true"] { .toolbarbutton-menu-dropmarker { list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif"); + -moz-image-region: auto; /* cut off inheritance */ } .toolbarbutton-menu-dropmarker[disabled="true"] {