diff --git a/chrome/content/zotero/customElements.js b/chrome/content/zotero/customElements.js index a63098a3b8..0e3b60939b 100644 --- a/chrome/content/zotero/customElements.js +++ b/chrome/content/zotero/customElements.js @@ -337,7 +337,12 @@ Services.scriptloader.loadSubScript('chrome://zotero/content/elements/itemTreeMe patchedFunction: "connectedCallback", } ], - linux: [], + linux: [ + { + element: "dialog", + patchedFunction: "connectedCallback" + } + ], }; for (let [key, configs] of Object.entries(InjectCSSConfig)) { if (key == "win" && !Zotero.isWin) continue; diff --git a/scss/_zotero.scss b/scss/_zotero.scss index 2dac4bf4b3..033148331d 100644 --- a/scss/_zotero.scss +++ b/scss/_zotero.scss @@ -38,6 +38,7 @@ @import "components/editBibliographyDialog"; @import "components/exportOptions"; @import "components/feedSettings"; +@import "components/input"; @import "components/icons"; @import "components/import-wizard"; @import "components/item-tree"; @@ -46,6 +47,7 @@ @import "components/longTagFixer"; @import "components/mainWindow"; @import "components/menu"; +@import "components/menulist"; @import "components/notesList"; @import "components/progressMeter"; @import "components/publications-dialog"; diff --git a/scss/components/_button.scss b/scss/components/_button.scss index dccf87329d..78b124ea1f 100644 --- a/scss/components/_button.scss +++ b/scss/components/_button.scss @@ -37,4 +37,12 @@ button { max-height: 25px; margin: 0 -2px -1px; } + + @media (-moz-platform: linux) { + // fx140 form element styling fix + appearance: none; + border-radius: 5px; + border-color: ThreeDShadow; + padding: 0.3em 1.5em; + } } diff --git a/scss/components/_input.scss b/scss/components/_input.scss new file mode 100644 index 0000000000..11468a3893 --- /dev/null +++ b/scss/components/_input.scss @@ -0,0 +1,13 @@ +input { + @media (-moz-platform: linux) { + // fx140 form element styling fix + appearance: none; + border-radius: 5px; + padding: .3em .5em; + border: 1px solid ThreeDShadow; + + &[type="button"] { + padding: .3em 1.5em; + } + } +} \ No newline at end of file diff --git a/scss/components/_menulist.scss b/scss/components/_menulist.scss new file mode 100644 index 0000000000..9b07bcb2a9 --- /dev/null +++ b/scss/components/_menulist.scss @@ -0,0 +1,10 @@ +menulist { + @media (-moz-platform: linux) { + // fx140 form element styling fix + appearance: none; + border-radius: 5px; + border-color: ThreeDShadow; + padding: .3em .5em; + background: var(--arrowpanel-background); + } +} diff --git a/scss/preferences.scss b/scss/preferences.scss index 7f77c02fed..d31c5879f1 100644 --- a/scss/preferences.scss +++ b/scss/preferences.scss @@ -22,8 +22,10 @@ @import "components/button"; @import "components/icons"; +@import "components/input"; @import "components/listheader"; @import "components/menu"; +@import "components/menulist"; @import "components/richlistbox"; @import "components/search"; @import "components/spinner"; diff --git a/scss/xulElementPatches/dialog-unix.scss b/scss/xulElementPatches/dialog-unix.scss new file mode 100644 index 0000000000..7cd74748a9 --- /dev/null +++ b/scss/xulElementPatches/dialog-unix.scss @@ -0,0 +1,22 @@ +// Override/enhance mozilla styles. See customElements.js +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +@namespace html url("http://www.w3.org/1999/xhtml"); + +@import "../abstracts/variables"; +@import "../abstracts/functions"; +@import "../abstracts/mixins"; +@import "../abstracts/placeholders"; +@import "../abstracts/utilities"; +@import "../abstracts/split-button"; +@import "../abstracts/svgicon"; + +@import "../themes/light"; +@import "../themes/dark"; + +// Base +// -------------------------------------------------- + +@import "../base/base"; + +@import "../components/button"; +@import "../components/input";