From a28590c5615e26a5ea3d784712bc303db547c064 Mon Sep 17 00:00:00 2001 From: Ed Ward Date: Tue, 18 Apr 2017 10:12:52 +0200 Subject: [PATCH] Update to bootstrap 3.3, minor tweaks --- build.py | 10 +- include/navigating-the-editor.html | 6 +- include/tempo-and-meter.html | 3 +- page-template.txt | 21 +- .../css/bootstrap-responsive.css | 1092 --- .../css/bootstrap-responsive.min.css | 9 - source/bootstrap-2.2.2/css/bootstrap.css | 6039 --------------- source/bootstrap-2.2.2/css/bootstrap.min.css | 9 - .../img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes .../img/glyphicons-halflings.png | Bin 12799 -> 0 bytes source/bootstrap-2.2.2/js/bootstrap.js | 2159 ------ source/bootstrap-2.2.2/js/bootstrap.min.js | 6 - .../bootstrap-3.3.7/css/bootstrap-theme.css | 587 ++ .../css/bootstrap-theme.css.map | 1 + .../css/bootstrap-theme.min.css | 6 + .../css/bootstrap-theme.min.css.map | 1 + source/bootstrap-3.3.7/css/bootstrap.css | 6757 +++++++++++++++++ source/bootstrap-3.3.7/css/bootstrap.css.map | 1 + source/bootstrap-3.3.7/css/bootstrap.min.css | 6 + .../bootstrap-3.3.7/css/bootstrap.min.css.map | 1 + .../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20127 bytes .../fonts/glyphicons-halflings-regular.svg | 288 + .../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 45404 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23424 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes source/bootstrap-3.3.7/js/bootstrap.js | 2377 ++++++ source/bootstrap-3.3.7/js/bootstrap.min.js | 7 + source/bootstrap-3.3.7/js/npm.js | 13 + 28 files changed, 10069 insertions(+), 9330 deletions(-) delete mode 100644 source/bootstrap-2.2.2/css/bootstrap-responsive.css delete mode 100644 source/bootstrap-2.2.2/css/bootstrap-responsive.min.css delete mode 100644 source/bootstrap-2.2.2/css/bootstrap.css delete mode 100644 source/bootstrap-2.2.2/css/bootstrap.min.css delete mode 100644 source/bootstrap-2.2.2/img/glyphicons-halflings-white.png delete mode 100644 source/bootstrap-2.2.2/img/glyphicons-halflings.png delete mode 100644 source/bootstrap-2.2.2/js/bootstrap.js delete mode 100644 source/bootstrap-2.2.2/js/bootstrap.min.js create mode 100644 source/bootstrap-3.3.7/css/bootstrap-theme.css create mode 100644 source/bootstrap-3.3.7/css/bootstrap-theme.css.map create mode 100644 source/bootstrap-3.3.7/css/bootstrap-theme.min.css create mode 100644 source/bootstrap-3.3.7/css/bootstrap-theme.min.css.map create mode 100644 source/bootstrap-3.3.7/css/bootstrap.css create mode 100644 source/bootstrap-3.3.7/css/bootstrap.css.map create mode 100644 source/bootstrap-3.3.7/css/bootstrap.min.css create mode 100644 source/bootstrap-3.3.7/css/bootstrap.min.css.map create mode 100644 source/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.eot create mode 100644 source/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.svg create mode 100644 source/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.ttf create mode 100644 source/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.woff create mode 100644 source/bootstrap-3.3.7/fonts/glyphicons-halflings-regular.woff2 create mode 100644 source/bootstrap-3.3.7/js/bootstrap.js create mode 100644 source/bootstrap-3.3.7/js/bootstrap.min.js create mode 100644 source/bootstrap-3.3.7/js/npm.js diff --git a/build.py b/build.py index f422df1..5d0b0bb 100755 --- a/build.py +++ b/build.py @@ -9,7 +9,7 @@ # Remnants (could go into the master document as the first header) -#bootstrap_path: /bootstrap-2.2.2 +#bootstrap_path: /bootstrap-3.3.7 #page_title: The Ardour Manual import os @@ -207,15 +207,15 @@ def GetParent(fs, pos): # def GetBreadCrumbs(fs, pos): # The > is for Bootstrap pre-3.0 - breadcrumbs = ' >
  • '+ fs[pos]['title'] + '
  • ' + breadcrumbs = '
  • '+ fs[pos]['title'] + '
  • ' while pos >= 0: pos = GetParent(fs, pos) if pos >= 0: - breadcrumbs=' >
  • '+ fs[pos]['title'] + '
  • '+ breadcrumbs + breadcrumbs='
  • '+ fs[pos]['title'] + '
  • '+ breadcrumbs - breadcrumbs = '' + breadcrumbs = '' return breadcrumbs @@ -376,7 +376,7 @@ temp = open('page-template.txt') template = temp.read() temp.close() -template = template.replace('{{page.bootstrap_path}}', '/bootstrap-2.2.2') +template = template.replace('{{page.bootstrap_path}}', '/bootstrap-3.3.7') template = template.replace('{{page.page_title}}', 'The Ardour Manual') diff --git a/include/navigating-the-editor.html b/include/navigating-the-editor.html index b871527..17c3b96 100644 --- a/include/navigating-the-editor.html +++ b/include/navigating-the-editor.html @@ -33,9 +33,9 @@

    Moving the playhead outside the view may scroll the screen accordingly, so using - or or , while not - scrolling per se, will result in scrolling if Transport - > Follow playhead is checked. This is also true with the + or , while not + scrolling per se, will result in scrolling if Transport > Follow playhead + is checked. This is also true with the Navigation Timeline, and anything that moves the Playhead.

    diff --git a/include/tempo-and-meter.html b/include/tempo-and-meter.html index acebf4e..4cca054 100644 --- a/include/tempo-and-meter.html +++ b/include/tempo-and-meter.html @@ -1,6 +1,6 @@

    - Tempo and meter belong together. without both, there is no way to know where + Tempo and meter belong together. Without both, there is no way to know where a beat lies in time.

    @@ -147,4 +147,3 @@
  • To change a meter, double click it. A dialog will appear.
  • To copy a meter, hold down and drag it.
  • - diff --git a/page-template.txt b/page-template.txt index 1bf3c22..6b2360e 100644 --- a/page-template.txt +++ b/page-template.txt @@ -18,13 +18,22 @@
    -

    The Ardour Manual

    +

    The Ardour Manual

    -