Mercurial > dottes

changeset 631:b9bc45671422

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with ssh://hg.cryhavoc.org.uk/dottes
author Jim Hague <jim.hague@acm.org>
date Sun, 06 Nov 2016 21:44:50 +0000
parents 3cbf1af8541d (current diff) eb1392fd0b76 (diff)
children 353cc3db3017
files
diffstat 2 files changed, 24 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/web/css/dottes.css	Sun Nov 06 15:29:26 2016 +0000
+++ b/web/css/dottes.css	Sun Nov 06 21:44:50 2016 +0000
@@ -7,8 +7,6 @@
     background-image: url('../img/purple-fabric-background.jpg');
     color: #000000;
     height: auto;
-    padding-top: 0px;
-    padding-bottom: 20px;
     font-family: 'Open Sans', sans-serif;
 }
 
@@ -21,7 +19,6 @@
 p
 {
     background: white;
-    margin: 10px;
 }
 
 div.banner
@@ -41,9 +38,6 @@
     -moz-border-radius-bottomright: 5px;
     border-bottom-left-radius: 5px;
     border-bottom-right-radius: 5px;
-
-    margin-top: 5px;
-    margin-bottom: 5px;
 }
 
 div.banner img
@@ -69,6 +63,7 @@
 div.dottes-body
 {
     background-color: white;
+
     -webkit-border-top-left-radius: 5px;
     -webkit-border-top-right-radius: 5px;
     -moz-border-radius-topleft: 5px;
@@ -85,18 +80,18 @@
 
     margin-top: 5px;
     margin-bottom: 5px;
+
+    padding: 10px;
 }
 
 div.dottes-body h1
 {
-    margin: 10px;
     text-align: left;
 }
 
-div.dottes-container
+div.dottes-transpose-container
 {
     border: 2px solid grey;
-    margin: 10px;
 }
 
 div.dottes-transpose-instrument
@@ -109,6 +104,7 @@
 {
     display: table-cell;
     vertical-align: middle;
+    padding: 5px;
 }
 
 div.dottes-transpose-instrument-name
@@ -128,7 +124,6 @@
 
 div.dottes-tune-display
 {
-    margin: 10px;
 }
 
 div.dottes-tune-header
@@ -222,18 +217,21 @@
 div.dottes-tune-footer-links
 {
     display: table-cell;
+    vertical-align: middle;
 }
 
 div.dottes-tune-footer-play
 {
     display: table-cell;
     text-align: center;
+    vertical-align: middle;
 }
 
 div.dottes-tune-footer-last
 {
     display: table-cell;
     text-align: right;
+    vertical-align: middle;
 }
 
 div.dottes-tune-learner
@@ -316,6 +314,7 @@
 {
     list-style-type: none;
     margin: 0px;
+    padding: 0px;
 }
 
 ul.tune-data-list li
--- a/web/index.html	Sun Nov 06 15:29:26 2016 +0000
+++ b/web/index.html	Sun Nov 06 21:44:50 2016 +0000
@@ -13,7 +13,7 @@
   <div class="container">
     <a href="/">
       <div class="header-strip banner">
-        <h1>Ye Crie Havock Booke of Dottes</h1>
+        <img src="img/banner.png">
       </div>
     </a>
 
@@ -42,8 +42,8 @@
         music scene, and therefore there is at least tacit approval by
         the authors for their dissemination. If this is not the case,
         please contact me at the address below and I will remove the
-        offending tune.
-      <div class="dottes-container">
+        offending tune.</p>
+      <div class="dottes-transpose-container">
         <div class="dottes-transpose-instrument">
           <div class="dottes-transpose-instrument-item dottes-transpose-instrument-name">
             <h1>Tunes</h1>
@@ -65,7 +65,7 @@
     <div class="dottes-body">
       <h1>But my instrument isn't suited for treble clef concert pitch!</h1>
       <p>Of course, not all instruments are suited to playing music written
-        in concert pitch in the treble clef.
+        in concert pitch in the treble clef.</p>
       <p>To help those with such instruments get started, I've done some
         simple transpositions for requested instruments. These are
         <strong>not</strong> proper arrangements; I lack the time and the
@@ -74,14 +74,14 @@
         simple method.
       <p>I hope you find them useful.</p>
 
-      <div class="dottes-container">
+      <div class="dottes-transpose-container">
         <div class="dottes-transpose-instrument">
           <div class="dottes-transpose-instrument-item dottes-transpose-instrument-name">
             <h1>Cello</h1>
           </div>
           <div class="dottes-transpose-instrument-item dottes-transpose-how">
             <p>Transpose down one or two octaves depending on the range in the
-              tune, and use the bass clef.
+              tune, and use the bass clef.</p>
           </div>
           <div class="dottes-transpose-instrument-item dottes-transpose-tune-types">
             <ul class="tune-type-list">
@@ -92,7 +92,7 @@
           </div>
         </div>
       </div>
-      <div class="dottes-container">
+      <div class="dottes-transpose-container">
         <div class="dottes-transpose-instrument">
           <div class="dottes-transpose-instrument-item dottes-transpose-instrument-name">
             <h1>Horn in F</h1>
@@ -102,7 +102,7 @@
               range in the tune. To avoid scaring less able horn players such
               as myself, the transposed score will prefer going below middle C
               to going above the top G on the stave. Able horn players
-              can transpose in their heads anyway, so don't need this.
+              can transpose in their heads anyway, so don't need this.</p>
           </div>
           <div class="dottes-transpose-instrument-item dottes-transpose-tune-types">
             <ul class="tune-type-list">
@@ -128,17 +128,18 @@
         Paul Hardy's Session Tunebook</a>. Many thanks to Paul for
         licensing it under permissive terms. I have followed his lead
         and used the same <a href="#licencing">licence</a> for the
-        Booke of Dottes.
+        Booke of Dottes.</p>
       <p>One icon on this website is courtesy
         of <a href="www.creativefreedom.co.uk">Creative Freedom</a>.
         Thanks to them.
       <p>Above all, profuse and grateful thanks to all my fellow
-        Havocs, and to Jane. They have supplied the tunes, checked the
-        renditions, and offered corrections and suggestions. Without them,
-        this project couldn't have happened.
+        Havocs, and most especially to Jane. They have supplied the tunes,
+        checked the renditions, and offered corrections and suggestions.
+        Without them, this project couldn't have happened.</p>
     </div>
 
     <div class="dottes-body">
+      <p>
       <a rel="license"
       href="http://creativecommons.org/licenses/by-sa/2.0/uk/deed.en_US">
         <img alt="Creative Commons License" style="border-width:0"
@@ -154,7 +155,8 @@
       is licensed under a
       <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/2.0/uk/">
         Creative Commons Attribution-NonCommercial-ShareAlike 2.0 UK: England &amp; Wales
-      License</a>.
+        License</a>.
+      </p>
     </div>
 
   </div>