Skip to content

Commit 1f263b4

Browse files
jasonhendeejasonhendee
committed
Merge remote-tracking branch 'origin/hotfix-18.1' into develop
2 parents 82e2458 + 696c421 commit 1f263b4

File tree

9 files changed

+181
-12
lines changed

9 files changed

+181
-12
lines changed

‎RockWeb/Blocks/Groups/GroupFinder.ascx.cs‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2313,7 +2313,23 @@ function adjustOverlappedMarkers() {{
23132313
marker = DefinedValueCache.Get( markerDefinedValueId.Value ).Description;
23142314
}
23152315

2316-
if (mapId != "DEFAULT_MAP_ID" )
2316+
/*
2317+
11/25/2025 - N.A.
2318+
2319+
Check to see if we are using a custom mapId. Map markers are separate objects created using the
2320+
Maps JavaScript API and are rendered on top of the map. Their appearance is controlled entirely
2321+
through client-side code, not the map style ID. However, when using a custom mapId, the
2322+
mapScriptFormat code above switches to the modern google.maps.marker.AdvancedMarkerElement.
2323+
This element requires an HTML or SVG element for its content property.
2324+
2325+
This fix ensures compatibility with both custom Map ID configurations or legacy (no mapId) mode.
2326+
The legacy marker should only contain the PATH value of the SVG (such as "M 0,0 C -2,...")
2327+
2328+
Reason: When using a custom mapId, the mapScriptFormat code switches to google.maps.marker.AdvancedMarkerElement,
2329+
which requires an a full SVG element as its content.
2330+
*/
2331+
2332+
if ( mapId.IsNotNullOrWhiteSpace() )
23172333
{
23182334
var markerFormat = "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"50\" height=\"50\" viewBox=\"-10 -40 30 55\"><path d=\"{0}\"/></svg>";
23192335
marker = string.Format( markerFormat, marker ).Replace( "\"", "'" );

‎RockWeb/Blocks/Security/PhoneNumberIdentification.ascx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
<Rock:NotificationBox ID="nbConfigurationError" runat="server" NotificationBoxType="Danger" Text="This block is not yet configured for use." Visible="false" />
88
<Rock:NotificationBox ID="nbWarningMessage" runat="server" NotificationBoxType="Danger" Visible="false" />
99

10+
<asp:HiddenField ID="hfPhoneNumberLookup" runat="server" />
11+
1012
<asp:Panel ID="pnlPhoneNumberEntry" runat="server">
1113
<asp:ValidationSummary ID="valValidation"
1214
runat="server"

‎RockWeb/Blocks/Security/PhoneNumberIdentification.ascx.cs‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ protected void btnLookup_Click( object sender, EventArgs e )
237237
var errorList = new List<string>();
238238
if ( smsMessage.Send( out errorList ) )
239239
{
240+
hfPhoneNumberLookup.Value = phoneNumber;
240241
IdentityVerificationId = identityVerification.Id;
241242
ShowVerificationPage();
242243
}
@@ -503,7 +504,6 @@ private void AuthenticatePerson( int personId )
503504
if ( user != null )
504505
{
505506
var userName = user.UserName;
506-
UserLoginService.UpdateLastLogin( new UpdateLastLoginArgs { UserName = userName } );
507507

508508
/*
509509
10/20/2023 - JMH
@@ -529,6 +529,26 @@ since there is no need to bypass it.
529529
isPersisted: false,
530530
isImpersonated: false,
531531
isTwoFactorAuthenticated );
532+
533+
/*
534+
11/25/2025 - JPH
535+
536+
Since we're sure the person was authenticated at this point, let's log a record to the
537+
HistoryLogin table for auditing purposes. We won't tie it to a UserLoginId since this is
538+
a non-standard login process, and we want to properly capture the context of the login.
539+
540+
Reason: Login History Accuracy
541+
*/
542+
543+
new HistoryLogin
544+
{
545+
UserName = hfPhoneNumberLookup.Value,
546+
PersonAliasId = person.PrimaryAliasId,
547+
SourceSiteId = PageCache?.SiteId,
548+
WasLoginSuccessful = true
549+
}
550+
.WithContext( "Phone Number Lookup" )
551+
.SaveAfterDelay();
532552
}
533553
else
534554
{

‎RockWeb/Styles/styles-v2/_core.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@
139139
@import 'rock-components/person-card';
140140
@import 'rock-components/structured-editor';
141141
@import 'rock-components/drag-pallet';
142+
@import 'rock-components/_monaco-editor';
142143

143144
/* ===================== BLOCK =================== */
144145
@import 'blocks/blocks-core'; // Fully Format. There are Some hard coded value.

‎RockWeb/Styles/styles-v2/components/_navbar.scss‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,21 @@
717717
// =================== END INVERSE NAV ===================
718718

719719

720+
// ======================== SIDEBAR NAV ========================
721+
722+
.navbar-static-side .navbar-side .nav-item-top {
723+
&.open {
724+
.item-title,
725+
.nav-childpages li.title {
726+
color: var(--color-interface-stronger);
727+
i {
728+
color: var(--color-interface-strong);
729+
}
730+
}
731+
}
732+
}
733+
// ======================== END SIDEBAR NAV ========================
734+
720735
// ======================== REMINDERS / BOOKMARKS ========================
721736

722737
a.rock-bookmark {

‎RockWeb/Styles/styles-v2/rock-components/_monaco-editor.scss‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
// Styles to override monoco editor defaults to match Rock theme
2+
3+
// Normal VS Theme Overrides - does not affect VS Dark or HC themes
4+
5+
6+
.monaco-editor {
7+
> .overflow-guard > .margin,
8+
> .overflow-guard > .monaco-scrollable-element > .monaco-editor-background,
9+
canvas.decorationsOverviewRuler,
10+
.sticky-widget,
11+
.sticky-line-content {
12+
background-color: var(--color-interface-softest) !important;
13+
}
14+
15+
.monaco-editor-background {
16+
background-color: transparent !important;
17+
}
18+
19+
.line-numbers.active-line-number {
20+
color: var(--color-interface-strong) !important;
21+
}
22+
23+
.view-overlays .current-line-exact,
24+
.sticky-widget {
25+
border-color: var(--color-interface-soft) !important;
26+
}
27+
28+
.sticky-widget {
29+
box-shadow: 0 4px 2px -2px var(--color-interface-soft) !important;
30+
}
31+
32+
.scroll-decoration {
33+
box-shadow: var(--color-interface-strong) 0 6px 6px -6px inset !important;
34+
}
35+
36+
.mtk14,
37+
.mtk10 { // Element text and bracket color
38+
color: var(--color-danger-strong) !important;
39+
}
40+
41+
.mtk1 { // Text content color
42+
color: var(--color-interface-stronger) !important;
43+
}
44+
45+
.cursor {
46+
background-color: var(--color-interface-stronger) !important;
47+
}
48+
49+
.mtk23 { // Variable color
50+
color: var(--color-info-strong) !important;
51+
}
52+
}

‎RockWeb/Styles/styles-v2/rock-components/_smart-search.scss‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// searching people, groups, etc. (Rock Component)
44

55
// =============================================================
6-
// Table of Content
7-
// + Base Style
6+
// Table of Content
7+
// + Base Style
88
// =============================================================
99

1010

@@ -20,7 +20,7 @@
2020
border: 1px solid var(--color-interface-stronger);
2121
border-radius: var(--rounded-small);
2222
transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out;
23-
23+
2424
&:hover {
2525
border-color: var(--color-interface-medium) !important;
2626
}
@@ -132,12 +132,23 @@
132132

133133
.dropdown-menu {
134134
top: 35px;
135-
right: 0;
136-
left: auto;
135+
right: auto;
136+
left: 0;
137137
// smart search type menu
138138
font-size: var(--font-size-xsmall);
139139
cursor: pointer;
140140
}
141141
}
142142
}
143+
144+
@media (max-width: 767px) {
145+
146+
.rock-top-header .block-instance .smartsearch .dropdown {
147+
.dropdown-menu {
148+
right: auto;
149+
left: 0;
150+
}
151+
}
152+
153+
}
143154
// ====================== END BASE STYLE ======================

‎RockWeb/Themes/RockNextGen/Styles/theme.css‎

Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10124,6 +10124,15 @@ ul.activeusers {
1012410124
color: var(--color-interface-strong);
1012510125
}
1012610126

10127+
.navbar-static-side .navbar-side .nav-item-top.open .item-title,
10128+
.navbar-static-side .navbar-side .nav-item-top.open .nav-childpages li.title {
10129+
color: var(--color-interface-stronger);
10130+
}
10131+
.navbar-static-side .navbar-side .nav-item-top.open .item-title i,
10132+
.navbar-static-side .navbar-side .nav-item-top.open .nav-childpages li.title i {
10133+
color: var(--color-interface-strong);
10134+
}
10135+
1012710136
a.rock-bookmark {
1012810137
color: var(--color-interface-strong);
1012910138
}
@@ -12561,12 +12570,18 @@ div.aspNetDisabled {
1256112570
}
1256212571
.smartsearch .dropdown .dropdown-menu {
1256312572
top: 35px;
12564-
right: 0;
12565-
left: auto;
12573+
right: auto;
12574+
left: 0;
1256612575
font-size: var(--font-size-xsmall);
1256712576
cursor: pointer;
1256812577
}
1256912578

12579+
@media (max-width: 767px) {
12580+
.rock-top-header .block-instance .smartsearch .dropdown .dropdown-menu {
12581+
right: auto;
12582+
left: 0;
12583+
}
12584+
}
1257012585
.numberincrement {
1257112586
-webkit-user-select: none;
1257212587
-moz-user-select: none;
@@ -19579,6 +19594,43 @@ iframe.file-browser {
1957919594
display: none;
1958019595
}
1958119596

19597+
.monaco-editor > .overflow-guard > .margin,
19598+
.monaco-editor > .overflow-guard > .monaco-scrollable-element > .monaco-editor-background,
19599+
.monaco-editor canvas.decorationsOverviewRuler,
19600+
.monaco-editor .sticky-widget,
19601+
.monaco-editor .sticky-line-content {
19602+
background-color: var(--color-interface-softest) !important;
19603+
}
19604+
.monaco-editor .monaco-editor-background {
19605+
background-color: transparent !important;
19606+
}
19607+
.monaco-editor .line-numbers.active-line-number {
19608+
color: var(--color-interface-strong) !important;
19609+
}
19610+
.monaco-editor .view-overlays .current-line-exact,
19611+
.monaco-editor .sticky-widget {
19612+
border-color: var(--color-interface-soft) !important;
19613+
}
19614+
.monaco-editor .sticky-widget {
19615+
box-shadow: 0 4px 2px -2px var(--color-interface-soft) !important;
19616+
}
19617+
.monaco-editor .scroll-decoration {
19618+
box-shadow: var(--color-interface-strong) 0 6px 6px -6px inset !important;
19619+
}
19620+
.monaco-editor .mtk14,
19621+
.monaco-editor .mtk10 {
19622+
color: var(--color-danger-strong) !important;
19623+
}
19624+
.monaco-editor .mtk1 {
19625+
color: var(--color-interface-stronger) !important;
19626+
}
19627+
.monaco-editor .cursor {
19628+
background-color: var(--color-interface-stronger) !important;
19629+
}
19630+
.monaco-editor .mtk23 {
19631+
color: var(--color-info-strong) !important;
19632+
}
19633+
1958219634
/* ===================== BLOCK =================== */
1958319635
.rock-fullscreen-toggle {
1958419636
position: absolute;

‎RockWeb/Themes/RockNextGen/Styles/theme.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -598,11 +598,11 @@ body.navbar-side-open {
598598
font-size: 24px;
599599
font-weight: var(--font-weight-semibold);
600600
line-height: 1;
601-
color: var(--color-interface-softer);
601+
color: var(--base-interface-softer);
602602

603603
&:after {
604-
content: "\f054";
605-
font-family: FontAwesome;
604+
content: "\ea61";
605+
font-family: tabler-icons;
606606
font-size: 12px;
607607
font-weight: 900;
608608
margin-left: 12px;

0 commit comments

Comments
 (0)