Bug 459372 Move filefield style rules to toolkit r=Mano
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Wed, 03 Dec 2008 14:11:37 +0000
changeset 22250 ebabcc8e40e76c6dc1f18b6264fc9f49efddf8a2
parent 22249 20a011760de7f770f71c1187f4760efeda64ff62
child 22251 87b7df5e3614ccd3b77bf305680e89858e6a7b11
push idunknown
push userunknown
push dateunknown
reviewersMano
bugs459372
milestone1.9.2a1pre
Bug 459372 Move filefield style rules to toolkit r=Mano
browser/themes/gnomestripe/browser/preferences/preferences.css
browser/themes/pinstripe/browser/preferences/preferences.css
browser/themes/winstripe/browser/preferences/preferences.css
toolkit/content/widgets/filefield.xml
toolkit/mozapps/preferences/preferences.css
toolkit/themes/gnomestripe/global/filefield.css
toolkit/themes/gnomestripe/global/jar.mn
toolkit/themes/pinstripe/global/filefield.css
toolkit/themes/pinstripe/global/jar.mn
toolkit/themes/winstripe/global/filefield.css
toolkit/themes/winstripe/global/jar.mn
--- a/browser/themes/gnomestripe/browser/preferences/preferences.css
+++ b/browser/themes/gnomestripe/browser/preferences/preferences.css
@@ -77,53 +77,16 @@ radio[pane=paneAdvanced] {
 #BrowserPreferences[animated="true"] #handlersView {
   height: 25em;
 }
 
 #BrowserPreferences[animated="false"] #handlersView {
   -moz-box-flex: 1;
 }
 
-/* File Field Widget */
-filefield {
-  margin: 2px 4px;
-  -moz-appearance: textfield;
-}
-
-.fileFieldContentBox {
-  background-color: -moz-Dialog;
-  color: -moz-DialogText;
-  margin: 1px;
-}
-
-.fileFieldContentBox[disabled="true"] {
-  opacity: 0.5;
-}
-
-.fileFieldIcon[disabled="true"] {
-  opacity: 0.2;
-}
-
-.fileFieldIcon {
-  width: 16px;
-  height: 16px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-  -moz-margin-start: 2px;
-  -moz-margin-end: 4px;
-}
-
-.fileFieldLabel {
-  -moz-appearance: none;
-  background-color: transparent;
-  border: none;
-  padding: 1px 0px 0px 0px;
-  margin: 0px;
-}
-
 /* Modeless Window Dialogs */
 .windowDialog,
 .windowDialog prefpane {
   padding: 0px;
 }
 
 .contentPane {
   margin: 9px 8px 5px 8px;
--- a/browser/themes/pinstripe/browser/preferences/preferences.css
+++ b/browser/themes/pinstripe/browser/preferences/preferences.css
@@ -171,40 +171,16 @@ radio[pane=paneAdvanced]:active {
 
 description {
   font: small-caption;
   font-weight: normal;
   line-height: 1.3em;
   margin-bottom: 4px !important;
 }
 
-#downloadFolderIcon {
-  width: 16px;
-  height: 16px;
-}
-
-#downloadFolderContainer {
-  margin: 2px 4px 2px 27px;
-  -moz-appearance: textfield;
-}
-
-#downloadFolderContainer2 {
-  background-color: -moz-Dialog;
-  color: -moz-DialogText;
-  margin: 1px;
-  padding: 0px 0px 0px 3px;
-}
-
-#downloadFolder {
-  -moz-appearance: none;
-  background-color: transparent;
-  border: none;
-  padding: 1px 0px 0px 0px;
-}
-
 prefpane .groupbox-body {
   -moz-appearance: none;
   padding: 8px 4px 4px 4px;
 }
 
 #paneTabs > groupbox {
   margin: 0;
 }
