From 677d7d69755e376a3bf93003a4c9bb86c6146ee4 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Wed, 30 Sep 2015 19:43:06 -0600
Subject: [PATCH] Load base stylesheets on ThemeManager construction

---
 spec/spec-helper.coffee  | 1 -
 src/atom.coffee          | 2 --
 src/theme-manager.coffee | 1 +
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index 508c8c1fa..fb326caf8 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -20,7 +20,6 @@ TextEditorComponent = require '../src/text-editor-component'
 pathwatcher = require 'pathwatcher'
 clipboard = require '../src/safe-clipboard'
 
-atom.themes.loadBaseStylesheets()
 atom.themes.requireStylesheet '../static/jasmine'
 atom.themes.initialLoadComplete = true
 
diff --git a/src/atom.coffee b/src/atom.coffee
index 5887881ee..6ae31c767 100644
--- a/src/atom.coffee
+++ b/src/atom.coffee
@@ -558,8 +558,6 @@ class Atom extends Model
       console.warn error.message if error?
 
     @config.load()
-    @themes.loadBaseStylesheets()
-
     @setBodyPlatformClass()
     document.head.appendChild(new StylesElement)
     @windowEventHandler = new WindowEventHandler(this)
diff --git a/src/theme-manager.coffee b/src/theme-manager.coffee
index 649478841..4ccee0a4c 100644
--- a/src/theme-manager.coffee
+++ b/src/theme-manager.coffee
@@ -17,6 +17,7 @@ class ThemeManager
     @packageManager.registerPackageActivator(this, ['theme'])
     @packageManager.onDidActivateInitialPackages =>
       @onDidChangeActiveThemes => @packageManager.reloadActivePackageStyleSheets()
+    @loadBaseStylesheets()
 
   ###
   Section: Event Subscription