Merge pull request #4075 from rust-lang/revert-3942-search

Revert "add search"

Author: nellshamrell

pelicanconf.py

@@ -14,7 +14,6 @@
 else:
     THEME = 'themes/rusted'
 
-THEME_STATIC_DIR = THEME + '/static'
 PLUGIN_PATHS = ["plugins"]
 PLUGINS = ['assets', 'neighbors']
 
@@ -48,9 +47,7 @@
 """
 }
 
-SEARCH_HTML_SELECTOR = "article"
-
-PLUGINS = ['webassets', 'search']
+PLUGINS = ['webassets']
 
 MARKDOWN = {
     'extension_configs': {

publishing/Dockerfile

@@ -12,9 +12,6 @@ ENV LC_ALL='en_US.UTF-8'
 RUN ln -s /usr/bin/python3.8 /usr/bin/python
 COPY requirements.txt .
 RUN pip3 install -r requirements.txt
-RUN curl https://files.stork-search.net/releases/v1.5.0/stork-ubuntu-20-04 -o stork \
-    && chmod +x stork \
-    && mv ./stork /usr/bin/stork
 
 # sass/juice
 RUN apt-get install -y curl
@@ -29,7 +26,7 @@ COPY plugins plugins
 COPY themes themes
 COPY pelicanconf.py pelicanconf.py
 
-COPY publishing/*.sh ./
+COPY publishing/*.sh .
 RUN chmod 777 *.sh
 
 CMD ["pelican", "--delete-output-directory", "content"]

requirements.txt

@@ -6,4 +6,3 @@ Markdown==3.3.7
 markupsafe==2.0.1
 pelican==4.7.1
 pelican-webassets==2.0.0
-pelican-search==1.0.1

themes/rusted/static/css/_homepage.scss

@@ -10,5 +10,4 @@
 .subtext {
     margin-left: 50px;
     margin-right: 50px;
-    text-align: center;
 }

themes/rusted/static/css/_layout.scss

@@ -58,28 +58,6 @@ body > footer {
     font-size: 20px;
 }
 
-/**
- * Search
- */
- .search {
-    li.nav-header h2 {
-        border-bottom: 1px solid $grey-colour-light;
-    }
-
-    li {
-        line-height: 1.8;
-    }
-}
-
-.stork-close-button {
-    right: 15px;
-    top: 149px;
-    bottom: unset;
-}
-
-.stork-progress {
-    position: relative;
-}
 
 /**
  * Page content

themes/rusted/static/css/stork-dark.css

@@ -32,8 +32,6 @@
     <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME|striptags }} - Full Atom Feed" />
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="https://files.stork-search.net/basic.css" />
-    <link rel="stylesheet" media="screen and (prefers-color-scheme: dark)" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/stork-dark.css">
     {% assets filters="libsass,cssmin", output="css/web-min.css", "css/main.scss" %}
 
     <link rel="stylesheet" href="/{{ ASSET_URL }}" />

themes/rusted/static/css/stork.css

@@ -27,22 +27,5 @@ <h1 class="pitch">Handpicked Rust updates, <br /> delivered to your inbox.</h1>
       </li>
     </ul>
   </div>
-  <div class ="col-md-12">
-    <ul class="list-unstyled search">
-      <li class="nav-header disabled"><h2>Search</h2></li>
-      <div>
-        <p class="subtext">Generic or unspecific search terms may result in unhelpful results - there is currently no exact matching on phrases.</p>
-        <input data-stork="sitesearch" class="form-control"/>
-        <div data-stork="sitesearch-output"></div>
-
-        <script src="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/js/stork.js"></script>
-        <script>
-          stork.initialize("{{ SITEURL }}/{{ THEME_STATIC_DIR }}/js/stork.wasm")
-          stork.downloadIndex("sitesearch", "{{ SITEURL }}/search-index.st")
-          stork.attach("sitesearch")
-        </script>
-      </div>
-    </ul>
-  </div>
 </div>
 {% endblock content %}