From b39936ea293b36b48b04ab03e9d6dffd38db0726 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 23 Sep 2013 12:13:42 -0700 Subject: [PATCH 01/26] Upgrade to snippets@0.5.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 42a11b9f1..894fc7c2b 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "metrics": "0.1.1", "package-generator": "0.7.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", From 137a84a6c53c311dc21809b5800a76ef0e890645 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 23 Sep 2013 12:07:09 -0700 Subject: [PATCH 02/26] Upgrade to telepath@0.4.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 894fc7c2b..9a63c8221 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "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", From 7370c5fccd311d92b6c56df57cd2c9be60eaf742 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 23 Sep 2013 15:05:13 -0700 Subject: [PATCH 03/26] Upgrade to package-generator@0.8.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9a63c8221..4f2e62357 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "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.5.0", "spell-check": "0.5.0", From 7faa50633e4c1f55ea0f7effed55260a07162f26 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 23 Sep 2013 16:05:28 -0700 Subject: [PATCH 04/26] Upgrade to github-sign-in@0.3.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4f2e62357..d59cf7262 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm": "0.4.0", "git-diff": "0.3.0", "gists": "0.2.0", - "github-sign-in": "0.2.0", + "github-sign-in": "0.3.0", "go-to-line": "0.3.0", "grammar-selector": "0.4.0", "image-view": "0.5.0", From 26811e62bbc36fbb6d48f07c1aea221c2c505971 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Sun, 22 Sep 2013 15:31:48 -0700 Subject: [PATCH 05/26] Add timecop@0.1.0 --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index d59cf7262..ab109650a 100644 --- a/package.json +++ b/package.json @@ -75,6 +75,7 @@ "symbols-view": "0.5.0", "tabs": "0.4.0", "terminal": "0.9.0", + "timecop": "0.1.0", "to-the-hubs": "0.3.0", "toml": "0.2.0", "tree-view": "0.5.0", From 461a271526fc7edaf73cc4169f3de2bf0e956327 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Sun, 22 Sep 2013 15:31:59 -0700 Subject: [PATCH 06/26] Prime require cache with atom exports --- src/atom.coffee | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/atom.coffee b/src/atom.coffee index 4e4f33add..3c5a17507 100644 --- a/src/atom.coffee +++ b/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 impacted by being the first to require atom + require '../exports/atom' + @loadPackage(name) for name in @getAvailablePackageNames() when not @isPackageDisabled(name) @watchThemes() From 4c2df6e2918284bde4d2910761b9e203230e2669 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Sun, 22 Sep 2013 15:34:18 -0700 Subject: [PATCH 07/26] :memo: Tweak wording in require comment --- src/atom.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/atom.coffee b/src/atom.coffee index 3c5a17507..63d395284 100644 --- a/src/atom.coffee +++ b/src/atom.coffee @@ -61,7 +61,7 @@ window.atom = loadPackages: -> # Ensure atom exports is already in the require cache so the load time - # of the first package isn't impacted by being the first to require atom + # 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) From 3b78fddc563f47fa4f2222e216a44daf069f01bb Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Sun, 22 Sep 2013 15:37:05 -0700 Subject: [PATCH 08/26] Upgrade to timecop@0.2.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ab109650a..59be2409f 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "symbols-view": "0.5.0", "tabs": "0.4.0", "terminal": "0.9.0", - "timecop": "0.1.0", + "timecop": "0.2.0", "to-the-hubs": "0.3.0", "toml": "0.2.0", "tree-view": "0.5.0", From a8595023c2c2370b4c47576d32ae0f450cec8325 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Mon, 23 Sep 2013 12:29:38 -0700 Subject: [PATCH 09/26] Move some panel styles into core --- static/panels.less | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/static/panels.less b/static/panels.less index 89cd59bce..ea842dc7d 100644 --- a/static/panels.less +++ b/static/panels.less @@ -7,7 +7,33 @@ 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; + } +} + +.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; } } From 82fcada49eff7e2891c759f237282a3c36d656bc Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Mon, 23 Sep 2013 12:31:43 -0700 Subject: [PATCH 10/26] fix blocks for lists --- static/utilities.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/static/utilities.less b/static/utilities.less index e4c176576..74b0bc030 100644 --- a/static/utilities.less +++ b/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; } From 0e6e34cdbff025c4f3da37d8cd055db9ccdba288 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Mon, 23 Sep 2013 13:37:25 -0700 Subject: [PATCH 11/26] Use ui-demo 0.7.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 59be2409f..971402b6b 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "to-the-hubs": "0.3.0", "toml": "0.2.0", "tree-view": "0.5.0", - "ui-demo": "0.6.0", + "ui-demo": "0.7.0", "whitespace": "0.4.0", "wrap-guide": "0.2.0", From 347b1924cdfcbc118e6812c178dafc86213dfce5 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Mon, 23 Sep 2013 15:01:08 -0700 Subject: [PATCH 12/26] Add font-family to ui-variables --- .../stylesheets/ui-variables.less | 2 ++ .../stylesheets/ui-variables.less | 2 ++ static/root-view.less | 11 +++++++++++ static/variables/ui-variables.less | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/spec/fixtures/packages/theme-with-multiple-imported-files/stylesheets/ui-variables.less b/spec/fixtures/packages/theme-with-multiple-imported-files/stylesheets/ui-variables.less index 54a75946c..9cefd6823 100644 --- a/spec/fixtures/packages/theme-with-multiple-imported-files/stylesheets/ui-variables.less +++ b/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; diff --git a/spec/fixtures/packages/theme-with-ui-variables/stylesheets/ui-variables.less b/spec/fixtures/packages/theme-with-ui-variables/stylesheets/ui-variables.less index 54a75946c..9cefd6823 100644 --- a/spec/fixtures/packages/theme-with-ui-variables/stylesheets/ui-variables.less +++ b/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; diff --git a/static/root-view.less b/static/root-view.less index f145292fb..5e8fbe2ed 100644 --- a/static/root-view.less +++ b/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; diff --git a/static/variables/ui-variables.less b/static/variables/ui-variables.less index 2eade0921..34304de8c 100644 --- a/static/variables/ui-variables.less +++ b/static/variables/ui-variables.less @@ -77,3 +77,8 @@ @component-border-radius: 2px; @tab-height: 30px; + + +// Other + +@font-family: 'Lucida Grande', Arial, sans-serif; From d35aa2b0219acd5fdf22f758b3e452d19dc8dd5c Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Mon, 23 Sep 2013 15:05:01 -0700 Subject: [PATCH 13/26] Center the mini editors --- static/editor.less | 1 + 1 file changed, 1 insertion(+) diff --git a/static/editor.less b/static/editor.less index 912f9503d..f218c7978 100644 --- a/static/editor.less +++ b/static/editor.less @@ -178,5 +178,6 @@ .scroll-view { overflow: hidden; + top: 1px; } } From 4b4f9f753fc6bddf47750ed769bbb540c436a526 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Mon, 23 Sep 2013 15:29:50 -0700 Subject: [PATCH 14/26] Add .focusable-panel class --- static/panels.less | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/static/panels.less b/static/panels.less index ea842dc7d..deb76e871 100644 --- a/static/panels.less +++ b/static/panels.less @@ -20,6 +20,13 @@ } } +.focusable-panel { + opacity: 0.8; + &:focus { + opacity: 1; + } +} + .panel-heading { margin: 0; From 0e94468e6efcbf3693f69b0e7b51a31696a66ec7 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Mon, 23 Sep 2013 15:32:37 -0700 Subject: [PATCH 15/26] Remove scroll-view offset It is overridden by something in js --- static/editor.less | 1 - 1 file changed, 1 deletion(-) diff --git a/static/editor.less b/static/editor.less index f218c7978..912f9503d 100644 --- a/static/editor.less +++ b/static/editor.less @@ -178,6 +178,5 @@ .scroll-view { overflow: hidden; - top: 1px; } } From d1e2c5ff821f4d40841eb054da77de98c0f48bc8 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Mon, 23 Sep 2013 16:08:59 -0700 Subject: [PATCH 16/26] Use find-and-replace v0.6.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 971402b6b..b8c4b982b 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "command-logger": "0.3.0", "command-palette": "0.3.0", "editor-stats": "0.2.0", - "find-and-replace": "0.5.0", + "find-and-replace": "0.6.0", "fuzzy-finder": "0.5.0", "gfm": "0.4.0", "git-diff": "0.3.0", From 8880c32c00c91402d5e9c7214acccd4679f5f6da Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Mon, 23 Sep 2013 16:11:04 -0700 Subject: [PATCH 17/26] Upgrade to v0.2.0 of light-ui --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b8c4b982b..3ac3bcba0 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "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-syntax": "0.2.0", From 1ceaa0ceca9387cb11d4070d82987668ae9b1d1d Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Mon, 23 Sep 2013 16:12:36 -0700 Subject: [PATCH 18/26] Upgrade to v0.2.0 of dark ui theme --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3ac3bcba0..861be16b2 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "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", From 2e7a86144e933149584f63eb761ebdbeeda63c94 Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Mon, 23 Sep 2013 16:14:22 -0700 Subject: [PATCH 19/26] Upgrade to v0.6.0 of tree view --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 861be16b2..919b666f3 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "timecop": "0.2.0", "to-the-hubs": "0.3.0", "toml": "0.2.0", - "tree-view": "0.5.0", + "tree-view": "0.6.0", "ui-demo": "0.7.0", "whitespace": "0.4.0", "wrap-guide": "0.2.0", From f5a034f38ab2a35a98076e1e9dc285d19175119e Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 23 Sep 2013 16:31:13 -0700 Subject: [PATCH 20/26] Add API for configuring default events for non-editor windows Used by collaboration for when joining fails but basic keybindings and events should still work. --- src/window.coffee | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/window.coffee b/src/window.coffee index c1dcf8142..309eadbcc 100644 --- a/src/window.coffee +++ b/src/window.coffee @@ -41,6 +41,16 @@ 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. +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() From 36345185b5d8742c8487af6f3fa56e97c6a96397 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 23 Sep 2013 16:34:29 -0700 Subject: [PATCH 21/26] :memo: Mention calling after setUpEnvironment --- src/window.coffee | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/window.coffee b/src/window.coffee index 309eadbcc..337a3704b 100644 --- a/src/window.coffee +++ b/src/window.coffee @@ -46,6 +46,8 @@ window.setUpEnvironment = (windowMode) -> # # 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() From 869fe71f7302c5101bb52743ce8d90e97baeb2b9 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 23 Sep 2013 16:44:59 -0700 Subject: [PATCH 22/26] Accept timeout option to waitsForPromise --- spec/spec-helper.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee index 1bb8d1104..aa5590a25 100644 --- a/spec/spec-helper.coffee +++ b/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) From 19635c160d9d12ca6fcf4dfd16ecf38b983264f4 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 23 Sep 2013 16:48:14 -0700 Subject: [PATCH 23/26] Upgrade to find-and-replace@0.7.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 919b666f3..408a4b49a 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "command-logger": "0.3.0", "command-palette": "0.3.0", "editor-stats": "0.2.0", - "find-and-replace": "0.6.0", + "find-and-replace": "0.7.0", "fuzzy-finder": "0.5.0", "gfm": "0.4.0", "git-diff": "0.3.0", From 49cc27527da341ea2c5cce80c6ede0715b9fefd9 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 23 Sep 2013 17:34:22 -0700 Subject: [PATCH 24/26] Upgrade to github-sign-in@0.4.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 408a4b49a..b62c2ceef 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm": "0.4.0", "git-diff": "0.3.0", "gists": "0.2.0", - "github-sign-in": "0.3.0", + "github-sign-in": "0.4.0", "go-to-line": "0.3.0", "grammar-selector": "0.4.0", "image-view": "0.5.0", From ef3ccc992b857b72cd296adbd207422475efb0b3 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 23 Sep 2013 18:01:12 -0700 Subject: [PATCH 25/26] Upgrade to find-and-replace@0.8.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b62c2ceef..66a1c7f52 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "command-logger": "0.3.0", "command-palette": "0.3.0", "editor-stats": "0.2.0", - "find-and-replace": "0.7.0", + "find-and-replace": "0.8.0", "fuzzy-finder": "0.5.0", "gfm": "0.4.0", "git-diff": "0.3.0", From a47743e18e79bb96b4516477a4ce8fa8d24c9cc8 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 23 Sep 2013 18:09:03 -0700 Subject: [PATCH 26/26] Upgrade to find-and-replace@0.9.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 66a1c7f52..6ca42d28e 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "command-logger": "0.3.0", "command-palette": "0.3.0", "editor-stats": "0.2.0", - "find-and-replace": "0.8.0", + "find-and-replace": "0.9.0", "fuzzy-finder": "0.5.0", "gfm": "0.4.0", "git-diff": "0.3.0",