From 6952e09646f2626abc9ea6c4dfd601e0cbc83714 Mon Sep 17 00:00:00 2001
From: Corey Johnson <cj@github.com>
Date: Fri, 1 Jun 2012 10:52:44 -0700
Subject: [PATCH] Moved font-size back to 'px' and fixed specs

---
 spec/app/editor-spec.coffee | 2 +-
 src/app/editor.coffee       | 2 +-
 static/atom.css             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/app/editor-spec.coffee b/spec/app/editor-spec.coffee
index d45f1652e..7fd373b9a 100644
--- a/spec/app/editor-spec.coffee
+++ b/spec/app/editor-spec.coffee
@@ -804,7 +804,7 @@ describe "Editor", ->
     describe "when the font size changes on the view", ->
       it "updates the font sizes of editors and recalculates dimensions critical to cursor positioning", ->
         rootView.attachToDom()
-        expect(editor.css('font-size')).not.toBe '30px'
+        rootView.setFontSize(10)
         lineHeightBefore = editor.lineHeight
         charWidthBefore = editor.charWidth
         editor.setCursorScreenPosition [5, 5]
diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index 99d98958e..ce2f02ee8 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -630,7 +630,7 @@ class Editor extends View
 
   setFontSize: (fontSize) ->
     if fontSize
-      @css('font-size', fontSize + 'pt')
+      @css('font-size', fontSize + 'px')
       @calculateDimensions()
       @compositeCursor.updateAppearance()
       @updateVisibleLines()
diff --git a/static/atom.css b/static/atom.css
index b4028d803..4da5892bc 100644
--- a/static/atom.css
+++ b/static/atom.css
@@ -4,7 +4,7 @@
 }
 
 body {
-  font: 16pt Inconsolata, Monaco, Courier !important;
+  font: 16px Inconsolata, Monaco, Courier !important;
 }
 
 #root-view {