From d5715c354e666d2539207fbbd41e9fbd4a107dc9 Mon Sep 17 00:00:00 2001
From: Nicolas Bally <info@nicolasbally.com>
Date: Thu, 21 Aug 2014 14:07:27 +0200
Subject: [PATCH] polices

---
 app/assets/stylesheets/application.scss |  3 +-
 app/views/welcome/index.html.haml       | 55 ++++++++++++++-----------
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 9e0637b..72e1de6 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -122,7 +122,8 @@ right:15px;
  color:white;
  padding:1px;
 
- font-family:Felt Tip Roman;
+ font-family:"felt-tip-roman";
+ font-weight:normal;
  #myCanvas{
 
  
diff --git a/app/views/welcome/index.html.haml b/app/views/welcome/index.html.haml
index 78c89ed..d3ca00b 100644
--- a/app/views/welcome/index.html.haml
+++ b/app/views/welcome/index.html.haml
@@ -7,11 +7,40 @@
     = javascript_include_tag "application"
     
     = csrf_meta_tag 
+    <script type="text/javascript" src="//use.typekit.net/bkj8nbt.js"></script>
     
+    :javascript
+      try {
+         Typekit.load({
+           active: function() {
+      
+             $(document).ready(function() {
+             if( ! $('#myCanvas').tagcanvas({
+             textColour : '#ffffff',
+             outlineThickness : 1,
+             depth:0.5,
+             lock:"xy",
+             initial: [0.1,-0.01],
+             shape:"vcylinder",
+             stretchX:1.5,
+             stretchY:0.9,
+             maxSpeed : 0.02,
+             outlineMethod : "none",
+             wheelZoom :false,
+             textFont :"felt-tip-roman" ,
+             textHeight : 30,
+             })) {
+             // TagCanvas failed to load
+             $('#myCanvasContainer').hide();
+             }
+             // your other jQuery stuff here...
+             });
+           }
+         })
+      } catch(e) {}
     = stylesheet_link_tag 'application'
     
-    <script type="text/javascript" src="//use.typekit.net/bkj8nbt.js"></script>
-    <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
+    
 
   %body
     #home
@@ -268,27 +297,7 @@
         
         
         <script type="text/javascript">
-        $(document).ready(function() {
-        if( ! $('#myCanvas').tagcanvas({
-        textColour : '#ffffff',
-        outlineThickness : 1,
-        depth:0.5,
-        lock:"xy",
-        initial: [0.1,-0.01],
-        shape:"vcylinder",
-        stretchX:1.5,
-        stretchY:0.9,
-        maxSpeed : 0.02,
-        outlineMethod : "none",
-        wheelZoom :false,
-        textFont :"Felt Tip Roman" ,
-        textHeight : 30,
-        })) {
-        // TagCanvas failed to load
-        $('#myCanvasContainer').hide();
-        }
-        // your other jQuery stuff here...
-        });
+        
         </script>
         
       #realisations