From 56029cafc51f2cfb90a4d902402129e51fcde8b8 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Fri, 3 Aug 2007 18:39:03 +0200 Subject: [PATCH] keep up with Classic/*stripe development --- EarlyBlue/communicator/alerts/alert.css | 96 ------------------ EarlyBlue/communicator/communicator.css | 45 -------- EarlyBlue/global/autocomplete.css | 14 +-- EarlyBlue/global/browser.css | 7 +- EarlyBlue/global/findBar.css | 24 ++--- EarlyBlue/global/global.css | 45 ++++++++ .../icons/autoscroll.png | Bin EarlyBlue/global/icons/blacklist_favicon.png | Bin 0 -> 199 bytes EarlyBlue/global/icons/blacklist_large.png | Bin 0 -> 240 bytes EarlyBlue/global/menulist.css | 7 +- EarlyBlue/global/netError.css | 22 ++++ EarlyBlue/global/popup.css | 3 +- EarlyBlue/global/scrollbars.css | 6 ++ EarlyBlue/mozapps/extensions/extensions.css | 13 +-- EarlyBlue/mozapps/handling/handling.css | 13 +++ EarlyBlue/mozapps/places/tagContainerIcon.png | Bin 0 -> 208 bytes EarlyBlue/mozapps/plugins/missingPlugin.css | 12 +++ .../mozapps/xpinstall/xpinstallConfirm.css | 3 - .../toolbar => navigator/icons}/chevron.gif | Bin EarlyBlue/navigator/navigator.css | 6 +- 20 files changed, 128 insertions(+), 188 deletions(-) delete mode 100644 EarlyBlue/communicator/alerts/alert.css rename EarlyBlue/{communicator => global}/icons/autoscroll.png (100%) create mode 100644 EarlyBlue/global/icons/blacklist_favicon.png create mode 100644 EarlyBlue/global/icons/blacklist_large.png create mode 100644 EarlyBlue/mozapps/handling/handling.css create mode 100644 EarlyBlue/mozapps/places/tagContainerIcon.png rename EarlyBlue/{global/toolbar => navigator/icons}/chevron.gif (100%) diff --git a/EarlyBlue/communicator/alerts/alert.css b/EarlyBlue/communicator/alerts/alert.css deleted file mode 100644 index a9382b22..00000000 --- a/EarlyBlue/communicator/alerts/alert.css +++ /dev/null @@ -1,96 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Netscape Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Scott MacGregor - * Robert Kaiser - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the NPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -/* ===== alert.css ===================================================== - == Styles specific to the alerts dialog. - ======================================================================= */ - -@import url("chrome://global/skin/"); - -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -.alertBox { - border-right: 2px solid #7B969C; - border-bottom: 2px solid #7B969C; - border-top: 2px solid #7B969C; - border-left: 2px solid #7B969C; - background-color: -moz-Dialog; - min-height: 50px; -} - -.alertBox[orient="horizontal"] > .alertImageBox { - -moz-margin-start: 4px; - -moz-margin-end: 6px; - min-height: 46px; -} - -.alertBox[orient="vertical"] > .alertImageBox { - margin-top: 6px; - margin-bottom: 4px; - min-width: 46px; -} - -.alertTitle { - font-weight: bold; -} - -.alertText { - -moz-margin-end: 6px; -} - -.alertText[clickable="true"] { - cursor: pointer; - color: #1455D6; - text-decoration: underline; -} - -.alertText[clickable="true"]:hover:active { - color: #424F63; -} - -.alertBox[orient="horizontal"] > .alertTextBox { - -moz-padding-start: 10px; - padding-top: 5px; -} - -.alertBox[orient="vertical"] > .alertTextBox { - -moz-padding-start: 5px; - -moz-padding-end: 5px; - margin-bottom: 8px; - -moz-box-align: center; /* also hard-coded in alert.js, see bug 311557 */ -} diff --git a/EarlyBlue/communicator/communicator.css b/EarlyBlue/communicator/communicator.css index 46b56ab2..df7341f5 100644 --- a/EarlyBlue/communicator/communicator.css +++ b/EarlyBlue/communicator/communicator.css @@ -95,48 +95,3 @@ #downloadView > treechildren::-moz-tree-image(Name) { margin-right: 2px; } - -/* :::::: autoscroll popup ::::: */ - -#autoscroller { - height: 28px; - width: 28px; - border: 0px; - margin: -14px; - padding: 0px; - background-image: url("chrome://communicator/skin/icons/autoscroll.png"); - background-color: transparent; - -moz-appearance: none; -} - -#autoscroller[scrolldir="NS"] { - background-position: left center; -} - -#autoscroller[scrolldir="EW"] { - background-position: left bottom; -} - -#autoscroller[transparent="true"] { - background-position: center top; -} - -#autoscroller[transparent="true"][scrolldir="NS"] { - background-position: center center; -} - -#autoscroller[transparent="true"][scrolldir="EW"] { - background-position: center bottom; -} - -#autoscroller[translucent="true"] { - background-position: right top; -} - -#autoscroller[translucent="true"][scrolldir="NS"] { - background-position: right center; -} - -#autoscroller[translucent="true"][scrolldir="EW"] { - background-position: right bottom; -} diff --git a/EarlyBlue/global/autocomplete.css b/EarlyBlue/global/autocomplete.css index aa9154fa..86098012 100644 --- a/EarlyBlue/global/autocomplete.css +++ b/EarlyBlue/global/autocomplete.css @@ -88,7 +88,7 @@ textbox.padded { /* ::::: autocomplete popups ::::: */ -.autocomplete-result-popup, +panel[type="autocomplete"], .autocomplete-history-popup { border: 1px solid #9999CC; background-color: white !important; @@ -124,18 +124,6 @@ textbox.padded { color: white !important; } -/* seamonkey and thunderbird do not use the new autocomplete widget yet so we need a couple of the old styles rules */ - -.autocomplete-treebody::-moz-tree-row(menuactive) { - background-color: #336699; -} - -.autocomplete-treebody::-moz-tree-cell-text(menuactive) { - color: white !important; -} - -/* end of seamonkey and thunderbird required autocomplete rules */ - /* ::::: textboxes inside toolbarpaletteitems ::::: */ toolbarpaletteitem > toolbaritem > textbox > hbox > hbox > html|*.textbox-input { diff --git a/EarlyBlue/global/browser.css b/EarlyBlue/global/browser.css index 5a0f83b4..fcea3717 100644 --- a/EarlyBlue/global/browser.css +++ b/EarlyBlue/global/browser.css @@ -62,11 +62,10 @@ /* XXX: Firefox rules - look into those when we support FF -moz-binding: url("chrome://global/skin/globalBindings.xml#tabbrowser-tab") !important; background: transparent !important; - margin: 0px !important; + margin: 0px 0px 1px !important; padding: 0px !important; border: none !important; height: 22px !important; - margin-bottom: 1px; */ } @@ -115,7 +114,7 @@ tabpanels { */ .tab-drop-indicator-bar { - display:none; + visibility: hidden; height: 9px; margin-top: -9px; position: relative; @@ -130,7 +129,7 @@ tabpanels { } .tab-drop-indicator-bar[dragging="true"] { - display: -moz-box; + visibility: visible; } /** diff --git a/EarlyBlue/global/findBar.css b/EarlyBlue/global/findBar.css index 1b4adb60..9fdd51c8 100644 --- a/EarlyBlue/global/findBar.css +++ b/EarlyBlue/global/findBar.css @@ -1,6 +1,6 @@ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -findbar > toolbarbutton.findbar-closebutton { +.findbar-closebutton { list-style-image: url("chrome://global/skin/icons/close-button.gif"); } @@ -12,7 +12,7 @@ findbar { /* find-next button */ -findbar > toolbarbutton.findbar-find-next { +.findbar-find-next { /* XXX: look into this when we support FF list-style-image: url("chrome://global/skin/icons/find.png"); -moz-image-region: rect(0px 16px 16px 0px); @@ -21,7 +21,7 @@ findbar > toolbarbutton.findbar-find-next { /* find-previous button */ -findbar > toolbarbutton.findbar-find-previous { +.findbar-find-previous { /* XXX: look into this when we support FF list-style-image: url("chrome://global/skin/icons/find.png"); -moz-image-region: rect(0px 32px 16px 16px); @@ -30,14 +30,14 @@ findbar > toolbarbutton.findbar-find-previous { /* highlight button */ -findbar > toolbarbutton.findbar-highlight { +.findbar-highlight { /* XXX: look into this when we support FF list-style-image: url("chrome://global/skin/icons/find.png"); -moz-image-region: rect(0px 48px 16px 32px); */ } -findbar > image.find-status-icon { +.find-status-icon { list-style-image: none; margin-top: 0px; margin-bottom: 0px; @@ -47,7 +47,7 @@ findbar > image.find-status-icon { height: 16px; } -findbar > label.findbar-find-status { +.findbar-find-status { margin-top: 0px; margin-bottom: 0px; -moz-margin-start: 3px; @@ -55,33 +55,33 @@ findbar > label.findbar-find-status { padding: 2px; } -findbar > image.find-status-icon[status="notfound"] { +.find-status-icon[status="notfound"] { /* XXX: look into this when we support FF list-style-image: url("chrome://global/skin/icons/notfound.png"); */ } -findbar > .find-field-container > textbox.findbar-textbox { +.findbar-textbox { -moz-binding: url("chrome://global/content/bindings/findbar.xml#findbar-textbox"); border: none; margin: 0px; } -findbar > .find-field-container > textbox.findbar-textbox[status="notfound"] { +.findbar-textbox[status="notfound"] { background-color: #FFC0C0; color: #000000; } -findbar[flash="true"] > .find-field-container > textbox.findbar-textbox { +.findbar-textbox { background-color: #FFFFC0; } -findbar > image.find-status-icon[status="wrapped"] { +.find-status-icon[status="wrapped"] { /* XXX: look into this when we support FF list-style-image: url("chrome://global/skin/icons/wrap.png"); */ } -findbar > .find-field-container { +.find-field-container { /* -moz-appearance: textfield; */ } diff --git a/EarlyBlue/global/global.css b/EarlyBlue/global/global.css index 1acfd01c..e81bc966 100644 --- a/EarlyBlue/global/global.css +++ b/EarlyBlue/global/global.css @@ -162,3 +162,48 @@ resizer[dir="bottomright"] { .toolbar-focustarget { -moz-user-focus: ignore !important; } + +/* :::::: autoscroll popup ::::: */ + +#autoscroller { + height: 28px; + width: 28px; + border: 0px; + margin: -14px; + padding: 0px; + background-image: url("chrome://communicator/skin/icons/autoscroll.png"); + background-color: transparent; + -moz-appearance: none; +} + +#autoscroller[scrolldir="NS"] { + background-position: left center; +} + +#autoscroller[scrolldir="EW"] { + background-position: left bottom; +} + +#autoscroller[transparent="true"] { + background-position: center top; +} + +#autoscroller[transparent="true"][scrolldir="NS"] { + background-position: center center; +} + +#autoscroller[transparent="true"][scrolldir="EW"] { + background-position: center bottom; +} + +#autoscroller[translucent="true"] { + background-position: right top; +} + +#autoscroller[translucent="true"][scrolldir="NS"] { + background-position: right center; +} + +#autoscroller[translucent="true"][scrolldir="EW"] { + background-position: right bottom; +} diff --git a/EarlyBlue/communicator/icons/autoscroll.png b/EarlyBlue/global/icons/autoscroll.png similarity index 100% rename from EarlyBlue/communicator/icons/autoscroll.png rename to EarlyBlue/global/icons/autoscroll.png diff --git a/EarlyBlue/global/icons/blacklist_favicon.png b/EarlyBlue/global/icons/blacklist_favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..d34e369d73d4498678f6f73f0932becab96140c5 GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-u2Kw4X=!KD(q{fYaDe&I zavz{LV@Z%-FoVOh8)+a;lDE4HLkFv@2av;A;1OBOz`!jG!i)^F=12eq*-JcqUD>a5 zFbnXiGB3+c0t%UUx;Tb#Tu)A5V7|tnAozc3W8=sF_3Uil{{Po^;Q0Cf|9*oL>!Vne l9b#H^A`By>k1!}OFsz7@6E$N^xeV0L;OXk;vd$@?2>^(^HRS*R literal 0 HcmV?d00001 diff --git a/EarlyBlue/global/icons/blacklist_large.png b/EarlyBlue/global/icons/blacklist_large.png new file mode 100644 index 0000000000000000000000000000000000000000..c0db4926c64bd65950f4c4d3cd5f2830dce8c871 GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^@<6P>#0(^-zwy2Vq<8{+LR=3VIPm|#fwZ(UX=yVZ zkCr_LiZhl3`2{mLJiCzw;v{*yyD)UH%6b4foCO|{#S9GG!XV7ZFl&wkP>{XE)7O># zItQ}=xA?|&){ovez62&_oIo=zopr04ZrjIsgCw literal 0 HcmV?d00001 diff --git a/EarlyBlue/global/menulist.css b/EarlyBlue/global/menulist.css index 316a6fce..07f273ce 100644 --- a/EarlyBlue/global/menulist.css +++ b/EarlyBlue/global/menulist.css @@ -121,17 +121,18 @@ html|*.menulist-editable-input { margin: 0px; border: 1px outset #CCD0DD; color: #000000; - list-style-image: url("chrome://global/skin/arrow/arrow-down.gif"); +/* list-style-image: url("chrome://global/skin/arrow/arrow-down.gif"); */ } .menulist-compact > .menulist-dropmarker { -moz-margin-start: 2px; padding: 0 !important; - list-style-image: url("chrome://global/skin/arrow/arrow-down.gif"); + border: none !important; +/* list-style-image: url("chrome://global/skin/arrow/arrow-down.gif"); */ } .menulist-compact[disabled="true"] > .menulist-dropmarker { - list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif"); +/* list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif"); */ } .menulist-compact > .menulist-label { diff --git a/EarlyBlue/global/netError.css b/EarlyBlue/global/netError.css index 533f04fa..72565565 100644 --- a/EarlyBlue/global/netError.css +++ b/EarlyBlue/global/netError.css @@ -103,3 +103,25 @@ body[dir="rtl"] #brand { #errorContainer { display: none; } + +/* Custom styling for 'blacklist' error class */ + +:root.blacklist #errorTitle, :root.blacklist #errorLongContent, +:root.blacklist #errorShortDesc, :root.blacklist #errorLongDesc, +:root.blacklist a { + background-color: #FFC0C0; /* red */ + color: #666699; +} + +:root.blacklist #errorPageContainer { + background-image: url("chrome://global/skin/icons/blacklist_large.png"); + background-color: #FFC0C0; +} + +:root.blacklist { + background: #000000; +} + +:root.blacklist #errorTryAgain { + display: none; +} diff --git a/EarlyBlue/global/popup.css b/EarlyBlue/global/popup.css index f138cf51..67113ca2 100644 --- a/EarlyBlue/global/popup.css +++ b/EarlyBlue/global/popup.css @@ -44,7 +44,8 @@ /* ::::: menupopup ::::: */ menupopup, -popup { +popup, +panel { border: 1px outset #CCD0DD; padding: 1px; min-width: 1px; diff --git a/EarlyBlue/global/scrollbars.css b/EarlyBlue/global/scrollbars.css index ce72d0f6..91968475 100644 --- a/EarlyBlue/global/scrollbars.css +++ b/EarlyBlue/global/scrollbars.css @@ -104,6 +104,12 @@ scrollbarbutton[active="true"] { padding: 2px 0px 0px 2px; } +/* XXX - scrollbar.xml always grabs the OS settings and we don't want that */ +scrollbarbutton[sbattr="scrollbar-up-bottom"], +scrollbarbutton[sbattr="scrollbar-down-top"] { + display: none; +} + /* ::::: square at the corner of two scrollbars ::::: */ scrollcorner { diff --git a/EarlyBlue/mozapps/extensions/extensions.css b/EarlyBlue/mozapps/extensions/extensions.css index 9cf4d1d4..e689a705 100644 --- a/EarlyBlue/mozapps/extensions/extensions.css +++ b/EarlyBlue/mozapps/extensions/extensions.css @@ -127,7 +127,7 @@ richlistbox[focused] richlistitem[selected="true"][isDisabled="true"] { margin-bottom: 2px; } -richlistitem[selected="true"][opType="none"] .descriptionCrop { +richlistitem[selected="true"]:not([opType]) .descriptionCrop { display: none; } @@ -185,11 +185,14 @@ richlistitem .notifyBadge { -moz-margin-start: -2px; } -richlistitem[availableUpdateURL="none"] .updateBadge, +.updateBadge, +.updateAvailableBox, .notifyBadge { display: none; } +richlistitem[availableUpdateURL][updateable="true"] +richlistitem[availableUpdateURL][updateable="true"] .updateAvailableBox, richlistitem[compatible="false"] .notifyBadge, richlistitem[blocklisted="true"] .notifyBadge, richlistitem[satisfiesDependencies="false"] .notifyBadge { @@ -262,11 +265,6 @@ richlistitem[opType="needs-uninstall"] .blocklistedBox { display: none; } -richlistitem[opType="needs-uninstall"] .updateAvailableBox, -richlistitem[availableUpdateURL="none"] .updateAvailableBox { - display: none; -} - richlistitem[loading="true"] .updateBadge { display: -moz-box; width: 16px; @@ -309,7 +307,6 @@ richlistitem[opType="needs-disable"] .needsDisable { display: -moz-box; } -richlistitem[opType="needs-uninstall"] .updateBadge, richlistitem[opType="needs-uninstall"] .notifyBadge { display: none; } diff --git a/EarlyBlue/mozapps/handling/handling.css b/EarlyBlue/mozapps/handling/handling.css new file mode 100644 index 00000000..39c16c11 --- /dev/null +++ b/EarlyBlue/mozapps/handling/handling.css @@ -0,0 +1,13 @@ +#description-image:not([src]) { + height: 32px; + width: 32px; +} + +richlistitem { + min-height: 36px; /* Don't forget to update the richlistbox height! */ +} + +richlistbox { + /* 3 items high, plus 4px for top and bottom margins, less 2px for border */ + min-height: 110px; +} diff --git a/EarlyBlue/mozapps/places/tagContainerIcon.png b/EarlyBlue/mozapps/places/tagContainerIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..d49d4051a81480fa8bb8a36d95e9d8ab79bfdf84 GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-t_KbrNJ~4DmNxVM|Nm`9 z{W?H##*!evUYh7ML)4Eal|aXmS~p+P_)?GLxozxFnU&j0ZePR@t-8(jJS|97k7zyEOx vAG1q2nSby9s_^Kq=ma4JK`E&w17?Q#izQ|L3Er**8pPn~>gTe~DWM4fnwdXd literal 0 HcmV?d00001 diff --git a/EarlyBlue/mozapps/plugins/missingPlugin.css b/EarlyBlue/mozapps/plugins/missingPlugin.css index 08540ed1..cf70a826 100644 --- a/EarlyBlue/mozapps/plugins/missingPlugin.css +++ b/EarlyBlue/mozapps/plugins/missingPlugin.css @@ -5,6 +5,18 @@ @namespace html url(http://www.w3.org/1999/xhtml); +html|object:not([width]), html|object[width=""], +html|embed:not([width]), html|embed[width=""], +html|applet:not([width]), html|applet[width=""] { + width: 240px; +} + +html|object:not([height]), html|object[height=""], +html|embed:not([height]), html|embed[height=""], +html|applet:not([height]), html|applet[height=""] { + height: 200px; +} + html|object > *|*, html|embed > *|*, html|applet > *|* { diff --git a/EarlyBlue/mozapps/xpinstall/xpinstallConfirm.css b/EarlyBlue/mozapps/xpinstall/xpinstallConfirm.css index 99ce3860..7ffd0040 100644 --- a/EarlyBlue/mozapps/xpinstall/xpinstallConfirm.css +++ b/EarlyBlue/mozapps/xpinstall/xpinstallConfirm.css @@ -1,6 +1,3 @@ -.listbox { -} - #itemList { margin: 10px 4px 10px 4px; border: 1px inset #CCD0DD; diff --git a/EarlyBlue/global/toolbar/chevron.gif b/EarlyBlue/navigator/icons/chevron.gif similarity index 100% rename from EarlyBlue/global/toolbar/chevron.gif rename to EarlyBlue/navigator/icons/chevron.gif diff --git a/EarlyBlue/navigator/navigator.css b/EarlyBlue/navigator/navigator.css index 646a67ab..8747e073 100644 --- a/EarlyBlue/navigator/navigator.css +++ b/EarlyBlue/navigator/navigator.css @@ -289,10 +289,10 @@ toolbar[toolbarmode="small"] > toolbargrippy { list-style-image: url("chrome://communicator/skin/bookmarks/home.gif"); } -toolbarbutton.chevron { - list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important; +#bookmarks-chevron { + list-style-image: url("chrome://navigator/skin/icons/chevron.gif") !important; } -toolbarbutton.chevron > .toolbarbutton-menu-dropmarker { +#bookmarks-chevron > .toolbarbutton-menu-dropmarker { display: none; } -- 2.35.3