Added fixups/new classes to the main CSS, cleanup of Mini-Timeline.

diff --git a/include/about-ardours-interface.html b/include/about-ardours-interface.html
index e6431261268cd2d1c660bd63c438e49eeba344fa..52add950b4494ce705e7a9f7055fda7062b88522 100644 (file)
--- a/include/about-ardours-interface.html
+++ b/include/about-ardours-interface.html
@@ -1,6 +1,3 @@
----
-title: Ardour's Interface
----
 
 <p>
   In Ardour, work is done in two main windows: the <dfn>Editor</dfn> and the
@@ -131,8 +128,3 @@ title: Ardour's Interface
   To learn more about the process of mixing, see <a href="/mixing/">Mixing<a>.
 </p>
 
-<<<<<<< HEAD
-
-{% children %}
-=======
->>>>>>> Initial cleanup of manual content.

diff --git a/include/mini-timeline.html b/include/mini-timeline.html
index 26e6e12c3f6f0956f34f6a82f7a312282ec868dc..6227b4a986921feea1560795ea364fcedd7e2f5a 100644 (file)
--- a/include/mini-timeline.html
+++ b/include/mini-timeline.html
@@ -1,26 +1,36 @@
+
+<figure class=center>
 <img src="/images/mini-timeline.png" alt="The Mini-Timeline">
+<figcaption class=center>The Mini-Timeline.</figcaption>
+</figure>
 
 <p>
-  The mini-timeline allows, as the <a href="/ardours-interface/the-summary/">Summary</a>,
-  to navigate a session. It's main advantage though is that it stays visible even in Mixer mode.
+  The mini-timeline allows, as the
+  <a href="/ardours-interface/the-summary/">Summary</a> does, navigation of a
+  session. Its main advantage, though, is that it stays visible even when in
+  Mixer mode.
 </p>
 
 <p>
-  The range of time covered by the mini-timeline is set by <kbd class="mouse">Right</kbd> clicking the
-  timeline, and chossing from 30 seconds up to 20 minutes.
+  The range of time covered by the mini-timeline is set by <kbd
+  class="mouse">Right</kbd> clicking the timeline, and choosing a time span
+  from 30 seconds up to 20 minutes.
 </p>
 
 <p>
-  The mini-timeline also shows all the markers (both start/end and user set ones).
-  Clicking a marker jumps to that point on the timeline, allowing for quick access
-  to key timings in the session.
+  The mini-timeline also shows all markers (start, end and any user
+  defined ones). Clicking a marker jumps to that point on the timeline,
+  allowing for quick access to key timings in the session.
 </p>
+
 <p>
   While hovering with the mouse over the mini-timeline,
 </p>
+
 <ul>
-  <li><kbd class="mouse">left</kbd> clicking jumps the playhead to the time under the mouse cursor</li>
-  <li>using the <kbd class="mouse">scroll wheel</kbd> scrolls the playhead inside the session</li>
-  <li>using the <kbd class="mod1">&nbsp;</kbd><kbd class="mouse">scroll wheel</kbd> scrolls more finely inside the session</li>
-  <li>using the <kbd class="mod1">&nbsp;</kbd><kbd class="mod2">&nbsp;</kbd><kbd class="mouse">scroll wheel</kbd> scrolls even more finely inside the session.</li>
+  <li><kbd class="mouse">left</kbd> clicking moves the playhead to the time under the mouse cursor</li>
+  <li>using the <kbd class="mouse">scroll wheel</kbd> scrolls the playhead back and forth inside the session</li>
+  <li>using the <kbd class="mod1n"></kbd><kbd class="mouse">scroll wheel</kbd> scrolls more finely inside the session</li>
+  <li>using the <kbd class="mod12n"></kbd><kbd class="mouse">scroll wheel</kbd> scrolls even more finely inside the session.</li>
 </ul>
+

diff --git a/include/other-toolbar-items.html b/include/other-toolbar-items.html
index 934e08647e083a531e5b450c2c8fd8a693294134..1a0ebc1a3379e814b78b08928cd07b7743a1e0e9 100644 (file)
--- a/include/other-toolbar-items.html
+++ b/include/other-toolbar-items.html
@@ -68,3 +68,4 @@
   The buttons in between the Mode Selector and the global meter are script buttons,
   which are user-definable buttons to attach any session <a href="/lua-scripting/">lua-script</a> to.
 </p>
+

diff --git a/include/plugin-manager.html b/include/plugin-manager.html
index f0186846b48cf4bab6b4fd39e74927f1e9c0d772..602895ea9ac92ca2e328be20d8fba131a955a267 100644 (file)
--- a/include/plugin-manager.html
+++ b/include/plugin-manager.html
@@ -15,7 +15,10 @@
   connections. The plugins can be sorted by clicking on a column header.
 </p>
 
+<figure class=center>
 <img src="/images/plugin-manager.png" alt="Plugin Manager window"/>
+<figcaption class=center>The Plugin Manager window.</figcaption>
+</figure>
 
 <h2>Plugin Display Status</h2>
 

diff --git a/include/selection-and-punch-clocks.html b/include/selection-and-punch-clocks.html
index cf5387796daa27483022a14d331c842363e790d9..63731bc6703c8d7e6b6827d83c35500055e4d324 100644 (file)
--- a/include/selection-and-punch-clocks.html
+++ b/include/selection-and-punch-clocks.html
@@ -70,3 +70,4 @@
 <p>
   See <a href="/working-with-tracks/track-types/">Track Modes</a> for more information.
 </p>