--- a/browser/themes/winstripe/browser/preferences/preferences.css
+++ b/browser/themes/winstripe/browser/preferences/preferences.css
@@ -104,53 +104,16 @@ radio[pane=paneAdvanced][selected="true"
 #BrowserPreferences[animated="true"] #handlersView {
   height: 25em;
 }
 
 #BrowserPreferences[animated="false"] #handlersView {
   -moz-box-flex: 1;
 }
 
-/* File Field Widget */
-filefield {
-  margin: 2px 4px;
-  -moz-appearance: textfield;
-}
-
-.fileFieldContentBox {
-  background-color: -moz-Dialog;
-  color: -moz-DialogText;
-  margin: 1px;
-}
-
-.fileFieldContentBox[disabled="true"] {
-  opacity: 0.5;
-}
-
-.fileFieldIcon[disabled="true"] {
-  opacity: 0.2;
-}
-
-.fileFieldIcon {
-  width: 16px;
-  height: 16px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-  -moz-margin-start: 2px;
-  -moz-margin-end: 4px;
-}
-
-.fileFieldLabel {
-  -moz-appearance: none;
-  background-color: transparent;
-  border: none;
-  padding: 1px 0px 0px 0px;
-  margin: 0px;
-}
-
 /* Modeless Window Dialogs */
 .windowDialog,
 .windowDialog prefpane {
   padding: 0px;
 }
 
 .contentPane {
   margin: 9px 8px 5px 8px;
--- a/toolkit/content/widgets/filefield.xml
+++ b/toolkit/content/widgets/filefield.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0"?>
 
 <bindings id="filefieldBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xbl="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <binding id="filefield" extends="chrome://global/content/bindings/general.xml#basetext">
+    <resources>
+      <stylesheet src="chrome://global/skin/filefield.css"/>
+    </resources>
     <content>
       <xul:stringbundle anonid="bundle" src="chrome://global/locale/filefield.properties"/>
       <xul:hbox class="fileFieldContentBox" align="center" flex="1" xbl:inherits="disabled">
         <xul:image class="fileFieldIcon" xbl:inherits="src=image,disabled"/>
         <xul:textbox class="fileFieldLabel" xbl:inherits="value=label,disabled,accesskey,tabindex,aria-labelledby" flex="1" readonly="true"/>
       </xul:hbox>
     </content>
     <implementation implements="nsIDOMXULLabeledControlElement">
deleted file mode 100644
--- a/toolkit/mozapps/preferences/preferences.css
+++ /dev/null
@@ -1,3 +0,0 @@
-filefield {
-  -moz-binding: url("chrome://mozapps/content/preferences/preferences.xml#fileField");
-}
copy from browser/themes/gnomestripe/browser/preferences/preferences.css
copy to toolkit/themes/gnomestripe/global/filefield.css
--- a/browser/themes/gnomestripe/browser/preferences/preferences.css
+++ b/toolkit/themes/gnomestripe/global/filefield.css
@@ -1,9 +1,8 @@
-%if 0
 /*
 # -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla 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
@@ -33,165 +32,38 @@
 # use your version of this file under the terms of the MPL, 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 MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 */
-%endif
-
-/* Global Styles */
-#BrowserPreferences radio[pane] {
-  list-style-image: url("chrome://browser/skin/preferences/Options.png"); 
-}
-
-radio[pane=paneMain] {
-  -moz-image-region: rect(0px, 32px,  32px, 0px)
-}
-
-radio[pane=paneTabs] {
-  -moz-image-region: rect(0px, 64px, 32px, 32px)
-}
-
-radio[pane=paneContent] {
-  -moz-image-region: rect(0px, 96px,  32px, 64px)
-}
-
-radio[pane=paneApplications] {
-  -moz-image-region: rect(0px, 128px,  32px, 96px)
-}
-
-radio[pane=panePrivacy] {
-  -moz-image-region: rect(0px, 160px,  32px, 128px)
-}
-
-radio[pane=paneSecurity] {
-  -moz-image-region: rect(0px, 192px,  32px, 160px)
-}
-
-radio[pane=paneAdvanced] {
-  -moz-image-region: rect(0px, 224px, 32px, 192px)
-}
-
-/* Applications Pane */
-#BrowserPreferences[animated="true"] #handlersView {
-  height: 25em;
-}
-
-#BrowserPreferences[animated="false"] #handlersView {
-  -moz-box-flex: 1;
-}
 
 /* File Field Widget */
 filefield {
   margin: 2px 4px;
   -moz-appearance: textfield;
 }
 
 .fileFieldContentBox {
   background-color: -moz-Dialog;
-  color: -moz-DialogText;
-  margin: 1px;
-}
-
-.fileFieldContentBox[disabled="true"] {
-  opacity: 0.5;
 }
 
 .fileFieldIcon[disabled="true"] {
-  opacity: 0.2;
+  opacity: 0.4;
 }
 
 .fileFieldIcon {
   width: 16px;
   height: 16px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-  -moz-margin-start: 2px;
+  margin-top: 1px;
+  margin-bottom: 1px;
+  -moz-margin-start: 1px;
   -moz-margin-end: 4px;
 }
 
 .fileFieldLabel {
   -moz-appearance: none;
   background-color: transparent;
   border: none;
-  padding: 1px 0px 0px 0px;
   margin: 0px;
 }
