# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1353945707 -3600
# Node ID 4507168941a4f7b02731970540e55d49d5250686
# Parent  07c9aa7de7658c9296d00f6b372babdfab0b9d0b# Parent  9f809996c613ba183b5ec116628ad4ccc7029459
Merge with 9f809996c613ba183b5ec116628ad4ccc7029459

diff -r 07c9aa7de765 -r 4507168941a4 src/hp/static/hp/css/common.css
--- a/src/hp/static/hp/css/common.css	Mon Nov 26 17:01:05 2012 +0100
+++ b/src/hp/static/hp/css/common.css	Mon Nov 26 17:01:47 2012 +0100
@@ -2,6 +2,10 @@
     font-family: OpenSans; background: url(../img/main-bg.png) repeat-x #f5f5f5;
 }
 
+input, textarea {
+    font-family: OpenSans;
+}
+
 .container {
     margin: 0 auto; width: 980px;
 }
@@ -15,7 +19,7 @@
 }
 
 h1 {
-    font-size: 22px; line-height: 40px;
+    font-size: 22px; line-height: 40px; float: left;
 }
 
 h1, h1 a {
@@ -31,6 +35,20 @@
     margin: 8px 0 5px; padding: 0 5px 5px; border-bottom: 1px solid #666;
 }
 
+.header form {
+    float: right; position: relative; margin: 8px 0;
+}
+
+.header input[type=search] {
+    width: 240px; line-height: 16px; font-size: 13px; border: 1px solid #CCCCCC; border-radius: 3px;
+    padding: 2px; margin: 0;
+}
+
+.header input[type=submit] {
+    position: absolute; top: 0; right: 0; border: none; margin: 0; padding: 0; text-indent: -9999px;
+    background: url(../img/search.png) transparent no-repeat center; width: 20px; height: 20px;
+}
+
 .clearer {
     clear:both;
 }
diff -r 07c9aa7de765 -r 4507168941a4 src/hp/static/hp/img/search.png
Binary file src/hp/static/hp/img/search.png has changed
diff -r 07c9aa7de765 -r 4507168941a4 src/hp/templates/hp/base.html
--- a/src/hp/templates/hp/base.html	Mon Nov 26 17:01:05 2012 +0100
+++ b/src/hp/templates/hp/base.html	Mon Nov 26 17:01:47 2012 +0100
@@ -32,6 +32,10 @@
           <!--  HEADER  -->
             <div class="header row">
                 <h1><a href="{% url home %}" title="{% trans 'homepage' %}">{% trans 'Hyper<b>plateau</b>' %}</a></h1>
+                <form action="{% url home %}">
+                    <input type="search" name="search" placeholder="{% trans 'Search videos' %}"/>
+                    <input type="submit" value="{% trans 'Search' %}" />
+                </form>
             </div>
         {% block body %}