]> Shamusworld >> Repos - ardour-manual/commitdiff
Refining the CSS, changed the search to Duckduckgo, search filed in the sidebar,...
authorEd Ward <edwsaintesprit@hotmail.com>
Tue, 28 Mar 2017 09:13:12 +0000 (11:13 +0200)
committerEd Ward <edwsaintesprit@hotmail.com>
Tue, 28 Mar 2017 09:13:12 +0000 (11:13 +0200)
include/the-region-menu.html
page-template.txt
source/css/app.css
source/css/junge-regular-webfont.ttf [new file with mode: 0644]
source/css/junge-regular-webfont.woff [new file with mode: 0644]
source/css/junge-regular-webfont.woff2 [new file with mode: 0644]

index 39c17d3993f07ea916b6aa5bc1df342235aeac68..430ed274414f5e106ba10770365622a09066add0 100644 (file)
@@ -85,4 +85,3 @@
 
        <tr><th>Remove</th><td>Deletes the region from the edit (no file is harmed in the process, and the region stays in the Editor for later use)</td></tr>
 </table>
-
index f9dc51c111bd00b939fef88b02619cfb440dc636..ad434251c573fec85918734921b2e8e924e3b5ed 100644 (file)
@@ -1,38 +1,56 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!doctype html>
+<html lang="en">
 
 <head>
        <title>{{page.page_title}}</title>
-       <meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
+       <meta http-equiv="Content-type" content="text/html; charset=UTF-8">
+       <meta name="description" content="The Ardour Manual">
+       <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-       <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-       <link href="{{page.bootstrap_path}}/css/bootstrap.min.css" rel="stylesheet" />
-       <link href="{{page.bootstrap_path}}/css/bootstrap-responsive.min.css" rel="stylesheet" />
-
-       <link href="/css/app.css" rel="stylesheet" />
+       <link href="{{page.bootstrap_path}}/css/bootstrap.min.css" rel="stylesheet">
+       <link href="{{page.bootstrap_path}}/css/bootstrap-responsive.min.css" rel="stylesheet">
+       <link href="/css/app.css" rel="stylesheet">
 {% if page.style %}
-       <link href="/css/{{page.style}}.css" rel="stylesheet" />
+       <link href="/css/{{page.style}}.css" rel="stylesheet">
 {% endif %}
-
-       <link href='http://fonts.googleapis.com/css?family=Junge' rel='stylesheet' type='text/css' />
 </head>
 
 <body>
 <div class="container-fluid"><div class="row-fluid">
        <div id="tree"><div id="tree-inner">
                <h1 class="title"><a href="/"><img src="/images/logo.png" alt="The Ardour Manual" /></a></h1>
+
+    <form id="custom-search-form" class="form-search form-horizontal pull-right" method="post" action="https://duckduckgo.com">
+      <div class="input-append">
+          <input type="text" class="search-query" name="q" placeholder="Search &hellip;">
+          <button type="submit" class="btn"><i class="icon-search"></i></button>
+      </div>
+                       <input type="hidden" name="sites" value="manual.ardour.org"><!-- domain -->
+                       <input type="hidden" name="kh" value="1"> <!--HTTPS on/off -->
+                       <input type="hidden" name="kl" value="wt-wt"> <!--region wt-wt = no region/worldwide -->
+                       <input type="hidden" name="kg" value="p"> <!--get [g] vs post [p] -->
+                       <input type="hidden" name="k7" value="w"> <!-- background colour -->
+                       <input type="hidden" name="kj" value="#212a30"> <!-- results page header colour -->
+                       <input type="hidden" name="kx" value="#59acd4"> <!-- URLs colour -->
+                       <input type="hidden" name="k1" value="-1"> <!-- adverts on/off -->
+                       <input type="hidden" name="k9" value="#59acd4"> <!-- links colour -->
+                       <input type="hidden" name="kaa" value="#2d586c"> <!-- visited links colour -->
+                       <input type="hidden" name="kae" value="#cc0000"> <!-- theme [changes result titles] colour -->
+                       <input type="hidden" name="ka" value="junge"> <!-- link font -->
+                       <input type="hidden" name="kt" value="junge"> <!-- text font -->
+    </form>
+
+
 {% tree %}
        </div></div>
        <div class="span12" id="content">