-
-/* Modeless Window Dialogs */
-.windowDialog,
-.windowDialog prefpane {
-  padding: 0px;
-}
-
-.contentPane {
-  margin: 9px 8px 5px 8px;
-}
-
-.actionButtons {
-  margin: 0px 3px 6px 3px !important;
-}
-
-/* Cookies Manager */
-#cookiesChildren::-moz-tree-image(domainCol) {
-  width: 16px;
-  height: 16px;
-  margin: 0px 2px;
-  list-style-image: url("moz-icon://stock/gtk-file?size=menu");
-}
-
-#paneApplications {
-  margin-left: 4px;
-  margin-right: 4px; 
-  padding-left: 0;
-  padding-right: 0; 
-}
-
-#linksOpenInBox {
-  margin-top: 5px;
-}
-
-#paneAdvanced {
-  padding-bottom: 10px;
-}
-#advancedPrefs {
-  margin-left: 0;
-  margin-right: 0; 
-}
-
-#cookiesChildren::-moz-tree-image(domainCol, container) {
-  list-style-image: url("moz-icon://stock/gtk-directory?size=menu");
-}
-
-#cookieInfoBox {
-  border: 1px solid ThreeDShadow;
-  -moz-border-radius: 0px;
-  margin: 4px;
-  padding: 0px;
-}
-
-/* bottom-most box containing a groupbox in a prefpane. Prevents the bottom
-   of the groupbox from being cutoff */
-.bottomBox {
-  padding-bottom: 4px;
-}
-
-/**
- * Clear Private Data
- */
-#SanitizeDurationBox {
-  padding-bottom: 10px;
-}
-
-#sanitizeDurationChoice {
-  margin: 0; 
-}
-
-#sanitizeDurationLabel {
-  -moz-margin-start: 3px;
-}
-
-#SanitizeDialogPane > groupbox {
-  margin-top: 0;
-}
--- a/toolkit/themes/gnomestripe/global/jar.mn
+++ b/toolkit/themes/gnomestripe/global/jar.mn
@@ -19,16 +19,17 @@ classic.jar:
 +  skin/classic/global/findBar.css
 +  skin/classic/global/textbox.css
 +  skin/classic/global/filepicker.css
 +  skin/classic/global/netError.css
 +  skin/classic/global/notification.css
 +  skin/classic/global/printPreview.css
 +  skin/classic/global/printPageSetup.css
 +  skin/classic/global/preferences.css
