Replace requireStylesheet calls w/ @import directives in atom.less

This commit is contained in:
Nathan Sobo
2013-04-12 13:21:17 -06:00
parent 2f008aa886
commit bbf7c6ca1b
4 changed files with 99 additions and 92 deletions

View File

@@ -17,6 +17,7 @@ class Config
themeDirPaths: [userThemesDirPath, bundledThemesDirPath, vendoredThemesDirPath]
packageDirPaths: [userPackagesDirPath, vendoredPackagesDirPath, bundledPackagesDirPath]
userPackagesDirPath: userPackagesDirPath
lessSearchPaths: [fsUtils.join(resourcePath, 'static')]
defaultSettings: null
settings: null
configFileHasErrors: null

View File

@@ -25,12 +25,7 @@ window.setUpEnvironment = ->
$(document).on 'keydown', keymap.handleKeyEvent
keymap.bindDefaultKeys()
requireStylesheet 'reset'
requireStylesheet 'atom'
requireStylesheet 'overlay'
requireStylesheet 'popover-list'
requireStylesheet 'notification'
requireStylesheet 'markdown'
if nativeStylesheetPath = fsUtils.resolveOnLoadPath(process.platform, ['css', 'less'])
requireStylesheet(nativeStylesheetPath)
@@ -142,7 +137,12 @@ window.requireStylesheet = (path) ->
window.loadStylesheet = (path) ->
content = fsUtils.read(path)
if fsUtils.extension(path) == '.less'
(new less.Parser({})).parse content, (e, tree) ->
parser = new less.Parser
syncImport: true
paths: config.lessSearchPaths
filename: path
parser.parse content, (e, tree) ->
throw new Error(e.message, path, e.line) if e
content = tree.toCSS()