Merge pull request #1545 from roots/remove-custom-search-template

Use Sass to style search form, remove search template
roots · Oct 10, 2015 · 2fa9cd6 · 2fa9cd6
2 parents 2be91c1 + 9a14571
commit 2fa9cd6
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 24 deletions.
diff --git a/assets/styles/components/_forms.scss b/assets/styles/components/_forms.scss
@@ -0,0 +1,15 @@
+// Search form
+.search-form {
+  @extend .form-inline;
+}
+.search-form label {
+  font-weight: normal;
+  @extend .form-group;
+}
+.search-form .search-field {
+  @extend .form-control;
+}
+.search-form .search-submit {
+  @extend .btn;
+  @extend .btn-default;
+}
diff --git a/functions.php b/functions.php
@@ -10,7 +10,6 @@
  * @link https://github.com/roots/sage/pull/1042
  */
 $sage_includes = [
-  'lib/utils.php',                 // Utility functions
   'lib/init.php',                  // Initial theme setup and constants
   'lib/wrapper.php',               // Theme wrapper class
   'lib/config.php',                // Configuration

diff --git a/lib/init.php b/lib/init.php
@@ -34,7 +34,7 @@ function setup() {
 
   // Add HTML5 markup for captions
   // http://codex.wordpress.org/Function_Reference/add_theme_support#HTML5
-  add_theme_support('html5', ['caption', 'comment-form', 'comment-list', 'gallery']);
+  add_theme_support('html5', ['caption', 'comment-form', 'comment-list', 'gallery', 'search-form']);
 
   // Tell the TinyMCE editor to use a custom stylesheet
   add_editor_style(Assets\asset_path('styles/editor-style.css'));

diff --git a/lib/utils.php b/lib/utils.php
diff --git a/templates/searchform.php b/templates/searchform.php