++  skin/classic/global/filefield.css
 +  skin/classic/global/console/console.css                     (console/console.css)
 +  skin/classic/global/console/console.png                     (console/console.png)
 +  skin/classic/global/console/console-toolbar.png             (console/console-toolbar.png)
 +  skin/classic/global/dirListing/remote.png                   (dirListing/remote.png)
 +  skin/classic/global/Filepicker.png                          (filepicker/Filepicker.png)
 +  skin/classic/global/icons/Authentication.png                (icons/Authentication.png)
 +  skin/classic/global/icons/autoscroll.png                    (icons/autoscroll.png)
 +  skin/classic/global/icons/blacklist_favicon.png             (icons/blacklist_favicon.png)
copy from browser/themes/pinstripe/browser/preferences/preferences.css
copy to toolkit/themes/pinstripe/global/filefield.css
--- a/browser/themes/pinstripe/browser/preferences/preferences.css
+++ b/toolkit/themes/pinstripe/global/filefield.css
@@ -34,271 +34,29 @@
 # 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 MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 */
 
-#BrowserPreferences:not([active="true"]) > .paneSelector > radio {
-  opacity: 0.7;
-}
-
-.prefWindow-dlgbuttons {
-  margin: 0 12px 8px 12px;
-}
-
-#BrowserPreferences .prefWindow-dlgbuttons {
-  padding-top: 0 !important;
-}
-
-.windowDialog {
-  padding: 12px;
-  font: -moz-dialog;
-}
-
-.paneSelector {
-  list-style-image: url("chrome://browser/skin/preferences/Options.png");
-  padding: 0 5px 2px 5px;
-  -moz-appearance: -moz-mac-unified-toolbar;
-  margin: 0;
-}
-
-.paneSelector radio {
-  border-right: 2px solid transparent;
-  border-left: 2px solid transparent;
-  padding: 5px 0 3px 0;
-  margin: 0;
-  -moz-appearance: none !important;
-}
-
-.paneButtonLabel-shadow,
-.paneButtonLabel {
-  margin: 0;
-  padding: 1px 6px 0 6px;
-}
-
-.paneButtonLabel-shadow {
-  padding-top: 2px;
-}
-
-radio[pane][selected="true"] {
-    background: url("chrome://browser/skin/radio-selected-bg.png") repeat-x center center;
-    -moz-border-left-colors: #6a6a6a #868686;
-    -moz-border-right-colors: #6a6a6a #868686;    
-}
-
-/* ----- GENERAL BUTTON ----- */
-
-radio[pane=paneGeneral],
-radio[pane=paneMain] {
-	-moz-image-region: rect(0px, 32px, 32px, 0px)
-} 
-radio[pane=paneGeneral]:active,
-radio[pane=paneMain]:active {
-	-moz-image-region: rect(32px, 32px, 64px, 0px)
-}
-
-/* ----- TABS BUTTON ----- */
-
-radio[pane=paneTabs] {
-	-moz-image-region: rect(0px, 64px, 32px, 32px);
-}
-
-radio[pane=paneTabs]:active {
-	-moz-image-region: rect(32px, 64px, 64px, 32px);
-}
-
-/* ----- CONTENT BUTTON ----- */
-
-radio[pane=paneContent] {
-	-moz-image-region: rect(0px, 96px, 32px, 64px);
-}
-
-radio[pane=paneContent]:active {
-	-moz-image-region: rect(32px, 96px, 64px, 64px);
-}
-
-/* ----- APPLICATIONS BUTTON ----- */
-
-radio[pane=paneApplications] {
-	-moz-image-region: rect(0px, 128px, 32px, 96px);
-}
-
-radio[pane=paneApplications]:active {
-	-moz-image-region: rect(32px, 128px, 64px, 96px);
-}
-
-/* ----- PRIVACY BUTTON ----- */
-
-radio[pane=panePrivacy] {
-	-moz-image-region: rect(0px, 160px, 32px, 128px);
-}
-
-radio[pane=panePrivacy]:active {
-	-moz-image-region: rect(32px, 160px, 64px, 128px);
-}
-
-/* ----- SECURITY BUTTON ----- */
-
-radio[pane=paneSecurity] {
-	-moz-image-region: rect(0px, 192px, 32px, 160px);
-}
-
-radio[pane=paneSecurity]:active {
-	-moz-image-region: rect(32px, 192px, 64px, 160px);
-}
-
-/* ----- ADVANCED BUTTON ----- */
-
-radio[pane=paneAdvanced] {
-	-moz-image-region: rect(0px, 224px, 32px, 192px);
-}
-
-radio[pane=paneAdvanced]:active {
-	-moz-image-region: rect(32px, 224px, 64px, 192px);
-}
-
-
-
-/* ----- APPLICATIONS PREFPANE ----- */
-#BrowserPreferences[animated="true"] #handlersView {
-  height: 25em;
-}
-
-#BrowserPreferences[animated="false"] #handlersView {
-  -moz-box-flex: 1;
-}
-
-description {
-  font: small-caption;
-  font-weight: normal;
-  line-height: 1.3em;
-  margin-bottom: 4px !important;
-}
-
-#downloadFolderIcon {
+.fileFieldIcon {
   width: 16px;
   height: 16px;
 }
 
