Mercurial > hg > nodescore

changeset 75:3a2845e3156e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added martin tweaks
author Rob Canning <rc@kiben.net>
date Tue, 01 Jul 2014 08:51:53 +0000
parents b7f9ade92165
children 0ae87af84e2f
files nodescore.js www/martin/css/nodescore.css www/martin/index.html
diffstat 3 files changed, 71 insertions(+), 48 deletions(-) [+]
line wrap: on
line diff
--- a/nodescore.js	Sun Jun 29 16:53:50 2014 +0000
+++ b/nodescore.js	Tue Jul 01 08:51:53 2014 +0000
@@ -11,8 +11,8 @@
 var sio = require('socket.io')
 , http = require('http')
 , ch = require('./chronometer')
-, fs = require('fs')
-, static = require('node-static');
+, fs = require('fs');
+//, static = require('node-static');
 
 var argu = process.argv.splice(2);
 var port = argu[0]
--- a/www/martin/css/nodescore.css	Sun Jun 29 16:53:50 2014 +0000
+++ b/www/martin/css/nodescore.css	Tue Jul 01 08:51:53 2014 +0000
@@ -1,6 +1,6 @@
 body{
-    background-color: black;
-    color: white;
+    !background-color: white;
+    !color: white;
     font: 12px Helvetica, Arial;      
     margin-left:0px;
     height:100%;
@@ -9,17 +9,31 @@
 
 h3,h4,h5,h6 {
     width: 400px;
-    background-color: white;
+    ! background-color: white;
     display: inline;
     color: #666;
     z-index: 2;
 }
 
-h1{ background-color: black; color:white;font: 44px Helvetica, Arial; }
-h2{ font: 28px Helvetica, Arial; color:white}
-h3{ font: 12px Helvetica, Arial; color:white }
-h4{ background-color: black; font: 19px Helvetica, Arial; 
-    text-align: center;  margin-left:auto; margin-right:auto; color:white}
+h1{ !background-color: black; 
+    !color:white;
+    font: 44px Helvetica, Arial; 
+   
+}
+
+h2 { font: 28px Helvetica, Arial; 
+  !color:white
+}
+
+h3{ font: 12px Helvetica, Arial; 
+    !color:white 
+  }
+
+h4{ !background-color: black; 
+    font: 19px Helvetica, Arial; 
+    text-align: center;  margin-left:auto; margin-right:auto; 
+    !color:white
+  }
 
 a:link { color:#666;}
 a:visited { color: #666;}
@@ -41,7 +55,7 @@
     position: absolute;
     top:130px;
     left: 3000px;
-    +filter: invert(100%);
+    !+filter: invert(100%);
     margin: 0 auto;
 }
 
@@ -293,7 +307,7 @@
 .clear { clear:both; }
 
 #midcomms{
-color:white;
+!color:white;
 width:160px; 
 height:40px; 
 background-color:transparent; 
@@ -302,19 +316,25 @@
 }
 
 #client_chronometer{ 
-    display:table-cell; vertical-align:middle;
-    border-radius: 15px;
-    float:right;
-    background-color: transparent;   
-    color: white;
-    font-size: 3.7em; 
-    text-align: center;
-    opacity:0.8;
-    position: relative; 
-    left: 10px; 
-    bottom:64px;
-    width: 210px; 
-    z-position: 2;
+position:fixed; 
+right:70px; 
+bottom: 10px;  
+font-size:3em;
+
+    !display:table-cell; 
+    !vertical-align:middle;
+    !border-radius: 15px;
+    !float:right;
+    !background-color: transparent;   
+    !color: white;
+    !font-size: 3.7em; 
+    !text-align: center;
+    !opacity:0.8;
+    !position: relative; 
+    !left: 10px; 
+    !bottom:64px;
+    !width: 210px; 
+    !z-position: 2;
 }
 
 #transport{ 
@@ -326,7 +346,7 @@
 #ctrlstop{ 
     position:absolute;
     padding: 5px;
-   border: 1px solid gray;
+    border: 1px solid gray;
     bottom:120px;
     left:1800px;
     height:80px;
@@ -374,7 +394,7 @@
 #countinnumber{ 
     border-radius: 15px;
     position: absolute; 
-    background-color:black;
+    !background-color:black;
     font-size: 10em; 
     font-weight:bolder;
     display:inline;
@@ -389,7 +409,7 @@
     height: 90%;
     font-size:3em;
     text-align:center;
-    background-color:black;
+    !background-color:black;
     border:1px solid white;
     margin-left:auto; margin-right:auto;
     display:table-cell;
@@ -397,10 +417,12 @@
     border-radius: 15px;
 }
 
-!#wide { background-color:white;  width:5600px; height:90%; border: 1px solid black;  padding: 16px 10px 16px 0px; display:inline; }
+!#wide { !background-color:white;  
+	 width:5600px; height:90%; border: 1px solid black;  
+	 padding: 16px 10px 16px 0px; display:inline; }
 
 .outermaster2{
-    background-color:black;
+    !background-color:black;
     margin-top:4px;
     height: 810px;
     width: 6700px;
@@ -415,14 +437,17 @@
        left: -0px;
        height: 760px; 
        padding: 20px 50px 20px 50px; 
-       border: 1px solid gray;  background-color: black;}
+       border: 1px solid gray;  
+       !background-color: black;
+     }
 
 #outerpreview { 
     !display:inline;
     !float:left; 
     height:700px;
     width: 1200px; padding: 0; 
