github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 05:48:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Moved font-size back to 'px' and fixed specs

Browse Source
This commit is contained in:
Corey Johnson
2012-06-01 10:52:44 -07:00
parent 4634508c37
commit 6952e09646
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/app/editor-spec.coffee
View File

@@ -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]

2
src/app/editor.coffee
View File

@@ -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()

2
static/atom.css
View File

@@ -4,7 +4,7 @@
}
body {
font: 16pt Inconsolata, Monaco, Courier !important;
font: 16px Inconsolata, Monaco, Courier !important;
}
#root-view {