-               <div id="search">
-                       <gcse:search></gcse:search>
-               </div>
     {% breadcrumbs %}
                <div id="content-main">
                <h1 class="title">{{ page.title }}</h1>
+
 {{ content }}
 {% prevnext %}
+
                </div>
        </div>
 </div></div>
@@ -48,19 +66,5 @@ if ( (isA(/Mac/) || isAbout(/OS X/)) && (!isAbout(/Linux/)) ) {
 }
 </script>
 
-<!-- Google search bar == failure  -->
-<script type="text/javascript">
-(function()
-{
-       var cx = '011950134405426689607:2lg2y9xgf3a';
-  var gcse = document.createElement('script');
-  gcse.type = 'text/javascript';
-  gcse.async = true;
-  gcse.src = 'https://cse.google.com/cse.js?cx=' + cx;
-  var s = document.getElementsByTagName('script')[0];
-  s.parentNode.insertBefore(gcse, s);
-})();
-</script>
-
 </body>
 </html>
index 84cefd0dd3d707e7deec630eb38764c8eb6aeed9..5fcd3300489751d0f4bd695b9aac1ed22f363c76 100644 (file)
@@ -1,5 +1,14 @@
+@font-face {
+    font-family: 'junge-regular';
+    src: url('junge-regular-webfont.woff2') format('woff2'),
+         url('junge-regular-webfont.woff') format('woff'),
+         url('junge-regular-webfont.ttf')  format('truetype');
+    font-weight: normal;
+    font-style: normal;
+}
+
 body {
-  font-family: Junge;
+  font-family: 'junge-regular';
   font-size: 16px;
   line-height: 2ex;
 }
@@ -85,7 +94,9 @@ body {
 #content p,
 #content li,
 #content dt,
-#content dd {
+#content dd,
+#content td,
+#content th{
   line-height: 2em;
 }
 
@@ -170,12 +181,13 @@ body {
 #content table.dl th {
   /* dl class (definition list) is for 2-columns tables that describe properties:
   maximmizes the width of the 2nd (description) column */
-  min-width: 20%;
   vertical-align: top;
+  min-width: 20%;
   white-space:nowrap
 }
 
 #content table.dl td {
+  vertical-align: top;
   width: 100%;
 }
 
@@ -526,25 +538,6 @@ samp:after {
 .mac .mod14n:before { content: "Cmd Opt";}
 .mac .mod23n:before { content: "Ctrl Shift";}
 
-/* google search : reset style for the search field */
-#search table,
-#search input,
-#search tr,
-#search td,
-#search th,
-#search thead,
-#search tbody{
-  margin: inherit;
-  padding: inherit;
-  color: inherit;
-  border: inherit;
-  background: inherit;
-  line-height: inherit;
-  font-size: inherit;
-  font-weight: inherit;
-  box-shadow: inherit;
-}
-
 @media (max-width: 800px) {
   #tree {
     position: relative;
@@ -559,12 +552,18 @@ samp:after {
 }
 
 /* for the TOC */
+#chapter,
+#subchapter,
+#section,
+#subsection {
+  line-height:1.5em;
+}
 #chapter { padding-top: 1em; padding-left: 1em; }
 #subchapter { padding-left: 4em; }
 #section { padding-left: 6em; }
 #subsection { padding-left: 8em; }
 
 /* for images sliced in divs, as in http://manual.ardour.org/ardours-interface/about/ */
-.container { position:relative; border: none;}
-.hoverimg { position: absolute; border: none;  }
+.container { position: relative; border: none; }
+.hoverimg { position: absolute; border: none; }
 .hoverimg:hover{ z-index:100; box-shadow: 0 0 .2em .2em lightgreen; }
diff --git a/source/css/junge-regular-webfont.ttf b/source/css/junge-regular-webfont.ttf
new file mode 100644 (file)
index 0000000..4e381e9
Binary files /dev/null and b/source/css/junge-regular-webfont.ttf differ
diff --git a/source/css/junge-regular-webfont.woff b/source/css/junge-regular-webfont.woff
new file mode 100644 (file)
index 0000000..4a74925
Binary files /dev/null and b/source/css/junge-regular-webfont.woff differ
diff --git a/source/css/junge-regular-webfont.woff2 b/source/css/junge-regular-webfont.woff2
new file mode 100644 (file)
index 0000000..331d75e
Binary files /dev/null and b/source/css/junge-regular-webfont.woff2 differ