-#downloadFolderContainer {
+filefield {
   margin: 2px 4px 2px 27px;
   -moz-appearance: textfield;
 }
 
-#downloadFolderContainer2 {
+.fileFieldContentBox {
   background-color: -moz-Dialog;
   color: -moz-DialogText;
-  margin: 1px;
   padding: 0px 0px 0px 3px;
 }
 
-#downloadFolder {
+.fileFieldLabel {
   -moz-appearance: none;
   background-color: transparent;
   border: none;
-  padding: 1px 0px 0px 0px;
 }
-
-prefpane .groupbox-body {
-  -moz-appearance: none;
-  padding: 8px 4px 4px 4px;
-}
-
-#paneTabs > groupbox {
-  margin: 0;
-}
-
-#paneTabs > vbox {
-  margin: 12px 4px;
-}
-
-prefpane .groupbox-title {
-  background: url("chrome://global/skin/50pct_transparent_grey.png") repeat-x bottom left;
-  margin-bottom: 4px;
-}
-
-tabpanels {
-  padding: 20px 7px 7px;
-}
-
-caption {
-  border-bottom: 1px solid #ECECEC;
-  padding: 4px 4px 0px 0px !important;
-}
-
-#paneMain description,
-#paneContent description,
-#paneAdvanced description,
-#paneSecurity description {
-  font: -moz-dialog;
-}
-
-#paneContent {
-  padding-top: 8px;
-}
-
-#paneContent row {
-  padding: 2px 4px;
-  -moz-box-align: center;
-}
-
-#popupPolicyRow, #enableSoftwareInstallRow, #enableImagesRow {
-  margin-bottom: 4px !important;
-  padding-bottom: 4px !important;
-  border-bottom: 1px solid #ccc;
-}
-
-#enableImagesRow {
-  -moz-box-align: start !important;
-}
-
-#browserUseCurrent, #browserUseBookmark, #browserUseBlank {
-  margin-top: 10px;
-}
-
-#advancedPrefs {
-  margin: 0 8px;
-}
-
-#privacyPrefs {
-  padding: 0 4px;
-}
-
-#privacyPrefs > tabpanels {
-  padding: 18px 10px 10px 10px;
-}
-
-#OCSPDialogPane {
-  font: message-box !important;
-}
-
-/**
- * Update Preferences
- */
-#autoInstallOptions {
-  -moz-margin-start: 20px;
-}
-
-.updateControls {
-  -moz-margin-start: 10px;
-}
-
-/**
- * Clear Private Data
- */
-#SanitizeDurationBox {
-  padding-bottom: 10px;
-}
-
-#sanitizeDurationChoice {
-  margin: 0; 
-}
-
-#sanitizeDurationLabel {
-  -moz-margin-start: 3px;
-}
-
-#SanitizeDialogPane > groupbox {
-  margin-top: 0;
-}
--- a/toolkit/themes/pinstripe/global/jar.mn
+++ b/toolkit/themes/pinstripe/global/jar.mn
@@ -13,16 +13,17 @@ classic.jar:
 +  skin/classic/global/checkbox.css
 +  skin/classic/global/closetab.png
 +  skin/classic/global/colorpicker.css
 +  skin/classic/global/commonDialog.css
 +  skin/classic/global/config.css
 +  skin/classic/global/customizeToolbar.css
 +  skin/classic/global/dialog.css
 +  skin/classic/global/dropmarker.css
