refactoring all the stylesheets into /Atom - Dark/

Conflicts:
	.atom/themes/Atom - Dark/vim-mode.css
This commit is contained in:
Jon Rohan
2013-01-17 21:57:12 -08:00
parent 62f1155706
commit 20e5b303a7
45 changed files with 136 additions and 14718 deletions

View File

@@ -39,7 +39,7 @@ _.extend atom,
.filter (name) -> not _.contains(disabledPackages, name)
loadThemes: ->
themeNames = config.get("core.themes") ? ['IR_Black']
themeNames = config.get("core.themes") ? ['Atom - Dark', 'IR_Black']
themeNames = [themeNames] unless _.isArray(themeNames)
@loadTheme(themeName) for themeName in themeNames

View File

@@ -9,7 +9,6 @@ Theme = require 'theme'
configDirPath = fs.absolute("~/.atom")
configJsonPath = fs.join(configDirPath, "config.json")
userInitScriptPath = fs.join(configDirPath, "atom.coffee")
bundledThemesDirPath = fs.join(resourcePath, "themes")
bundledPackagesDirPath = fs.join(resourcePath, "src/packages")
bundledVendorPackagesDirPath = fs.join(resourcePath, "vendor/packages")
userThemesDirPath = fs.join(configDirPath, "themes")
@@ -20,7 +19,7 @@ require.paths.unshift userPackagesDirPath
module.exports =
class Config
configDirPath: configDirPath
themeDirPaths: [userThemesDirPath, bundledThemesDirPath]
themeDirPaths: [userThemesDirPath]
packageDirPaths: [userPackagesDirPath, bundledVendorPackagesDirPath, bundledPackagesDirPath]
defaultSettings: null
settings: null
@@ -34,8 +33,8 @@ class Config
load: ->
@loadUserConfig()
@requireUserInitScript()
atom.loadPackages()
atom.loadThemes()
atom.loadPackages()
loadUserConfig: ->
if fs.exists(configJsonPath)

View File

@@ -21,6 +21,7 @@ class Theme
if TextMateTheme.testPath(path)
new TextMateTheme(path)
else
require.paths.unshift path
new AtomTheme(path)
theme.load()