From 21370661f787e2e1d9ab46d1c416325d86fa65ea Mon Sep 17 00:00:00 2001 From: Michael Murtaugh Date: Mon, 10 Jun 2019 18:53:29 +0200 Subject: [PATCH] symbols! --- dist/wikimaptotal.js | 10 ++- img/symbols.svg | 198 +++++++++++++++++++++++++++++++++++++++++++ img/symhamburger.png | Bin 0 -> 332 bytes img/symsearch.png | Bin 0 -> 756 bytes img/symup.png | Bin 0 -> 976 bytes index.html | 140 ++++++++++++++++++------------ src/forcenet.js | 6 ++ src/wikimapsimple.js | 2 +- style.css | 93 ++++++++++++++------ 9 files changed, 369 insertions(+), 80 deletions(-) create mode 100644 img/symbols.svg create mode 100644 img/symhamburger.png create mode 100644 img/symsearch.png create mode 100644 img/symup.png diff --git a/dist/wikimaptotal.js b/dist/wikimaptotal.js index 9f0d502..f3e5b7d 100644 --- a/dist/wikimaptotal.js +++ b/dist/wikimaptotal.js @@ -4932,7 +4932,7 @@ var wikimap = (function (exports) { seconds = date.getUTCSeconds(), milliseconds = date.getUTCMilliseconds(); return isNaN(date) ? "Invalid Date" - : formatYear(date.getUTCFullYear(), 4) + "-" + pad(date.getUTCMonth() + 1, 2) + "-" + pad(date.getUTCDate(), 2) + : formatYear(date.getUTCFullYear()) + "-" + pad(date.getUTCMonth() + 1, 2) + "-" + pad(date.getUTCDate(), 2) + (milliseconds ? "T" + pad(hours, 2) + ":" + pad(minutes, 2) + ":" + pad(seconds, 2) + "." + pad(milliseconds, 3) + "Z" : seconds ? "T" + pad(hours, 2) + ":" + pad(minutes, 2) + ":" + pad(seconds, 2) + "Z" : minutes || hours ? "T" + pad(hours, 2) + ":" + pad(minutes, 2) + "Z" @@ -5179,6 +5179,7 @@ var wikimap = (function (exports) { node_enter.append("use") .attr("xlink:href", d => this.get_symbol(d, "default")) .attr("class", "testcolor"); + // { // for (var i=0, l=d.cats.length; id.active); + this.simulation .nodes(graph.nodes) .on("tick", ticked); @@ -5225,6 +5227,10 @@ var wikimap = (function (exports) { node .attr("transform", d => `translate(${d.x},${d.y})`); } + + // document.querySelector("#page").style.background = "purple"; + // return; + this.update_nodes(); this.update_forces(); // this.simulation.alphaTarget(0.3).restart(); @@ -5304,7 +5310,7 @@ var wikimap = (function (exports) { async load_json (source) { var data = await json(source); - + // console.log("got data!", data); // index the nodes by title, init link-arity count var index = {}; this.nodes_by_title = index; diff --git a/img/symbols.svg b/img/symbols.svg new file mode 100644 index 0000000..6ed540b --- /dev/null +++ b/img/symbols.svg @@ -0,0 +1,198 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/symhamburger.png b/img/symhamburger.png new file mode 100644 index 0000000000000000000000000000000000000000..4ea8babaf6f83786cd3238ae4c22d13cc448e23a GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3EX7WqAsj$Z!;#Vf4nJ z@J|9^MwS(I3xI->C9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6d{^mK6y z@#uUz$&l-igMe##`JJ4+g-S01b@n)4ddq6lGIj3~kBP}0t*z+-Z$xsg`kA-f-O3xu z!Llr1MtGgwe^dE}#2NMOCCte^o38n3s%Fl**S)A>`{uyyPv%H_YwAyVv}@gTh7IpU z&3!*R9noESqq=_Son$t_y;kQx&lGs%qd75X-KkABTQG<*Sp1kH!#TNCaa>gAm zVj`!V6}%YWHK%y?s#S7tb*!cfBndf11b0mhvSxT8p1s!p+AY?l7M_!&pUNFJ*nd!5 YbiMh9TE=T1fu3UUboFyt=akR{0DRYf9smFU literal 0 HcmV?d00001 diff --git a/img/symsearch.png b/img/symsearch.png new file mode 100644 index 0000000000000000000000000000000000000000..50161d5a3abaa6623a61267a05362508b1811888 GIT binary patch literal 756 zcmV8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H10&z)1K~zYI?bXdo6mb~9@$WOUyXgo9kwOro68HcuA?58CW# zMF+pf;hEoOV3>JerIr4t^7(wD@B2;5IYVk4bX|9kh#UbrfX3O&KY)88a;c@IrCcl) z<39#>cXzLe#8~~B0p8t7LmQcL0}AUMn*=)mks;A-=wM!0FC4LP#A_U z7Md#*3btvQBdWSJj^mwS7`{w`jo&?#s$K=EQ55Z13xv-=eDLfKFf%cnw6rMxYsZA|id2O68GdStSuU0Nk3Mo_0n@M;H7g zYu?8IU0q%4GMUV7pcODx^}UGPnZF7h$1yF-x*#GxaNn}5&cVUK%Cg`TiRXC(z~126oEP)8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H115HUpK~zYI?UhexTvZf@zjK{gv~k=BT9pz(j4mV@|I*fWqYGDJ zga(Bq^WMCX*=bs|8cc+dQWH(1sad!%&fIy^x^S`)1i_sklp>KNg+M`wsf{RFFyM`yJ&i(E?_x$dIUG3^R>4u#a=5jgH(a~}9%*@Q{PU>YRML`f8 zcFs)z_p0iMh>Tlnf4gqrbUM9XRo?=h0UU4@xCQt|L{1b6h3Wqk+|$#ur>(8+1yvmu zksE=}fn!k=UD_&ct)2bXVBhzj1l|SiRMjiMP_bAn0b0vRrBZhoV@80!YW!R*7CSLD zHTAMtTPo=7A{CMPF+h6GrKlEf)mmFkb%BkEUIj*@C^}tlAeJQGvWN^83Wam^2lIXZ zh=`m~)%#U-x>zjs)N}svlSn3$e*hAT#h%LN^Pem%EUd$Zg}S=BUKf!Pa3Am)P*T;$ zfM=7*WcXz+Pva)ieQmKUV^YcG7ZS^LJ@B2rAabUlyek~%e zT5HPyeSLkm#pCgus%8KKOgraZ3d8Vn!%Z74`o8~gwOt2+2spjnOXPXpgKXICFx8h1 z7~Sr#wIw(Rg4>;QqihTaz**pBYwh=q4$5EM83WpZZ&h`;SS*H3!Rd7RxT>B6+En!m zW6VIIQ243|@Neqx?{72442sB$z#iZOYwdIOIkC+}&N(9@S4AXat^J4wkHB`S+UvDU yCNov3RK|dhn-*oW*?2aa-FvODUG3_Bqdx(*SBpfGZ|blB0000|H|J0 literal 0 HcmV?d00001 diff --git a/index.html b/index.html index ea19c01..b800d84 100644 --- a/index.html +++ b/index.html @@ -1,78 +1,102 @@ - + erg - école de recherche graphique -
-
- - - -
-
- +
+ + 

+        

+            

+                
+                

+                    
+                

         

     

     

@@ -88,6 +112,10 @@
         

     

 
+
+
 
 
+
 
diff --git a/src/forcenet.js b/src/forcenet.js
index 4c2c0dc..3a0b970 100644
--- a/src/forcenet.js
+++ b/src/forcenet.js
@@ -128,6 +128,7 @@ export class ForceNet {
         node_enter.append("use")
             .attr("xlink:href", d => this.get_symbol(d, "default"))
             .attr("class", "testcolor");
+
             // {
             //     for (var i=0, l=d.cats.length; id.active);
 
+
         this.simulation
             .nodes(graph.nodes)
             .on("tick", ticked);
@@ -174,6 +176,10 @@ export class ForceNet {
             node
                 .attr("transform", d => `translate(${d.x},${d.y})`);
         }
+
+        // document.querySelector("#page").style.background = "purple";
+        // return;
+
         this.update_nodes();
         this.update_forces();
         // this.simulation.alphaTarget(0.3).restart();
diff --git a/src/wikimapsimple.js b/src/wikimapsimple.js
index c3f2d63..1839e48 100644
--- a/src/wikimapsimple.js
+++ b/src/wikimapsimple.js
@@ -45,7 +45,7 @@ export class SimpleMap {
 
     async load_json (source) {
         var data = await json(source);
-
+        // console.log("got data!", data);
         // index the nodes by title, init link-arity count
         var index = {};
         this.nodes_by_title = index;
diff --git a/style.css b/style.css
index baee288..1b619fc 100644
--- a/style.css
+++ b/style.css
@@ -1,33 +1,78 @@
-#content {
-    position: absolute;
-    left: 0; top: 0; right: 0; bottom: 0;
-    background: #EEE;
+/* F O N T E S */
+@font-face {
+    font-family: "Combined";
+    src: url('/typo/Combined/combined.otf');  
+    font-style:   normal;
+    font-weight:  normal;
 }
 
-#wiki {
-    position: absolute;
-    left: 50%;
-    right: 0;
-    top: 0;
-    bottom: 0;
-}
-#wiki iframe {
-    width: 100%;
-    height: 100%;
-    border: none;
-}
-body {
-    margin: 0;
-    overflow: hidden;
+@font-face {
+    font-family: 'combinedregular';
+    src: url('/typo/Combined/web/combined.eot');
+    src: url('/typo/Combined/web/combined.eot?#iefix') format('embedded-opentype'),
+         url('/typo/Combined/web/combined.woff2') format('woff2'),
+         url('/typo/Combined/web/combined.woff') format('woff'),
+         url('/typo/Combined/web/combined.ttf') format('truetype'),
+         url('/typo/Combined/web/combined.svg#combinedregular') format('svg');
+    font-weight: normal;
+    font-style: normal;
 }
 
-#controls {
-    position: absolute;
-    z-index:10;
-    bottom: 0;
-    display: none;
+@font-face {
+    font-family: 'wremena';
+    src: url('typo/Wremema/webfont/wremena_bold-webfont.woff2') format('woff2'),
+         url('typo/Wremema/webfont/wremena_bold-webfont.woff') format('woff'),
+         url('typo/Wremema/webfont/wremena_bold-webfont.ttf') format('truetype'),
+         url('typo/Wremema/webfont/wremena_bold-webfont.svg#wremenabold') format('svg');
+    font-weight: bold;
+    font-style: normal;
 }
 
+@font-face {
+    font-family: 'wremena';
+    src: url('typo/Wremema/webfont/wremena_regular-webfont.woff2') format('woff2'),
+         url('typo/Wremema/webfont/wremena_regular-webfont.woff') format('woff'),
+         url('typo/Wremema/webfont/wremena_regular-webfont.ttf') format('truetype'),
+         url('typo/Wremema/webfont/wremena_regular-webfont.svg#wremenaregular') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'wremena';
+    src: url('typo/Wremema/webfont/wremena_light-webfont.woff2') format('woff2'),
+         url('typo/Wremema/webfont/wremena_light-webfont.woff') format('woff'),
+         url('typo/Wremema/webfont/wremena_light-webfont.ttf') format('truetype'),
+         url('typo/Wremema/webfont/wremena_light-webfont.svg#wremenalight') format('svg');
+    font-weight: normal;
+    font-style: 200;
+}
+
+@font-face {
+  font-family: 'Coupeur Monospace Bold';
+  src: url('/typo/Coupeur/webfont/CoupeurMonospace-Bold.eot'); /* IE9 Compat Modes */
+  src: url('/typo/Coupeur/webfont/CoupeurMonospace-Bold.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('/typo/Coupeur/webfont/CoupeurMonospace-Bold.woff') format('woff'), /* Modern Browsers */
+       url('/typo/Coupeur/webfont/CoupeurMonospace-Bold.ttf')  format('truetype'), /* Safari, Android, iOS */
+       url('/typo/Coupeur/webfont/CoupeurMonospace-Bold.svg#fcf36b8f65c0f0737cd36a2be6922659') format('svg'); /* Legacy iOS */
+       
+  font-style:   normal;
+  font-weight:  700;
+}
+
+@font-face {
+  font-family: 'Coupeur Monospace Normal';
+  src: url('/typo/Coupeur/webfont/CoupeurMonospace-Normal.eot'); /* IE9 Compat Modes */
+  src: url('/typo/Coupeur/webfont/CoupeurMonospace-Normal.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('/typo/Coupeur/webfont/CoupeurMonospace-Normal.woff') format('woff'), /* Modern Browsers */
+       url('/typo/Coupeur/webfont/CoupeurMonospace-Normal.ttf')  format('truetype'), /* Safari, Android, iOS */
+       url('/typo/Coupeur/webfont/CoupeurMonospace-Normal.svg#4b219f539d302a6ffd9fd41e2da16172') format('svg'); /* Legacy iOS */
+       
+  font-style:   normal;
+  font-weight:  400;
+}
+
+
 .links line {
   /*stroke: #aaa;*/
   stroke: none;