++  skin/classic/global/filefield.css
 +  skin/classic/global/filepicker.css
 +  skin/classic/global/findBar.css
 +  skin/classic/global/global.css
 +  skin/classic/global/groupbox.css
 +  skin/classic/global/linkTree.css
 +  skin/classic/global/listbox_highlight.png
 +  skin/classic/global/listbox.css
 +  skin/classic/global/menu.css
copy from browser/themes/winstripe/browser/preferences/preferences.css
copy to toolkit/themes/winstripe/global/filefield.css
--- a/browser/themes/winstripe/browser/preferences/preferences.css
+++ b/toolkit/themes/winstripe/global/filefield.css
@@ -33,178 +33,37 @@
 # 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 MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 */
 
-/* Global Styles */
-#BrowserPreferences radio[pane] {
-  list-style-image: url("chrome://browser/skin/preferences/Options.png"); 
-  padding: 5px 3px 1px;
-}
-
-radio[pane=paneMain] {
-	-moz-image-region: rect(0px, 32px,  32px, 0px)
-}
-radio[pane=paneMain]:hover, 
-radio[pane=paneMain][selected="true"]  {
-	-moz-image-region: rect(32px, 32px,  64px, 0px)
-}
-
-radio[pane=paneTabs] {
-	-moz-image-region: rect(0px, 64px, 32px, 32px)
-}
-radio[pane=paneTabs]:hover, 
-radio[pane=paneTabs][selected="true"] {
-	-moz-image-region: rect(32px, 64px, 64px, 32px)
-}
-
-radio[pane=paneContent] {
-	-moz-image-region: rect(0px, 96px,  32px, 64px)
-}
-radio[pane=paneContent]:hover, 
-radio[pane=paneContent][selected="true"]  {
-	-moz-image-region: rect(32px, 96px,  64px, 64px)
-}
-
-radio[pane=paneApplications] {
-	-moz-image-region: rect(0px, 128px,  32px, 96px)
-}
-radio[pane=paneApplications]:hover, 
-radio[pane=paneApplications][selected="true"]  {
-	-moz-image-region: rect(32px, 128px,  64px, 96px)
-}
-
-radio[pane=panePrivacy] {
-	-moz-image-region: rect(0px, 160px,  32px, 128px)
-}
-radio[pane=panePrivacy]:hover, 
-radio[pane=panePrivacy][selected="true"]  {
-	-moz-image-region: rect(32px, 160px,  64px, 128px)
-}
-
-radio[pane=paneSecurity] {
-	-moz-image-region: rect(0px, 192px,  32px, 160px)
-}
-radio[pane=paneSecurity]:hover, 
-radio[pane=paneSecurity][selected="true"]  {
-	-moz-image-region: rect(32px, 192px,  64px, 160px)
-}
-
-radio[pane=paneAdvanced] {
-	-moz-image-region: rect(0px, 224px, 32px, 192px)
-}
-radio[pane=paneAdvanced]:hover, 
-radio[pane=paneAdvanced][selected="true"] {
-	-moz-image-region: rect(32px, 224px, 64px, 192px)
-}
-
-/* Applications Pane */
-#BrowserPreferences[animated="true"] #handlersView {
-  height: 25em;
-}
-
-#BrowserPreferences[animated="false"] #handlersView {
-  -moz-box-flex: 1;
-}
-
 /* File Field Widget */
 filefield {
   margin: 2px 4px;
   -moz-appearance: textfield;
 }
 
 .fileFieldContentBox {
   background-color: -moz-Dialog;
-  color: -moz-DialogText;
-  margin: 1px;
-}
-
-.fileFieldContentBox[disabled="true"] {
-  opacity: 0.5;
 }
 
 .fileFieldIcon[disabled="true"] {
-  opacity: 0.2;
+  opacity: 0.4;
 }
 
 .fileFieldIcon {
   width: 16px;
   height: 16px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-  -moz-margin-start: 2px;
+  margin-top: 1px;
+  margin-bottom: 1px;
+  -moz-margin-start: 1px;
   -moz-margin-end: 4px;
 }
 
 .fileFieldLabel {
   -moz-appearance: none;
   background-color: transparent;
   border: none;
-  padding: 1px 0px 0px 0px;
   margin: 0px;
 }
