Switched to font embedding

soffes · Dec 31, 2009 · 9a1e730 · 9a1e730
1 parent 50b63cd
commit 9a1e730
Show file tree

Hide file tree

Showing 15 changed files with 368 additions and 21 deletions.
diff --git a/app.rb b/app.rb
@@ -9,5 +9,5 @@
 end
 
 get '/?' do
-  erb :home
+  erb :home, :locals => { :params => params}
 end
diff --git a/public/fonts/BistroScript.eot b/public/fonts/BistroScript.eot
diff --git a/public/fonts/BistroScript.svg b/public/fonts/BistroScript.svg
diff --git a/public/fonts/BistroScript.ttf b/public/fonts/BistroScript.ttf
diff --git a/public/fonts/BistroScript.woff b/public/fonts/BistroScript.woff
diff --git a/public/fonts/Nilland.eot b/public/fonts/Nilland.eot
diff --git a/public/fonts/Nilland.svg b/public/fonts/Nilland.svg
diff --git a/public/fonts/Nilland.ttf b/public/fonts/Nilland.ttf
diff --git a/public/fonts/Nilland.woff b/public/fonts/Nilland.woff
diff --git a/public/javascripts/Bistro_Script_400.font.js b/public/javascripts/Bistro_Script_400.font.js
diff --git a/public/javascripts/Nilland_400-Nilland_700.font.js b/public/javascripts/Nilland_400-Nilland_700.font.js
diff --git a/public/javascripts/cufon.js b/public/javascripts/cufon.js
diff --git a/public/stylesheets/screen.css b/public/stylesheets/screen.css
diff --git a/views/layout.erb b/views/layout.erb
@@ -7,13 +7,7 @@
     <link rel="stylesheet" href="http://<%= env["HTTP_HOST"] %>/stylesheets/screen.css" type="text/css" />
     <link rel="stylesheet" href="http://<%= env["HTTP_HOST"] %>/stylesheets/iphone.css" type="text/css" media="only screen and (max-device-width: 480px)" />
     <meta name="viewport" content="width=320, initial-scale=1.0, user-scalable=no" />
-    <script src="http://<%= env["HTTP_HOST"] %>/javascripts/cufon.js" type="text/javascript"></script>
-    <script src="http://<%= env["HTTP_HOST"] %>/javascripts/Bistro_Script_400.font.js" type="text/javascript"></script>
-    <script src="http://<%= env["HTTP_HOST"] %>/javascripts/Nilland_400-Nilland_700.font.js" type="text/javascript"></script>
-    <script type="text/javascript">
-      Cufon.replace('h1, ul.contact span', { fontFamily: 'Bistro Script' });
-      Cufon.replace('h2', { fontFamily: 'Nilland' });
-    </script>
+    <script>var _gaq=_gaq || [];_gaq.push(['_setAccount','UA-5609322-4']);_gaq.push(['_trackPageview']);(function(){var ga=document.createElement('script');ga.async=true;ga.src=('https:'==document.location.protocol?'https://ssl':'http://www')+'.google-analytics.com/ga.js';(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);})();</script>
     <!-- 
       View source code at GitHub: http://github.com/samsoffes/iturndreamsintosoftware.com 
       Best viewed in a WebKit browser (like Safari 4) for all of the CSS goodness
@@ -23,11 +17,9 @@
   <body>
     <div id="border"></div>
     <div id="container">
-      <h1><a href="http://<%= env["HTTP_HOST"] %>/">i turn dreams into software</a></h1>
+      <h1><a href="http://<%= env["HTTP_HOST"] %>/">I turn dreams into software</a></h1>
       <%= yield %>
     </div>
     <script type="text/javascript" src="http://<%= env["HTTP_HOST"] %>/javascripts/iphone.js"></script>
-    <script type="text/javascript">var gaJsHost=(("https:"==document.location.protocol)?"https://ssl.":"http://www.");document.write(unescape("%3Cscript src='"+gaJsHost+"google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));</script><script type="text/javascript">try{var pageTracker=_gat._getTracker("UA-5609322-4");pageTracker._trackPageview();}catch(err){</script>
-    <script type="text/javascript">_qoptions={qacct:"p-1crX9oZZZMDA6"};</script><script type="text/javascript" src="http://edge.quantserve.com/quant.js"></script><noscript><img src="http://pixel.quantserve.com/pixel/p-1crX9oZZZMDA6.gif" style="display: none;" border="0" height="1" width="1" alt="Quantcast"/></noscript>
   </body>
 </html>
diff --git a/views/stylesheets/screen.sass b/views/stylesheets/screen.sass
@@ -1,6 +1,19 @@
 // My simple reset
 @import reset.sass
 
+// Fonts
+@font-face
+  font-family: 'NillandRegular'
+  src: url('/fonts/Nilland.eot')
+  src: local('Nilland Regular'), local('Nilland'), url('/fonts/Nilland.woff') format('woff'), url('/fonts/Nilland.ttf') format('truetype'), url('/fonts/Nilland.svg#Nilland') format('svg')
+!nilland = "NillandRegular, HelveticaNeue, 'Helvetica Neue', Helvetica, Arial, sans-serif"
+
+@font-face
+  font-family: 'BistroScriptRegular'
+  src: url('/fonts/BistroScript.eot')
+  src: local('Bistro Script Regular'), local('BistroScript'), url('/fonts/BistroScript.woff') format('woff'), url('/fonts/BistroScript.ttf') format('truetype'), url('/fonts/BistroScript.svg#BistroScript') format('svg')
+!bistroScript = "BistroScriptRegular, 'Marker Felt', HelveticaNeue, 'Helvetica Neue', Helvetica, Arial, sans-serif"
+
 // Easy clear
 .clear:after
   clear: both
@@ -30,6 +43,8 @@ a:hover
 h1
   font-size: 68px
   margin: 50px 0
+  text-transform: lowercase
+  font-family= !bistroScript
   a
     color: #f05b35
     border: 0
@@ -42,6 +57,7 @@ h2
   font:
     size: 26px
     weight: bold
+    family= !nilland
   padding-left: 40px
   text-transform: lowercase
   margin-bottom: 4px
@@ -73,6 +89,7 @@ ul.contact
     text-align: center
     span
       font-size: 22px
+      font-family= !bistroScript
       text-transform: lowercase
       position: relative
       top: -1px