Merge branch 'master' into exception-reporting

Conflicts:
	package.json

package.json

@@ -35,13 +35,13 @@
     "semver": "1.1.4",
     "space-pen": "1.2.0",
     "tantamount": "0.3.0",
-    "telepath": "0.1.2",
+    "telepath": "0.4.0",
     "temp": "0.5.0",
     "underscore": "1.4.4",
 
-    "atom-light-ui": "0.1.1",
+    "atom-light-ui": "0.2.0",
     "atom-light-syntax": "0.2.0",
-    "atom-dark-ui": "0.1.1",
+    "atom-dark-ui": "0.2.0",
     "atom-dark-syntax": "0.2.0",
     "base16-tomorrow-dark-theme": "0.1.0",
     "solarized-dark-syntax": "0.1.0",
@@ -56,30 +56,31 @@
     "command-palette": "0.3.0",
     "editor-stats": "0.2.0",
     "exception-reporting": "0.1.0",
-    "find-and-replace": "0.5.0",
+    "find-and-replace": "0.9.0",
     "fuzzy-finder": "0.5.0",
     "gfm": "0.4.0",
     "git-diff": "0.3.0",
     "gists": "0.2.0",
-    "github-sign-in": "0.2.0",
+    "github-sign-in": "0.4.0",
     "go-to-line": "0.3.0",
     "grammar-selector": "0.4.0",
     "image-view": "0.5.0",
     "link": "0.2.0",
     "markdown-preview": "0.3.0",
     "metrics": "0.1.1",
-    "package-generator": "0.7.0",
+    "package-generator": "0.8.0",
     "settings-view": "0.22.0",
-    "snippets": "0.4.0",
+    "snippets": "0.5.0",
     "spell-check": "0.5.0",
     "status-bar": "0.7.0",
     "symbols-view": "0.5.0",
     "tabs": "0.4.0",
     "terminal": "0.9.0",
+    "timecop": "0.2.0",
     "to-the-hubs": "0.3.0",
     "toml": "0.2.0",
-    "tree-view": "0.5.0",
-    "ui-demo": "0.6.0",
+    "tree-view": "0.6.0",
+    "ui-demo": "0.7.0",
     "whitespace": "0.4.0",
     "wrap-guide": "0.2.0",
 

spec/fixtures/packages/theme-with-multiple-imported-files/stylesheets/ui-variables.less

@@ -71,3 +71,5 @@
 @component-border-radius: 2px;
 
 @tab-height: 30px;
+
+@font-family: Arial;

spec/fixtures/packages/theme-with-ui-variables/stylesheets/ui-variables.less

@@ -71,3 +71,5 @@
 @component-border-radius: 2px;
 
 @tab-height: 30px;
+
+@font-family: Arial;

spec/spec-helper.coffee

@@ -160,12 +160,12 @@ window.mousemoveEvent = (properties={}) ->
 
 window.waitsForPromise = (args...) ->
   if args.length > 1
-    { shouldReject } = args[0]
+    { shouldReject, timeout } = args[0]
   else
     shouldReject = false
   fn = _.last(args)
 
-  window.waitsFor (moveOn) ->
+  window.waitsFor timeout, (moveOn) ->
     promise = fn()
     if shouldReject
       promise.fail(moveOn)

src/atom.coffee

@@ -60,6 +60,10 @@ window.atom =
     _.values(@activePackages)
 
   loadPackages: ->
+    # Ensure atom exports is already in the require cache so the load time
+    # of the first package isn't skewed by being the first to require atom
+    require '../exports/atom'
+
     @loadPackage(name) for name in @getAvailablePackageNames() when not @isPackageDisabled(name)
     @watchThemes()
 

src/window.coffee

@@ -41,6 +41,18 @@ window.setUpEnvironment = (windowMode) ->
   window.pasteboard = new Pasteboard
   window.keymap = new Keymap()
 
+
+# Set up the default event handlers and menus for a non-editor windows.
+#
+# This can be used by packages to have a minimum level of keybindings and
+# menus available when not using the standard editor window.
+#
+# This should only be called after setUpEnvironment() has been called.
+window.setUpDefaultEvents = ->
+  windowEventHandler = new WindowEventHandler
+  keymap.loadBundledKeymaps()
+  ipc.sendChannel 'update-application-menu', keymap.keystrokesByCommandForSelector('body')
+
 # This method is only called when opening a real application window
 window.startEditorWindow = ->
   installAtomCommand()

static/panels.less

@@ -7,7 +7,40 @@
   background-color: transparent;
   box-shadow: none;
 
-  .panel-heading {
-    border-radius: 0;
+  &.bordered {
+    .panel-heading {
+      border-radius: @component-border-radius @component-border-radius 0 0;
+    }
+  }
+}
+
+.inset-panel {
+  .panel-heading {
+    border-radius: @component-border-radius @component-border-radius 0 0;
+  }
+}
+
+.focusable-panel {
+  opacity: 0.8;
+  &:focus {
+    opacity: 1;
+  }
+}
+
+.panel-heading {
+  margin: 0;
+
+  border-radius: 0;
+
+  font-size: @font-size;
+  line-height: 1;
+
+  .btn {
+    @btn-height: @component-line-height - 5px;
+    height: @btn-height;
+    line-height: @btn-height;
+    font-size: @font-size - 2px;
+    position: relative;
+    top: -5px;
   }
 }

static/root-view.less

@@ -8,6 +8,16 @@ body {
   width: 100%;
   height: 100%;
   overflow: hidden;
+  font-family: @font-family;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  font-family: @font-family;
 }
 
 #root-view {
@@ -15,6 +25,7 @@ body {
   overflow: hidden;
   position: relative;
   background-color: @app-background-color;
+  font-family: @font-family;
 
   #horizontal {
     display: -webkit-flex;

static/utilities.less

@@ -16,9 +16,11 @@
 // Blocks
 
 // Must be div.block so as not to affect syntax highlighting.
+ul.block,
 div.block {
   margin-bottom: @component-padding;
 }
+div > ul.block:last-child,
 div > div.block:last-child {
   margin-bottom: 0;
 }

static/variables/ui-variables.less

@@ -77,3 +77,8 @@
 @component-border-radius: 2px;
 
 @tab-height: 30px;
+
+
+// Other
+
+@font-family: 'Lucida Grande', Arial, sans-serif;