From c078f64293dde4410a4ed81a412bfa050b250a9e Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Fri, 9 Jan 2015 08:37:24 -0800
Subject: [PATCH] Rename package `stylesheets/` directory to `styles/`

---
 src/package.coffee       | 10 ++++++----
 src/theme-manager.coffee |  6 +++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/package.coffee b/src/package.coffee
index 175485328..7f95a7443 100644
--- a/src/package.coffee
+++ b/src/package.coffee
@@ -23,8 +23,6 @@ module.exports =
 class Package
   EmitterMixin.includeInto(this)
 
-  @stylesheetsDir: 'stylesheets'
-
   @isBundledPackagePath: (packagePath) ->
     if atom.packages.devMode
       return false unless atom.packages.resourcePath.startsWith("#{process.resourcesPath}#{path.sep}")
@@ -233,7 +231,11 @@ class Package
       [stylesheetPath, atom.themes.loadStylesheet(stylesheetPath, true)]
 
   getStylesheetsPath: ->
-    path.join(@path, @constructor.stylesheetsDir)
+    if fs.isDirectorySync(path.join(@path, 'stylesheets'))
+      deprecate("Store package style sheets in the `styles/` directory instead of `stylesheets/`", packageName: @name)
+      path.join(@path, 'stylesheets')
+    else
+      path.join(@path, 'styles')
 
   getStylesheetPaths: ->
     stylesheetDirPath = @getStylesheetsPath()
@@ -299,7 +301,7 @@ class Package
 
     if fs.isDirectorySync(path.join(@path, 'scoped-properties'))
       settingsDirPath = path.join(@path, 'scoped-properties')
-      deprecate("Store package settings files in the `settings` directory instead of `scoped-properties`", packageName: @name)
+      deprecate("Store package settings files in the `settings/` directory instead of `scoped-properties/`", packageName: @name)
     else
       settingsDirPath = path.join(@path, 'settings')
 
diff --git a/src/theme-manager.coffee b/src/theme-manager.coffee
index cec36657d..23ef0ef69 100644
--- a/src/theme-manager.coffee
+++ b/src/theme-manager.coffee
@@ -372,6 +372,10 @@ class ThemeManager
       themePaths = []
       for themeName in @getEnabledThemeNames()
         if themePath = @packageManager.resolvePackagePath(themeName)
-          themePaths.push(path.join(themePath, Package.stylesheetsDir))
+          deprecatedPath = path.join(themePath, 'stylesheets')
+          if fs.isDirectorySync(deprecatedPath)
+            themePaths.push(deprecatedPath)
+          else
+            themePaths.push(path.join(themePath, 'styles'))
 
     themePaths.filter (themePath) -> fs.isDirectorySync(themePath)