From 94c5717052849afcad6b8246ebe1f2395ee80f44 Mon Sep 17 00:00:00 2001
From: Abe Jellinek <jellinek@berkeley.edu>
Date: Mon, 3 Apr 2023 16:38:31 -0400
Subject: [PATCH] fx-compat: Add missing element selectors to platform SCSS

Follow-up to 6b819e259c052b5942e9cbf99c97b6e5aaae6e07: fixes element-specific
selectors mistakenly being applied globally, and some selectors not having the
intended effect because of lower specificity.
---
 scss/mac/elements/_attachmentBox.scss |  8 ++--
 scss/mac/elements/_itemBox.scss       | 69 ++++++++++++++-------------
 scss/win/elements/_itemBox.scss       | 64 +++++++++++++------------
 3 files changed, 73 insertions(+), 68 deletions(-)

diff --git a/scss/mac/elements/_attachmentBox.scss b/scss/mac/elements/_attachmentBox.scss
index 14a18da57f..f41f52193d 100644
--- a/scss/mac/elements/_attachmentBox.scss
+++ b/scss/mac/elements/_attachmentBox.scss
@@ -1,4 +1,6 @@
-td:first-child > label
-{
-	color: #7f7f7f;
+attachment-box {
+	td:first-child > label
+	{
+		color: #7f7f7f;
+	}
 }
diff --git a/scss/mac/elements/_itemBox.scss b/scss/mac/elements/_itemBox.scss
index f959103b38..d4af3fd467 100644
--- a/scss/mac/elements/_itemBox.scss
+++ b/scss/mac/elements/_itemBox.scss
@@ -1,39 +1,40 @@
-scrollbox
-{
-	padding-top: 3px;
+item-box {
+	scrollbox
+	{
+		padding-top: 3px;
+	}
+	
+	th > label, .creator-type-label, #more-creators-label {
+		color: #7f7f7f;
+	}
+	
+	/*.zotero-field-toggle .toolbarbutton-text
+	{	
+		visibility: hidden;
+	}
+	
+	.zotero-field-toggle .toolbarbutton-icon
+	{
+		margin: 0px !important;
+	}*/
+	
+	.creator-type-dropmarker {
+		margin: 1px .2em 1px;
+		background-image: url('chrome://zotero/skin/mac/arrow-down.png');
+		max-width: 7px;
+		max-height: 7px;
+	}
+	
+	td > input {
+		margin-top: -1px;
+		margin-bottom: -2.5px;
+		margin-inline-start: 0;
+		margin-inline-end: 5px;
+		padding: 0;
+	}
 }
 
-th > label, .creator-type-label, #more-creators-label {
-	color: #7f7f7f;
-}
-
-/*.zotero-field-toggle .toolbarbutton-text
-{	
-	visibility: hidden;
-}
-
-.zotero-field-toggle .toolbarbutton-icon
-{
-	margin: 0px !important;
-}*/
-
-.creator-type-dropmarker {
-	margin: 1px .2em 1px;
-	background-image: url('chrome://zotero/skin/mac/arrow-down.png');
-	max-width: 7px;
-	max-height: 7px;
-}
-
-td > input {
-	margin-top: -1px;
-	margin-bottom: -2.5px;
-	margin-inline-start: 0;
-	margin-inline-end: 5px;
-	padding: 0;
-}
-
-
 /* BEGIN 2X BLOCK -- DO NOT EDIT MANUALLY -- USE 2XIZE */
 @media (min-resolution: 1.25dppx) {
-	.creator-type-dropmarker { background-image: url('chrome://zotero/skin/mac/arrow-down@2x.png'); }
+	item-box .creator-type-dropmarker { background-image: url('chrome://zotero/skin/mac/arrow-down@2x.png'); }
 }
diff --git a/scss/win/elements/_itemBox.scss b/scss/win/elements/_itemBox.scss
index 4d2d8d988c..5f32d07217 100644
--- a/scss/win/elements/_itemBox.scss
+++ b/scss/win/elements/_itemBox.scss
@@ -1,32 +1,34 @@
-row > hbox,
-row > vbox
-{
-	margin-top: 0 !important;
-	margin-bottom: 0 !important;
-	padding-top: 0 !important;
-	padding-bottom: 0 !important;
+item-box {
+	row > hbox,
+	row > vbox
+	{
+		margin-top: 0 !important;
+		margin-bottom: 0 !important;
+		padding-top: 0 !important;
+		padding-bottom: 0 !important;
+	}
+	
+	row vbox[fieldname]
+	{
+		margin-inline-start: 1px;
+	}
+	
+	.creator-type-label image {
+		margin-bottom: 0;
+	}
+	
+	input {
+		padding: 2px;
+		margin: -1px 0;
+		margin-inline-start: 1px;
+	}
+	
+	#item-type-menu
+	{
+		padding: 0 !important;
+		padding-inline-start: 1px !important;
+		margin: 0 !important;
+		margin-inline-start: 1px !important;
+		margin-inline-end: 5px !important;
+	}
 }
-
-row vbox[fieldname]
-{
-	margin-inline-start: 1px;
-}
-
-.creator-type-label image {
-	margin-bottom: 0;
-}
-
-input {
-	padding: 2px;
-	margin: -1px 0;
-	margin-inline-start: 1px;
-}
-
-#item-type-menu
-{
-	padding: 0 !important;
-	padding-inline-start: 1px !important;
-	margin: 0 !important;
-	margin-inline-start: 1px !important;
-	margin-inline-end: 5px !important;
-}
\ No newline at end of file