-    border: 1px solid gray;  background-color: black;
+    border: 1px solid gray;  
+    background-color: black;
     margin: 0 auto;
     padding: 50px 50px 50px 50px; 
     position: relative; left:-1200px;
@@ -475,7 +500,8 @@
 #links {position:absolute; bottom:150px; left: 800px; width:900px;}
 !#transect {position:absolute; bottom:180px; left: 1300px; width:600px;}
 
-.tportpop { background-color:black; width:200px; height: 90px; 
+.tportpop { !background-color:black; 
+	    width:200px; height: 90px; 
 	    margin: 1px solid white; position:relative; 
 	    left:300px; top:60px;  border: 1px solid green; 
 	    border-radius: 10px; padding: 5px; }
\ No newline at end of file
--- a/www/martin/index.html	Sun Jun 29 16:53:50 2014 +0000
+++ b/www/martin/index.html	Tue Jul 01 08:51:53 2014 +0000
@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta charset="UTF-8">  
-  <title>controlx@nodescore</title>
+  <title>iface@nodescore</title>
   <script src="/socket.io/socket.io.js"></script>
   <link rel="shortcut icon" href="/kiben_favicon.ico" type="image/x-icon" />
   <link href="css/nodescore.css" rel="stylesheet">
@@ -12,7 +12,7 @@
   <script src="js/jquery-1.7.1.min.js"></script>  
   <script src="js/controlseq.js"></script>
   <script src="js/scoreB.js"></script>  
-  <script src="js/nodescore-slides.js"></script>  
+ <script src="js/nodescore-slides.js"></script>  
 </head>
 
 <body onload="initPage()">
@@ -67,7 +67,7 @@
 	  <div class="pview" id="preview-1" >    
 	    <div class="musicianprog" style="background:black; border: 1px solid yellow;" >
 	      <div id="counttitle1" style="display:inline;"></div>
-	      <div id="count1" style="color:white; font-size:2em;"></div>
+	      <div id="count1" style=" font-size:2em;"></div>
 	    </div>
 	    <div class="unitseq" id="unitseq0"></div>
 	    <div class="pviewmusic" id="previewbox-1"> </div>
@@ -76,7 +76,7 @@
 	  <div class="pview" id="preview-2">
 	    <div class="musicianprog" style="background:black; border: 1px solid green; ">
 	      <div id="counttitle2" style="display:inline;"></div>
-	      <div id="count2" style="color:white; font-size:2em;"></div>
+	      <div id="count2" style=" font-size:2em;"></div>
 	    </div>
 
 	    <div class="unitseq" id="unitseq1"></div>
@@ -87,16 +87,16 @@
 	  <div class="pview" id="preview-3" >
 	    <div class="musicianprog" style="background:black; border: 1px solid aqua; ">
 	      <div id="counttitle3" style="display:inline;"></div>
-	      <div id="count3" style="color:white; font-size:2em;"></div>
+	      <div id="count3" style=" font-size:2em;"></div>
 	    </div>
 	    <div class="unitseq" id="unitseq2"></div>
 	    <div class="pviewmusic" id="previewbox-3"> </div>
 	  </div>
 	  
 	  <div class="pview" id="preview-4">
-	    <div class="musicianprog" style="background:black; border: 1px solid red; ">
+	    <div class="musicianprog" style=" border: 1px solid red; ">
 	      <div id="counttitle4" style="display:inline;"></div>
-	      <div id="count4" style="color:white; font-size:2em;"></div>
+	      <div id="count4" style=" font-size:2em;"></div>
 	    </div>
 	    <div class="unitseq" id="unitseq3"></div>
 	    <div class="pviewmusic" id="previewbox-4"> </div>
@@ -142,7 +142,7 @@
 
       <div id="midcomms">
 	<div id="counttitle" style="display:inline;"></div>
-	<div id="count" style="color:white"></div>
+	<div id="count"></div>
 	<div class="unitseq" id="unitseq1" style="float:right; width:50px; position:relative; top:-10px; left:40px"></div>
  </div>
       
@@ -199,20 +199,17 @@
 
 
     
-    <div style=" position:fixed; left:100px; bottom: 50px;  font-size:3em; color:red; " id="indexpagetitle">
-      <h1>Lines of Desire</h1>
-      <h2>for four violins</h2>
+    <div style=" position:fixed; left:30px; bottom: 10px;  font-size:3em; " id="indexpagetitle"
+      <h2>pathways - for guitar, percussion & electronics</h2>
     </div>
     
-    <div style=" position:fixed; left:700px; bottom:100px; font-size:3em; color:red; " id="transect">.. </div>	
-    <div id="client_chronometer"  style="z-index: 2; position:fixed; left:700px; bottom:50px; font-size:5em; color:red; ">00:00:00.0</div>      
+    <div style="" id="transect">.. </div>	
+    <div id="client_chronometer" >00:00:00.0</div>      
    
     <div class="metrocase" id="metro" style=" position:fixed; left:550px; bottom:80px;" >
       <div id="metronome0"></div>
     </div>
 
-
-
     
 </body>
 </html>