+

diff --git a/include/transport-bar.html b/include/transport-bar.html
index c12426c1285c3b7a8e5637b25252f3261e5de059..9893bc88e050bd1241738177b83a72e58f97bed5 100644 (file)
--- a/include/transport-bar.html
+++ b/include/transport-bar.html
@@ -72,3 +72,4 @@
 <p>
   Go to the <kdb class="menu">Transport</kbd> and <kdb class="menu">Transport &gt; Playhead</kbd> to find more.
 </p>
+

diff --git a/master-doc.txt b/master-doc.txt
index 0df1f59ed9effd1894b3cf2ebc4b3eeff060f201..184d61306bfd9f1ceebbc713b31563160a7fbaf8 100644 (file)
--- a/master-doc.txt
+++ b/master-doc.txt
@@ -578,7 +578,6 @@ part: chapter
 ---
 title: Transport Clocks
 include: transport-clocks.html
-#uri: ardours-interface/transport-clocks
 uri: ardours-interface/using-ardour-clock-displays
 part: chapter
 ---
@@ -633,7 +632,6 @@ part: subchapter
 ---
 title: Edit Point Control
 include: edit-point-control.html
-#uri: ardours-interface/the-edit-point-control
 uri: editing-and-arranging/edit-point
 part: subchapter
 ---
@@ -778,7 +776,6 @@ part: chapter
 ---
 title: New/Open Session Dialog
 include: newopen-session-dialog.html
-#uri: working-with-sessions/new-session-dialog
 uri: working-with-sessions/the-new-session-dialog
 part: subchapter
 ---
@@ -1446,7 +1443,6 @@ part: subchapter
 ---
 title: Note Selection
 include: note-selection.html
-#uri: working-with-midi/note-selection
 uri: editing-and-arranging/edit-midi/note-selection
 part: subchapter
 ---
@@ -2065,7 +2061,6 @@ part: chapter
 ---
 title: Scripting
 part: part
-include: lua-scripting-in-ardour.html
 ---
 
 ---

diff --git a/source/css/app.css b/source/css/app.css
index 0802831ecd928d12b7f472a96184454a0494d270..d520d305bff6a7e50b16e9ca08d0e3bd09d03106 100644 (file)
--- a/source/css/app.css
+++ b/source/css/app.css
@@ -186,7 +186,15 @@
 
 #content figcaption {
        display: table-caption;
-       caption-side: bottom ;
+       caption-side: bottom;
+       font-style: italic;
+}
+
+#content figcaption.center {
+       display: table-caption;
+       text-align: center;
+       caption-side: bottom;
+       font-style: italic;
 }
 
 #content figcaption.titleover {
@@ -195,14 +203,19 @@
 
 #content figure.right {
     margin: 0 0 1em 1em;
-    float:right;
-    clear:right;
+    float: right;
+    clear: right;
 }
 
 #content figure.left {
     margin: 0 1em 1em 0;
-    float:left;
-    clear:left;
+    float: left;
+    clear: left;
+}
+
+#content figure.center {
+    margin: 1em auto 1em auto;
+    clear: both;
 }
 
 .multicol2 {
@@ -480,6 +493,12 @@ samp:after {
     clear:left;
 }
 
+#content img.center {
+    display: block;
+    margin:1em auto 1em auto;
+       clear: both;
+}
+
 #content p.center {
        text-align:center;
 }
@@ -522,7 +541,7 @@ samp:after {
 }
 
 
-
+/* Keyboard modifiers */
 
 .mod1:before {
     content: "Ctrl ";
@@ -552,6 +571,36 @@ samp:after {
     content: "Keypad ";
 }
 
+/* Variants *without* space after them (yes, these are needed!) */
+
+.mod1n:before {
+    content: "Ctrl";
+}
+.mod2n:before {
+    content: "Alt";
+}
+.mod3n:before {
+    content: "Shift";
+}
+.mod4n:before {
+    content: "Win";
+}
+.mod12n:before {
+    content: "Ctrl Alt";
+}
+.mod13n:before {
+    content: "Ctrl Shift";
+}
+.mod14n:before {
+    content: "Ctrl Win";
+}
+.mod23n:before {
+    content: "Alt Shift";
+}
+
+
+/* Automagic translation for Mac based display */
+
 .mac .mod1:before {
     content: "Cmd ";
 }
@@ -577,6 +626,34 @@ samp:after {
     content: "Ctrl Shift ";
 }
 
+/* No space variants (Mac based) */
+
+.mac .mod1n:before {
+    content: "Cmd";
+}
+.mac .mod2n:before {
+    content: "Ctrl";
+}
+.mac .mod3n:before {
+    content: "Shift";
+}
+.mac .mod4n:before {
+    content: "Opt";
+}
+.mac .mod12n:before {
+    content: "Cmd Ctrl";
+}
+.mac .mod13n:before {
+    content: "Cmd Shift";
+}
+.mac .mod14n:before {
+    content: "Cmd Opt";
+}
+.mac .mod23n:before {
+    content: "Ctrl Shift";
+}
+
+
 #gs_tti0 {
 
   padding-top: 2px;