-
-/* Modeless Window Dialogs */
-.windowDialog,
-.windowDialog prefpane {
-  padding: 0px;
-}
-
-.contentPane {
-  margin: 9px 8px 5px 8px;
-}
-
-.actionButtons {
-  margin: 0px 3px 6px 3px !important;
-}
-
-/* Cookies Manager */
-#cookiesChildren::-moz-tree-image(domainCol) {
-  width: 16px;
-  height: 16px;
-  margin: 0px 2px;
-  list-style-image: url("chrome://global/skin/icons/folder-item.png") !important;
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-#cookiesChildren::-moz-tree-image(domainCol, container) {
-  -moz-image-region: rect(0px, 32px, 16px, 16px);
-}
-
-#cookiesChildren::-moz-tree-image(domainCol, container, open) {
-  -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
-
-#cookieInfoBox {
-  border: 1px solid ThreeDShadow;
-  -moz-border-radius: 0px;
-  margin: 4px;
-  padding: 0px;
-}
-
-/* bottom-most box containing a groupbox in a prefpane. Prevents the bottom
-   of the groupbox from being cutoff */
-.bottomBox {
-  padding-bottom: 4px;
-}
-
-/**
- * Clear Private Data
- */
-#SanitizeDurationBox {
-  padding-bottom: 10px;
-}
-
-#sanitizeDurationChoice {
-  margin: 0; 
-}
-
-#sanitizeDurationLabel {
-  -moz-margin-start: 3px;
-}
-
-#SanitizeDialogPane > groupbox {
-  margin-top: 0;
-}
--- a/toolkit/themes/winstripe/global/jar.mn
+++ b/toolkit/themes/winstripe/global/jar.mn
@@ -12,16 +12,17 @@ classic.jar:
         skin/classic/global/colorpicker.css
         skin/classic/global/commonDialog.css
 *       skin/classic/global/config.css
         skin/classic/global/customizeToolbar.css
         skin/classic/global/datetimepicker.css
         skin/classic/global/dialog.css
         skin/classic/global/dropmarker.css
         skin/classic/global/expander.css
+        skin/classic/global/filefield.css
         skin/classic/global/filepicker.css
         skin/classic/global/findBar.css
 *       skin/classic/global/global.css
         skin/classic/global/globalBindings.xml
         skin/classic/global/groupbox.css
         skin/classic/global/linkTree.css
         skin/classic/global/listbox.css
         skin/classic/global/menu.css
@@ -178,16 +179,17 @@ classic.jar:
         skin/classic/aero/global/colorpicker.css
         skin/classic/aero/global/commonDialog.css
 *       skin/classic/aero/global/config.css
         skin/classic/aero/global/customizeToolbar.css
         skin/classic/aero/global/datetimepicker.css
         skin/classic/aero/global/dialog.css
         skin/classic/aero/global/dropmarker.css
         skin/classic/aero/global/expander.css
+        skin/classic/aero/global/filefield.css
         skin/classic/aero/global/filepicker.css
         skin/classic/aero/global/findBar.css
 *       skin/classic/aero/global/global.css
         skin/classic/aero/global/globalBindings.xml
         skin/classic/aero/global/groupbox.css
         skin/classic/aero/global/linkTree.css
         skin/classic/aero/global/listbox.css
         skin/classic/aero/global/menu.css