Some tweaks for search form on search page.

mozilla · Mar 25, 2013 · ce2a717 · ce2a717
1 parent 5de3c93
commit ce2a717
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 22 deletions.
diff --git a/apps/questions/templates/questions/includes/aaq_macros-new.html b/apps/questions/templates/questions/includes/aaq_macros-new.html
@@ -94,7 +94,7 @@ <h2>{{ _('Try one of these articles:') }}</h2>
 {%- endmacro %}
 
 {% macro aaq_search_form(product, category, settings, host, request) -%}
-  <form id="ask-search-form" class="search-form cf" action="{% if settings.SESSION_COOKIE_SECURE %}https://{{ host }}{{ url('questions.aaq_step4', product_key=product.key, category_key=category.key) }}{% endif %}#summarize-question" method="get">
+  <form id="ask-search-form" class="simple-search-form cf" action="{% if settings.SESSION_COOKIE_SECURE %}https://{{ host }}{{ url('questions.aaq_step4', product_key=product.key, category_key=category.key) }}{% endif %}#summarize-question" method="get">
     <input type="text" class="searchbox" name="search" value="{{ request.GET.search }}" required="required" maxlength="160" placeholder="{{ _('Summarize your question in a sentence') }}" />
     <span data-type="submit" class="btn btn-important big">{{ _('Ask this') }}</span>
   </form>

diff --git a/apps/search/templates/search/includes/macros.html b/apps/search/templates/search/includes/macros.html
@@ -3,7 +3,7 @@
 {% macro basic_search_form(primary=False) -%}
   {# Must be imported with context #}
   <div {% if primary %}id="basic-search"{% endif %} class="search-refine">
-    <form class="search-form cf" role="search" method="get" action="search">
+    <form class="simple-search-form cf" role="search" method="get" action="search">
       <input type="hidden" name="esab" value="{% if waffle.flag('search-ab') %}a{% else %}b{% endif %}">
       {% for name, field in search_form.fields.items() if not name in ('q',) %}
         {% set list = request.GET.getlist(name) %}

diff --git a/media/less/main.less b/media/less/main.less
@@ -693,14 +693,6 @@ input[type=button],
   }
 }
 
-.search-form {
-  background: url('../img/grain.png') #eff2f4;
-  border: 1px solid #b9c9d1;
-  .border-radius(6px);
-  display: block;
-  padding: 12px;
-}
-
 .sidebar-nav {
   font-family: @OpenSans;
   font-size: 13px;
@@ -1233,7 +1225,7 @@ input[type=button],
     top: 6px;
     width: 17px;
   }
-  
+
   .searchbox {
     .linear-gradient-top(#8d969e, #8d969e, 0%, #a8b0b7, 100%, url('../img/grain.png'));
     border: 0;
@@ -1243,19 +1235,19 @@ input[type=button],
     font-size: 14px;
     height: 18px;
     padding: 6px 42px 6px 20px; 
-  
+
     &:focus {
       outline: none;
-  
-      &::-webkit-input-placeholder {
+
+      &:-webkit-input-placeholder {
         color: rgba(255, 255, 255, 0);
       }
     }
-  
-    &::-webkit-input-placeholder {
+
+    &:-webkit-input-placeholder {
       color: #fff;
     }
-  
+
     &:-moz-placeholder {
       color: #fff;
     }
@@ -1266,13 +1258,13 @@ input[type=button],
   #support-search {
     float: left;
   }
-  
+
   .simple-search-form {
     .submit-button {
       left: 12px;
       right: auto;
     }
-    
+
     .searchbox {
       padding: 6px 20px 6px 42px;
     }
@@ -1283,7 +1275,7 @@ input[type=button],
   display: block;
   float: right;
   margin: 35px 0 0 0;
-  
+
   .searchbox {
     width: 240px;
   }

diff --git a/media/less/search.less b/media/less/search.less
@@ -123,8 +123,13 @@
     margin-top: 0;
   }
 
-  .search-form {
+  .simple-search-form {
     margin-bottom: 40px;
+    background: url('../img/grain.png') #eff2f4;
+    border: 1px solid #b9c9d1;
+    .border-radius(6px);
+    display: block;
+    padding: 12px;
 
     .btn {
       float: right;
@@ -136,7 +141,7 @@
       top: 50%;
       left: 20px;
       margin-top: -15px;
-      width: 606px;
+      width: 585px;
     }
   }