Merge pull request #4807 from atom/sm-icons

Icon refresh

build/tasks/build-task.coffee

@@ -25,7 +25,6 @@ module.exports = (grunt) ->
       cp 'atom.sh', path.join(appDir, 'atom.sh')
 
     cp 'package.json', path.join(appDir, 'package.json')
-    cp path.join('resources', 'atom.png'), path.join(appDir, 'atom.png')
 
     packageDirectories = []
     nonPackageDirectories = [
@@ -72,6 +71,7 @@ module.exports = (grunt) ->
       path.join('build', 'Release', 'obj')
       path.join('build', 'Release', '.deps')
       path.join('vendor', 'apm')
+      path.join('resources', 'linux')
       path.join('resources', 'mac')
       path.join('resources', 'win')
 

build/tasks/publish-build-task.coffee

@@ -157,7 +157,7 @@ createAtomDraftRelease = (callback) ->
       body: """
         ### Notable Changes
 
-        *
+        * Something new
       """
 
   request options, (error, response, body='') ->

docs/creating-a-package.md

@@ -123,8 +123,8 @@ like you.
 
 Style sheets for your package should be placed in the _stylesheets_ directory.
 Any style sheets in this directory will be loaded and attached to the DOM when
-your package is activated. Style sheets can be written as CSS or [LESS] (but
-LESS is recommended).
+your package is activated. Style sheets can be written as CSS or [LESS], but
+LESS is recommended.
 
 Ideally, you won't need much in the way of styling. We've provided a standard
 set of components which define both the colors and UI elements for any package
@@ -418,7 +418,7 @@ all the other available commands.
 [underscore]: http://underscorejs.org/
 [jasmine]: http://jasmine.github.io
 [cson]: https://github.com/atom/season
-[less]: http://lesscss.org
+[LESS]: http://lesscss.org
 [ui-variables]: https://github.com/atom/atom-dark-ui/blob/master/stylesheets/ui-variables.less
 [first-package]: your-first-package.html
 [convert-bundle]: converting-a-text-mate-bundle.html

docs/creating-a-theme.md

@@ -1,8 +1,8 @@
 # Creating a Theme
 
-Atom's interface is rendered using HTML, and it's styled via [LESS] (a superset
-of CSS). Don't worry if you haven't heard of LESS before; it's just like CSS,
-but with a few handy extensions.
+Atom's interface is rendered using HTML, and it's styled via [LESS] which is a
+superset of CSS. Don't worry if you haven't heard of LESS before; it's just like
+CSS, but with a few handy extensions.
 
 Atom supports two types of themes: _UI_ and _syntax_.  UI themes style
 elements such as the tree view, the tabs, drop-down lists, and the status bar.
@@ -131,7 +131,7 @@ _styleguide_, or use the shortcut `cmd-ctrl-shift-g`.
 ![styleguide-img]
 
 [atomio]: http://atom.io/packages
-[less]: http://lesscss.org/
+[LESS]: http://lesscss.org/
 [git]: http://git-scm.com/
 [atom]: https://atom.io/
 [package.json]: ./creating-a-package.html#package-json

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom",
   "productName": "Atom",
-  "version": "0.167.0",
+  "version": "0.169.0",
   "description": "A hackable text editor for the 21st Century.",
   "main": "./src/browser/main.js",
   "repository": {
@@ -17,7 +17,7 @@
       "url": "http://github.com/atom/atom/raw/master/LICENSE.md"
     }
   ],
-  "atomShellVersion": "0.20.4",
+  "atomShellVersion": "0.20.5",
   "dependencies": {
     "async": "0.2.6",
     "atom-keymap": "^2.3.3",
@@ -72,7 +72,7 @@
     "atom-light-syntax": "0.24.0",
     "atom-light-ui": "0.36.0",
     "base16-tomorrow-dark-theme": "0.23.0",
-    "base16-tomorrow-light-theme": "0.5.0",
+    "base16-tomorrow-light-theme": "0.6.0",
     "solarized-dark-syntax": "0.30.0",
     "solarized-light-syntax": "0.17.0",
     "archive-view": "0.43.0",
@@ -102,7 +102,7 @@
     "open-on-github": "0.31.0",
     "package-generator": "0.36.0",
     "release-notes": "0.45.0",
-    "settings-view": "0.164.0",
+    "settings-view": "0.166.0",
     "snippets": "0.66.0",
     "spell-check": "0.49.0",
     "status-bar": "0.56.0",
@@ -119,7 +119,7 @@
     "language-clojure": "0.10.0",
     "language-coffee-script": "0.39.0",
     "language-css": "0.26.0",
-    "language-gfm": "0.58.0",
+    "language-gfm": "0.59.0",
     "language-git": "0.10.0",
     "language-go": "0.20.0",
     "language-html": "0.28.0",

src/browser/auto-update-manager.coffee

@@ -89,7 +89,7 @@ class AutoUpdateManager
     dialog.showMessageBox
       type: 'info'
       buttons: ['OK']
-      icon: path.join(process.resourcesPath, 'app', 'atom.png')
+      icon: path.resolve(__dirname, '..', '..', 'resources', 'atom.png')
       message: 'No update available.'
       title: 'No Update Available'
       detail: "Version #{@version} is the latest version."
@@ -100,7 +100,7 @@ class AutoUpdateManager
     dialog.showMessageBox
       type: 'warning'
       buttons: ['OK']
-      icon: path.join(process.resourcesPath, 'app', 'atom.png')
+      icon: path.resolve(__dirname, '..', '..', 'resources', 'atom.png')
       message: 'There was an error checking for updates.'
       title: 'Update Error'
       detail: message

src/package-manager.coffee

@@ -48,7 +48,7 @@ class PackageManager
   Section: Event Subscription
   ###
 
-  # Public: Invoke the given callback when all packages have been activated.
+  # Public: Invoke the given callback when all packages have been loaded.
   #
   # * `callback` {Function}
   #

src/workspace.coffee

@@ -823,7 +823,7 @@ class Workspace extends Model
     task = Task.once require.resolve('./scan-handler'), atom.project.getPaths()[0], regex.source, searchOptions, ->
       deferred.resolve()
 
-    task.on 'scan:result-found', (result) =>
+    task.on 'scan:result-found', (result) ->
       iterator(result) unless atom.project.isPathModified(result.filePath)
 
     task.on 'scan:file-error', (error) ->

static/panes.less

@@ -33,14 +33,17 @@ atom-pane-container {
       min-width: 0;
       position: relative;
 
+      .pane-item {
+        color: @text-color;
+        background-color: @pane-item-background-color;
+      }
+
       > *, > atom-text-editor.react > * {
         position: absolute;
         top: 0;
         right: 0;
         bottom: 0;
         left: 0;
-        color: @text-color;
-        background-color: @pane-item-background-color;
       }
     }
   }