diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index 5e44e85fd6b7..e4393bc53ed8 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -74,7 +74,6 @@ toolkit.jar: content/global/bindings/datetimebox.css (widgets/datetimebox.css) * content/global/bindings/dialog.xml (widgets/dialog.xml) content/global/bindings/editor.xml (widgets/editor.xml) - content/global/bindings/filefield.xml (widgets/filefield.xml) * content/global/bindings/findbar.xml (widgets/findbar.xml) content/global/bindings/general.xml (widgets/general.xml) content/global/bindings/groupbox.xml (widgets/groupbox.xml) diff --git a/toolkit/content/widgets/filefield.xml b/toolkit/content/widgets/filefield.xml deleted file mode 100644 index 2940553a7300..000000000000 --- a/toolkit/content/widgets/filefield.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - this.setAttribute("label", val); - var elt = document.getAnonymousElementByAttribute(this, "class", "fileFieldLabel"); - return (elt.value = val); - - - - null - - - - - - - - - - - - - - - - - - - - - diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css index 0d6dcdf5a550..24a65a8436d3 100644 --- a/toolkit/content/xul.css +++ b/toolkit/content/xul.css @@ -962,12 +962,6 @@ findbar { -moz-binding: url("chrome://global/content/bindings/findbar.xml#findbar-textbox"); } - -/*********** filefield ************/ -filefield { - -moz-binding: url("chrome://global/content/bindings/filefield.xml#filefield"); -} - /*********** tabmodalprompt ************/ tabmodalprompt { -moz-binding: url("chrome://global/content/tabprompts.xml#tabmodalprompt"); diff --git a/toolkit/locales/en-US/chrome/global/filefield.properties b/toolkit/locales/en-US/chrome/global/filefield.properties deleted file mode 100644 index affe3e89fffd..000000000000 --- a/toolkit/locales/en-US/chrome/global/filefield.properties +++ /dev/null @@ -1,7 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -#### Change Action - -downloadHelperNoneSelected=None Selected diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn index cf369b9e45ac..8193b6ee4f15 100644 --- a/toolkit/locales/jar.mn +++ b/toolkit/locales/jar.mn @@ -40,7 +40,6 @@ #endif locale/@AB_CD@/global/extensions.properties (%chrome/global/extensions.properties) locale/@AB_CD@/global/fallbackMenubar.properties (%chrome/global/fallbackMenubar.properties) - locale/@AB_CD@/global/filefield.properties (%chrome/global/filefield.properties) locale/@AB_CD@/global/filepicker.properties (%chrome/global/filepicker.properties) #ifndef MOZ_FENNEC locale/@AB_CD@/global/findbar.dtd (%chrome/global/findbar.dtd) diff --git a/toolkit/themes/osx/global/filefield.css b/toolkit/themes/osx/global/filefield.css deleted file mode 100644 index 8ae3fdb52aef..000000000000 --- a/toolkit/themes/osx/global/filefield.css +++ /dev/null @@ -1,38 +0,0 @@ -/* -# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -*/ - -.fileFieldIcon { - width: 16px; - height: 16px; -} - -.fileFieldIcon[disabled="true"] { - opacity: 0.5; -} - -filefield { - margin: 4px; - margin-inline-start: 27px; - -moz-appearance: textfield; -} - -.fileFieldContentBox { - margin: -3px; - background-color: rgba(230, 230, 230, 0.6); - color: -moz-DialogText; - padding-top: 2px; - padding-bottom: 2px; - padding-inline-start: 5px; - padding-inline-end: 3px; -} - -.fileFieldLabel { - -moz-appearance: none; - background-color: transparent; - border: none; - margin: 0 4px; -} diff --git a/toolkit/themes/osx/global/jar.mn b/toolkit/themes/osx/global/jar.mn index 3468f3108c45..977bb58b038f 100644 --- a/toolkit/themes/osx/global/jar.mn +++ b/toolkit/themes/osx/global/jar.mn @@ -12,7 +12,6 @@ toolkit.jar: skin/classic/global/commonDialog.css skin/classic/global/dialog.css skin/classic/global/dropmarker.css - skin/classic/global/filefield.css * skin/classic/global/findBar.css * skin/classic/global/global.css skin/classic/global/groupbox.css diff --git a/toolkit/themes/osx/reftests/baseline.xul b/toolkit/themes/osx/reftests/baseline.xul index cbb6ef5cc51b..ce03e0fb2a83 100644 --- a/toolkit/themes/osx/reftests/baseline.xul +++ b/toolkit/themes/osx/reftests/baseline.xul @@ -11,8 +11,8 @@ * * It works like this: * For every combination of two different widgets (where widget is one of - * label, radio, checkbox, button, textbox, menulist, menulist[editable="true"] or - * filefield), there's a stack with two layers. The back layer in the stack is + * label, radio, checkbox, button, textbox, menulist, menulist[editable="true"]), + * there's a stack with two layers. The back layer in the stack is * just a vertically centered label with a bunch of underscores. This is the * baseline that the text on the widgets should hit. * On the foreground layer in the stack we've placed the pair of widgets we're @@ -130,18 +130,13 @@ function createEditableMenulist(v) { list.setAttribute("editable", "true"); return list; } -function createFileField(v) { - let field = elWithValue("filefield", v); - field.setAttribute("image", "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAAXNSR0IArs4c6QAAAChJREFUSMftzUEBAAAEBLCjf2dK8NsKrCaTT51nAoFAIBAIBAKB4MoCtVsCPjrGuiwAAAAASUVORK5CYII="); - return field; -} function loaded() { let template = document.getElementById("template"); ["regular", "small"].forEach(function(size) { let wrapper = document.querySelectorAll("#wrapper > ." + size)[0]; allPairs([ createLabel, createRadio, createCheckbox, createButton, createMenulist, createTextField, - /* createEditableMenulist, createFileField, */ /* These don't inherit "color" properly */ + /* createEditableMenulist, */ /* These don't inherit "color" properly */ ]).forEach(function(elemList) { let newBox = template.cloneNode(true); newBox.className = "spacer"; diff --git a/toolkit/themes/shared/in-content/common.inc.css b/toolkit/themes/shared/in-content/common.inc.css index 619f8fc9c7dc..92861ef75df8 100644 --- a/toolkit/themes/shared/in-content/common.inc.css +++ b/toolkit/themes/shared/in-content/common.inc.css @@ -746,45 +746,6 @@ xul|*.radio-label-box { -moz-user-select: none; } -/* File fields */ - -xul|filefield { - -moz-appearance: none; - background-color: transparent; - border: none; - padding: 0; -} - -xul|*.fileFieldContentBox { - background-color: transparent; -} - -xul|*.fileFieldIcon { - margin-inline-start: 10px; - margin-inline-end: 0; -} - -xul|*.fileFieldLabel { - margin-inline-start: -26px; - padding-inline-start: 36px; -} - -xul|*.fileFieldLabel:-moz-locale-dir(rtl), -xul|filefield + xul|button:-moz-locale-dir(ltr) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; -} - -xul|*.fileFieldLabel:-moz-locale-dir(ltr), -xul|filefield + xul|button:-moz-locale-dir(rtl) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -xul|filefield + xul|button { - border-inline-start: none; -} - /* List boxes */ html|select[size][multiple], diff --git a/toolkit/themes/shared/non-mac.jar.inc.mn b/toolkit/themes/shared/non-mac.jar.inc.mn index 27f988a2634a..670cedb6aac6 100644 --- a/toolkit/themes/shared/non-mac.jar.inc.mn +++ b/toolkit/themes/shared/non-mac.jar.inc.mn @@ -11,7 +11,6 @@ #include jar.inc.mn skin/classic/global/dialog.css (../../windows/global/dialog.css) - skin/classic/global/filefield.css (../../windows/global/filefield.css) skin/classic/global/progressmeter.css (../../windows/global/progressmeter.css) skin/classic/global/resizer.css (../../windows/global/resizer.css) skin/classic/global/richlistbox.css (../../windows/global/richlistbox.css) diff --git a/toolkit/themes/windows/global/filefield.css b/toolkit/themes/windows/global/filefield.css deleted file mode 100644 index e22b64ec6d92..000000000000 --- a/toolkit/themes/windows/global/filefield.css +++ /dev/null @@ -1,36 +0,0 @@ -/* -# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -*/ - -/* File Field Widget */ -filefield { - margin: 2px 4px; - -moz-appearance: textfield; -} - -.fileFieldContentBox { - background-color: -moz-Dialog; -} - -.fileFieldIcon[disabled="true"] { - opacity: 0.4; -} - -.fileFieldIcon { - width: 16px; - height: 16px; - margin-top: 1px; - margin-bottom: 1px; - margin-inline-start: 1px; - margin-inline-end: 4px; -} - -.fileFieldLabel { - -moz-appearance: none; - background-color: transparent; - border: none; - margin: 0px; -}