diff --git a/chrome/content/zotero/collectionTree.jsx b/chrome/content/zotero/collectionTree.jsx index 586c8ac214..445826a616 100644 --- a/chrome/content/zotero/collectionTree.jsx +++ b/chrome/content/zotero/collectionTree.jsx @@ -393,7 +393,7 @@ var CollectionTree = class CollectionTree extends LibraryTree { label.className = 'cell-text'; label.dataset.rowId = treeRow.id; label.setAttribute("size", 5); - label.toggleAttribute("no-windows-native", true); + label.toggleAttribute("no-native", true); label.value = treeRow.editingName; label.addEventListener('input', e => this.handleEditingChange(e, index)); label.addEventListener('mousedown', (e) => e.stopImmediatePropagation()); diff --git a/chrome/content/zotero/elements/bubbleInput.js b/chrome/content/zotero/elements/bubbleInput.js index d6f21205f6..aa96caef4e 100644 --- a/chrome/content/zotero/elements/bubbleInput.js +++ b/chrome/content/zotero/elements/bubbleInput.js @@ -310,7 +310,7 @@ // tabindex for keyboard handling input.setAttribute("tabindex", 0); // hide windows appearance from _input.scss - input.setAttribute("no-windows-native", true); + input.setAttribute("no-native", true); input.setAttribute("data-arrow-nav-enabled", true); input.className = "input empty"; input.setAttribute("data-l10n-id", "integration-citationDialog-input"); diff --git a/chrome/content/zotero/elements/editableText.js b/chrome/content/zotero/elements/editableText.js index b5e6ef12f4..dbe5558ef0 100644 --- a/chrome/content/zotero/elements/editableText.js +++ b/chrome/content/zotero/elements/editableText.js @@ -227,7 +227,7 @@ } input.rows = 1; input.classList.add('input'); - input.toggleAttribute("no-windows-native", true); + input.toggleAttribute("no-native", true); input.addEventListener('input', this._handleInput); input.addEventListener('change', this._handleChange); input.addEventListener('focus', this._handleFocus); diff --git a/scss/mac/components/_input.scss b/scss/mac/components/_input.scss new file mode 100644 index 0000000000..83b8923c90 --- /dev/null +++ b/scss/mac/components/_input.scss @@ -0,0 +1,7 @@ +// TODO: Fx140: Give this a border/shadow when not :focus-visible? +:where(textarea:not([no-native])) { + appearance: none; + border: none; + border-radius: 2px; + @include focus-ring; +} diff --git a/scss/preferences-mac.scss b/scss/preferences-mac.scss index 6672b62797..bbcc68925c 100644 --- a/scss/preferences-mac.scss +++ b/scss/preferences-mac.scss @@ -15,5 +15,6 @@ // Components +@import "mac/components/input"; @import "mac/components/menupopup"; @import "mac/components/menulist"; diff --git a/scss/win/components/_input.scss b/scss/win/components/_input.scss index 73cb1b5d2a..f29687b43e 100644 --- a/scss/win/components/_input.scss +++ b/scss/win/components/_input.scss @@ -60,7 +60,7 @@ textbox, search-textbox, textarea -):where(:not([no-windows-native])) { +):where(:not([no-native])) { appearance: none; height: 26px; padding: 0; @@ -126,6 +126,6 @@ } } -textarea:not([no-windows-native]) { +textarea:not([no-native]) { height: unset; } diff --git a/scss/zotero-mac.scss b/scss/zotero-mac.scss index 149b5b5698..fe829118b6 100644 --- a/scss/zotero-mac.scss +++ b/scss/zotero-mac.scss @@ -9,6 +9,7 @@ @import "mac/tabBar"; @import "mac/tabbox"; @import "mac/titleBar"; +@import "mac/components/input"; @import "mac/components/menupopup"; @import "mac/components/menulist"; @import "mac/citationExplorer";