Merge remote-tracking branch 'origin/hotfix-18.2' into develop

nairdo · nairdo · commit 5fabe357e5f0 · 2025-12-04T11:05:32.000-07:00
diff --git a/Rock.JavaScript.Obsidian.Blocks/src/Communication/communicationDetail.obs b/Rock.JavaScript.Obsidian.Blocks/src/Communication/communicationDetail.obs
@@ -169,6 +169,10 @@
     flex-wrap: wrap;
     gap: var(--spacing-xsmall);
 }
+
+:deep(.panel-scrollable-content) {
+    overflow: unset;
+}
 </style>
 
 <script setup lang="ts">
diff --git a/RockWeb/Styles/_blocks-communication.less b/RockWeb/Styles/_blocks-communication.less
@@ -600,6 +600,12 @@ iframe.email-body {
     top: 0;
 }
 
+.communication-detail-recipient-details .sticky-column-header {
+    top: 57px;
+    position: sticky;
+    z-index: 1;
+}
+
 .page-fullscreen-capable .panel.panel-block.panel-flex > .panel-body:has(.communication-detail-recipient-details) {
     overflow: auto;
 }
diff --git a/RockWeb/Styles/styles-v2/blocks/_blocks-communication.scss b/RockWeb/Styles/styles-v2/blocks/_blocks-communication.scss
@@ -326,7 +326,7 @@ iframe.email-body {
     top: 0;
 }
 .communication-detail-recipient-details .sticky-column-header {
-    top: 37px;
+    top: 57px;
 }
 
 .page-fullscreen-capable .panel.panel-block.panel-flex > .panel-body:has(.communication-detail-recipient-details) {
diff --git a/RockWeb/Themes/RockNextGen/Styles/_variable-overrides.css b/RockWeb/Themes/RockNextGen/Styles/_variable-overrides.css
diff --git a/RockWeb/Themes/RockNextGen/Styles/theme.css b/RockWeb/Themes/RockNextGen/Styles/theme.css
@@ -22222,7 +22222,7 @@ iframe.email-body {
 }
 
 .communication-detail-recipient-details .sticky-column-header {
-  top: 37px;
+  top: 57px;
 }
 
 .page-fullscreen-capable .panel.panel-block.panel-flex > .panel-body:has(.communication-detail-recipient-details) {

Original file line number	Diff line number	Diff line change
`@@ -600,6 +600,12 @@ iframe.email-body {`
`600`	`600`	`top: 0;`
`601`	`601`	`}`
`602`	`602`
	`603`	`+.communication-detail-recipient-details .sticky-column-header {`
	`604`	`+ top: 57px;`
	`605`	`+ position: sticky;`
	`606`	`+ z-index: 1;`
	`607`	`+}`
	`608`	`+`
`603`	`609`	`.page-fullscreen-capable .panel.panel-block.panel-flex > .panel-body:has(.communication-detail-recipient-details) {`
`604`	`610`	`overflow: auto;`
`605`	`611`	`}`
Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ iframe.email-body {`
`326`	`326`	`top: 0;`
`327`	`327`	`}`
`328`	`328`	`.communication-detail-recipient-details .sticky-column-header {`
`329`		`- top: 37px;`
	`329`	`+ top: 57px;`
`330`	`330`	`}`
`331`	`331`
`332`	`332`	`.page-fullscreen-capable .panel.panel-block.panel-flex > .panel-body:has(.communication-detail-recipient-details) {`
Original file line number	Diff line number	Diff line change
`@@ -22222,7 +22222,7 @@ iframe.email-body {`
`22222`	`22222`	`}`
`22223`	`22223`
`22224`	`22224`	`.communication-detail-recipient-details .sticky-column-header {`
`22225`		`- top: 37px;`
	`22225`	`+ top: 57px;`
`22226`	`22226`	`}`
`22227`	`22227`
`22228`	`22228`	`.page-fullscreen-capable .panel.panel-block.panel-flex > .panel-body:has(.communication-detail-recipient-details) {`