fixed vertical height issue in sidebar, added google custom search

diff --git a/source/_layouts/bootstrap.html b/source/_layouts/bootstrap.html
index c49167114a9adba937827789b2934cb5e19ed09c..f2e93967a344a656bf7a4c2bfdeac9bc4d771166 100644 (file)
--- a/source/_layouts/bootstrap.html
+++ b/source/_layouts/bootstrap.html
@@ -45,12 +45,19 @@ page_title: The Ardour Manual
     <div class="container-fluid">
         <div class="row-fluid">
             <div id="tree">
-                <h1 class="title"><a href="/"><img src="/images/logo.png" alt="The Ardour Manual" /></a></h1>
-                {% tree %}
+                <div id="tree-inner">
+                    <h1 class="title"><a href="/"><img src="/images/logo.png" alt="The Ardour Manual" /></a></h1>
+                    {% tree %}
+                </div>
             </div>
             <div class="span12" id="content">
-                <h1 class="title">{{ page.title }}</h1>
-                {{ content }}
+                <div id="search">
+                    <gcse:search></gcse:search>
+                </div>
+                <div id="content-main">
+                    <h1 class="title">{{ page.title }}</h1>
+                    {{ content }}
+                </div>
             </div>
         </div>
     </div>
@@ -79,6 +86,18 @@ page_title: The Ardour Manual
         }
 
     </script>
+
+    <script>
+        (function() {
+          var cx = '011950134405426689607:2lg2y9xgf3a';
+          var gcse = document.createElement('script'); gcse.type = 'text/javascript';
+          gcse.async = true;
+          gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
+              '//www.google.com/cse/cse.js?cx=' + cx;
+          var s = document.getElementsByTagName('script')[0];
+          s.parentNode.insertBefore(gcse, s);
+        })();
+    </script>
   
     </body>
 </html>

diff --git a/source/css/app.css b/source/css/app.css
index 747ecbe335419431ec2c0b72e5d318c7bd12a6bd..a4f54614adbae221146058866bc293834b93b6de 100644 (file)
--- a/source/css/app.css
+++ b/source/css/app.css
@@ -1,6 +1,5 @@
 #tree {
-    padding: 20px; 
-    padding-bottom: 80px;
+ 
   background-color: #eee;
   height: 100%;
   overflow: scroll;
@@ -11,6 +10,10 @@
   width: 300px;
 }
 
+#tree-inner {
+    padding: 15px 20px 30px 30px;  
+}
+
 #tree h1.title {
   font-size: 28px;
   margin-bottom: 20px;
@@ -47,11 +50,20 @@
 }
 
 
+#search {
+  height: 70px;
+}
+
 #content {
-    padding: 70px 30px 30px 360px;
+    padding: 10px 30px 30px 350px;
     margin-left: 0;
 }
 
+#content-main {
+  padding-top: 10px;
+  padding-left: 10px;
+}
+
 #content p,
 #content li,
 #content dt,
@@ -311,6 +323,13 @@
 
 
 
+#gs_tti0 {
+
+  padding-top: 2px;
+  padding-bottom: 0;
+
+}
+