From d8cd45163d9cd6f3a43fa0d5c3b334f284174f09 Mon Sep 17 00:00:00 2001
From: Luke Towers <luke@luketowers.ca>
Date: Fri, 26 Jul 2019 15:05:07 -0600
Subject: [PATCH] Fixed the focus outline for no results on the CodeEditor
 search box. Credit to @ayumihamsaki. Replaces #4483. Fixes #4482.

---
 modules/backend/assets/css/october.css         |  2 +-
 .../codeeditor/assets/css/codeeditor.css       |  4 +++-
 .../codeeditor/assets/less/codeeditor.less     | 18 +++++++++++++++---
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css
index cc2084d48..b8da87413 100644
--- a/modules/backend/assets/css/october.css
+++ b/modules/backend/assets/css/october.css
@@ -653,7 +653,7 @@ body.slim-container .layout .layout-container {padding-left:0 !important;padding
 .flex-layout-item.center {-webkit-align-self:center;-moz-align-self:center;-ms-align-self:center;align-self:center}
 .flex-layout-item.relative {position:relative}
 .flex-layout-item.layout-container {max-width:none}
-.js-focus-visible :focus:not(.focus-ring) {outline:none}
+.js-focus-visible:focus:not(.focus-visible) {outline:none}
 .js-focus-visible .focus-visible {border:.0625rem solid #3578E5;-webkit-box-shadow:0 0 .1875rem .125rem #3578E5;box-shadow:0 0 .1875rem .125rem #3578E5;z-index:1;position:relative}
 body.mainmenu-open {overflow:hidden;position:fixed}
 .mainmenu-tooltip .tooltip-inner {font-size:13px;padding:6px 16px}
diff --git a/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css b/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css
index 46379fba3..14704bb34 100644
--- a/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css
+++ b/modules/backend/formwidgets/codeeditor/assets/css/codeeditor.css
@@ -7,6 +7,8 @@
 .field-codeeditor.size-huge {min-height:250px}
 .field-codeeditor.size-giant {min-height:350px}
 .field-codeeditor .ace_search {font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";font-size:14px;color:#333;z-index:13}
+.field-codeeditor .ace_search .ace_search_form.ace_nomatch {outline:none !important}
+.field-codeeditor .ace_search .ace_search_form.ace_nomatch .ace_search_field {border:.0625rem solid red;-webkit-box-shadow:0 0 .1875rem .125rem red;box-shadow:0 0 .1875rem .125rem red;z-index:1;position:relative}
 .field-codeeditor .editor-code {-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}
 .field-codeeditor .editor-toolbar {position:absolute;top:-30px;right:35px;z-index:10}
 .field-codeeditor .editor-toolbar >ul,
@@ -25,4 +27,4 @@
 .field-codeeditor.editor-fullscreen .editor-toolbar >ul >li >a {color:#666}
 .field-codeeditor.editor-fullscreen .ace_search {z-index:303}
 .field-codeeditor .secondary-tabs .editor-toolbar >ul >li >a {color:#fff}
-#cms-master-tabs .field-codeeditor .editor-toolbar >ul >li >a {color: #919898}
\ No newline at end of file
+#cms-master-tabs .field-codeeditor .editor-toolbar >ul >li >a {color:#919898}
\ No newline at end of file
diff --git a/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less b/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less
index 80e57758e..e217a3a23 100644
--- a/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less
+++ b/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less
@@ -26,6 +26,18 @@
         font-size: 14px;
         color: @text-color;
         z-index: @zindex-form + 3;
+
+        .ace_search_form.ace_nomatch {
+            outline: none !important;
+
+            .ace_search_field {
+                border: .0625rem solid red;
+                -webkit-box-shadow: 0 0 .1875rem .125rem red;
+                box-shadow: 0 0 .1875rem .125rem red;
+                z-index: 1;
+                position: relative;
+            }
+        }
     }
 
     .editor-code {
@@ -122,6 +134,6 @@
 
 }
 
-#cms-master-tabs .field-codeeditor .editor-toolbar > ul  > li  > a { 
-    color: @color_3; 
-} 
\ No newline at end of file
+#cms-master-tabs .field-codeeditor .editor-toolbar > ul  > li  > a {
+    color: @color_3;
+}
\ No newline at end of file