Merge branch 'hotfix-18.2' into develop

Author: maxwelleley

Rock.Blocks/Tv/TvApplicationList.cs

@@ -194,11 +194,6 @@ public BlockActionResult Delete( string key )
                 return ActionBadRequest( $"Not authorized to delete {Site.FriendlyTypeName}." );
             }
 
-            if ( !entityService.CanDelete( entity, out var errorMessage ) )
-            {
-                return ActionBadRequest( errorMessage );
-            }
-
             var sitePages = new List<int> {
                     entity.DefaultPageId ?? -1,
                     entity.LoginPageId ?? -1,
@@ -227,6 +222,11 @@ public BlockActionResult Delete( string key )
 
             RockContext.SaveChanges( true );
 
+            if ( !entityService.CanDelete( entity, out var errorMessage ) )
+            {
+                return ActionBadRequest( errorMessage );
+            }
+
             entityService.Delete( entity );
             RockContext.SaveChanges();
 

RockWeb/Blocks/Administration/SystemInfo.ascx

@@ -1,5 +1,11 @@
 <%@ Control Language="C#" AutoEventWireup="true" CodeFile="SystemInfo.ascx.cs" Inherits="RockWeb.Blocks.Administration.SystemInfo" %>
 
+<style>
+    #routes table td {
+        word-break: break-all;
+    }
+</style>
+
 <script type="text/javascript">
 
     function pageLoad() {
@@ -148,4 +154,4 @@
         </asp:LinkButton>
 
     </asp:Panel>
-</div>
+</div>

RockWeb/Styles/styles-v2/rock-components/_ace-editor.scss

@@ -3,28 +3,44 @@
 
 
 // =============================================================
-// Table of Content           
+// Table of Content
 //  + Base style
 // =============================================================
 
 
 // ======================== BASE STYLE ========================
+
 .ace-tm, .ace-github {
     .ace_gutter-active-line {
-        background: var(--color-interface-soft) !important;
+        background: var(--color-info-tint) !important;
+        color: var(--color-interface-strong) !important;
     }
 }
 
 .ace-tm, .ace-github {
     .ace_marker-layer .ace_active-line {
-        background-color: var(--color-interface-softer) !important;
+        background: var(--color-info-soft) !important;
     }
 }
+
+.ace_selected-word {
+    background: var(--color-info-soft) !important;
+    border: 1px solid var(--color-info-soft) !important;
+}
+
+.ace_bracket {
+    border: 1px solid var(--color-info-strong) !important;
+}
+
 .ace_scroller {
     background-color: var(--color-interface-softest) !important;
 }
 .ace_line {
     color: var(--color-interface-strongest);
+    .ace_string,
+    .ace_text {
+        color: var(--color-danger-strong) !important;
+    }
 }
 
 .ace_editor .ace_marker-layer .ace_selection {
@@ -36,4 +52,4 @@
         background: var(--color-interface-softer) !important;
     }
 }
-// ====================== END BASE STYLE ======================
+// ====================== END BASE STYLE ======================

RockWeb/Styles/styles-v2/rock-components/_content-section.scss

@@ -329,7 +329,11 @@
     height: 100%;
     flex: 0 0 20%;
     position: sticky;
-    top: 0;
+    top: calc(var(--spacing-medium) + 80px); // offset from top to account for fixed header
+}
+
+.full-work-surface .contentsection-container > .contentsection-nav {
+    top: 0; // remove offset from top when in full worksurface mode
 }
 
 .contentsection-list {
@@ -346,12 +350,18 @@
     flex-direction: row-reverse;
 }
 
-@media (max-width: 767px) {
+@media (max-width: $screen-small) {
     .contentsection-container .contentsection-nav {
         display: none;
     }
 }
 
+@media (max-width: $screen-medium) {
+    .contentsection-container .contentsection-nav {
+        top: var(--spacing-medium);
+    }
+}
+
 // ======================== END CONTENT SECTION CONTAINER ========================
 
 // ======================= MOBILE ADJUSTMENTS =======================

RockWeb/Themes/RockNextGen/Styles/theme.css

@@ -10710,11 +10710,21 @@ a.rock-bookmark {
 }
 
 .ace-tm .ace_gutter-active-line, .ace-github .ace_gutter-active-line {
-  background: var(--color-interface-soft) !important;
+  background: var(--color-info-tint) !important;
+  color: var(--color-interface-strong) !important;
 }
 
 .ace-tm .ace_marker-layer .ace_active-line, .ace-github .ace_marker-layer .ace_active-line {
-  background-color: var(--color-interface-softer) !important;
+  background: var(--color-info-soft) !important;
+}
+
+.ace_selected-word {
+  background: var(--color-info-soft) !important;
+  border: 1px solid var(--color-info-soft) !important;
+}
+
+.ace_bracket {
+  border: 1px solid var(--color-info-strong) !important;
 }
 
 .ace_scroller {
@@ -10724,6 +10734,10 @@ a.rock-bookmark {
 .ace_line {
   color: var(--color-interface-strongest);
 }
+.ace_line .ace_string,
+.ace_line .ace_text {
+  color: var(--color-danger-strong) !important;
+}
 
 .ace_editor .ace_marker-layer .ace_selection {
   background: rgba(0, 120, 215, 0.4);
@@ -19069,6 +19083,10 @@ iframe.file-browser {
   height: 100%;
   flex: 0 0 20%;
   position: sticky;
+  top: calc(var(--spacing-medium) + 80px);
+}
+
+.full-work-surface .contentsection-container > .contentsection-nav {
   top: 0;
 }
 
@@ -19086,11 +19104,16 @@ iframe.file-browser {
   flex-direction: row-reverse;
 }
 
-@media (max-width: 767px) {
+@media (max-width: 768px) {
   .contentsection-container .contentsection-nav {
     display: none;
   }
 }
+@media (max-width: 992px) {
+  .contentsection-container .contentsection-nav {
+    top: var(--spacing-medium);
+  }
+}
 @media (max-width: 480px) {
   .contentsection-body {
     padding: var(--spacing-medium);
@@ -33427,11 +33450,11 @@ body.navbar-side-open {
   font-size: 24px;
   font-weight: var(--font-weight-semibold);
   line-height: 1;
-  color: var(--color-interface-softer);
+  color: var(--base-interface-softer);
 }
 .navbar-static-side .navbar-side .nav-item-top .item-title:after {
-  content: "\f054";
-  font-family: FontAwesome;
+  content: "\ea61";
+  font-family: tabler-icons;
   font-size: 12px;
   font-weight: 900;
   margin-left: 12px;