From 1ba04cb58a181fcbee8aae9bf700ad476ab631bd Mon Sep 17 00:00:00 2001
From: Ben Ogle <ogle.ben@gmail.com>
Date: Thu, 12 Sep 2013 15:20:40 -0700
Subject: [PATCH] Reverse the loading order of themes.

We want the first/top-most theme's css to be loaded after the others
so its styles will override styles in the other themes.
---
 spec/theme-manager-spec.coffee | 4 ++--
 src/theme-manager.coffee       | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/spec/theme-manager-spec.coffee b/spec/theme-manager-spec.coffee
index d9d9cd45b..e4823c204 100644
--- a/spec/theme-manager-spec.coffee
+++ b/spec/theme-manager-spec.coffee
@@ -39,8 +39,8 @@ describe "ThemeManager", ->
 
       config.set('core.themes', ['atom-light-syntax', 'atom-dark-syntax'])
       expect($('style.theme').length).toBe 2
-      expect($('style.theme:eq(0)').attr('id')).toMatch /atom-light-syntax/
-      expect($('style.theme:eq(1)').attr('id')).toMatch /atom-dark-syntax/
+      expect($('style.theme:eq(0)').attr('id')).toMatch /atom-dark-syntax/
+      expect($('style.theme:eq(1)').attr('id')).toMatch /atom-light-syntax/
 
       config.set('core.themes', [])
       expect($('style.theme').length).toBe 0
diff --git a/src/theme-manager.coffee b/src/theme-manager.coffee
index 070b063cb..be3f39808 100644
--- a/src/theme-manager.coffee
+++ b/src/theme-manager.coffee
@@ -39,6 +39,11 @@ class ThemeManager
     config.observe 'core.themes', (themeNames) =>
       @unload()
       themeNames = [themeNames] unless _.isArray(themeNames)
+
+      # Reverse so the first (top) theme is loaded after the others. We want
+      # the first/top theme to override later themes in the stack.
+      (themeNames = _.clone(themeNames)).reverse()
+
       @activateTheme(themeName) for themeName in themeNames
       @loadUserStylesheet()