FIX: Remove outlet causing search icon injection elsewhere (#52)

discourse · Mar 6, 2024 · 0e267b6 · 0e267b6
1 parent c99eeca
commit 0e267b6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 28 deletions.
diff --git a/common/common.scss b/common/common.scss
@@ -41,6 +41,7 @@ $max-width: 600px;
 
   .search-menu {
     display: flex;
+    position: relative;
 
     .search-menu-container {
       width: 100%;
@@ -93,6 +94,7 @@ $max-width: 600px;
     color: var(--primary-medium);
     height: 100%;
     padding-right: 0.25em;
+    position: absolute;
     .discourse-no-touch & {
       &:hover {
         background: transparent;
@@ -102,6 +104,12 @@ $max-width: 600px;
         }
       }
     }
+    + .search-menu-container .search-input {
+      padding-left: 1.75em;
+    }
+    + .search-menu-container .search-input .search-context {
+      margin-left: 4px;
+    }
   }
   .btn.search-icon.has-search-button-text {
     order: 2;

diff --git a/javascripts/discourse/components/search-banner.hbs b/javascripts/discourse/components/search-banner.hbs
@@ -12,6 +12,9 @@
         <PluginOutlet @name="search-banner-below-headline" />
         <p>{{html-safe (theme-i18n "search_banner.subhead")}}</p>
         <div class="search-menu">
+          {{#unless this.buttonText}}
+            <SearchIcon />
+          {{/unless}}
           <SearchMenu />
           {{#if this.buttonText}}
             <SearchIcon

diff --git a/javascripts/discourse/connectors/search-menu-before-term-input/search-icon-before-term.gjs b/javascripts/discourse/connectors/search-menu-before-term-input/search-icon-before-term.gjs
diff --git a/spec/system/viewing_search_banner_spec.rb b/spec/system/viewing_search_banner_spec.rb
@@ -24,19 +24,6 @@
     expect(page).to have_css("#main-outlet .custom-search-banner")
   end
 
-  it "should hide the search icon when searching within a topic" do
-    theme.update_setting(:show_on, "all")
-    theme.save!
-
-    topic_page.visit_topic(topic)
-    expect(topic_page).to have_css(".custom-search-banner")
-    topic_page.find(".custom-search-banner input#search-term").fill_in(with: "test")
-    topic_page.find(".custom-search-banner .results li:nth-child(2) a").click
-
-    expect(topic_page).to have_css(".custom-search-banner .search-context")
-    expect(topic_page).to_not have_css(".custom-search-banner .search-icon")
-  end
-
   it "should display the search icon when searching within a topic when search button text is present" do
     theme.update_setting(:show_on, "all")
     theme.update_translation("search_banner.search_button_text", "Foo")