From adb3b390bb4357fe56060eae8d4463652375bc0d Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 3 Feb 2014 10:53:53 -0800 Subject: [PATCH 01/11] Upgrade to atom-dark-syntax@0.13.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 894cf0b35..8856acb1a 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "vm-compatibility-layer": "0.1.0" }, "packageDependencies": { - "atom-dark-syntax": "0.12.0", + "atom-dark-syntax": "0.13.0", "atom-dark-ui": "0.21.0", "atom-light-syntax": "0.12.0", "atom-light-ui": "0.20.0", From b9c14379beb043ebd6c2434a205863423e61ae57 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 3 Feb 2014 10:54:45 -0800 Subject: [PATCH 02/11] Upgrade to atom-light-syntax@0.13.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8856acb1a..32d13e857 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "packageDependencies": { "atom-dark-syntax": "0.13.0", "atom-dark-ui": "0.21.0", - "atom-light-syntax": "0.12.0", + "atom-light-syntax": "0.13.0", "atom-light-ui": "0.20.0", "base16-tomorrow-dark-theme": "0.10.0", "solarized-dark-syntax": "0.8.0", From c0d564b635ef5305e775013343ee32c13cbe7f9d Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 3 Feb 2014 10:58:51 -0800 Subject: [PATCH 03/11] Upgrade to atom-dark-ui@0.22.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 32d13e857..4ae6683cb 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ }, "packageDependencies": { "atom-dark-syntax": "0.13.0", - "atom-dark-ui": "0.21.0", + "atom-dark-ui": "0.22.0", "atom-light-syntax": "0.13.0", "atom-light-ui": "0.20.0", "base16-tomorrow-dark-theme": "0.10.0", From 49313b65b9372b1a920d6e795552dc5cfc207027 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 3 Feb 2014 10:59:48 -0800 Subject: [PATCH 04/11] Upgrade to atom-light-ui@0.21.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4ae6683cb..eb6e5b1cf 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "atom-dark-syntax": "0.13.0", "atom-dark-ui": "0.22.0", "atom-light-syntax": "0.13.0", - "atom-light-ui": "0.20.0", + "atom-light-ui": "0.21.0", "base16-tomorrow-dark-theme": "0.10.0", "solarized-dark-syntax": "0.8.0", "solarized-light-syntax": "0.4.0", From 86f1a484a80625dc9fd4b401bc83a0e29321a9a5 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 3 Feb 2014 11:00:47 -0800 Subject: [PATCH 05/11] Upgrade to solarized-dark-syntax@0.9.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eb6e5b1cf..1da83cc31 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "atom-light-syntax": "0.13.0", "atom-light-ui": "0.21.0", "base16-tomorrow-dark-theme": "0.10.0", - "solarized-dark-syntax": "0.8.0", + "solarized-dark-syntax": "0.9.0", "solarized-light-syntax": "0.4.0", "archive-view": "0.21.0", "autocomplete": "0.21.0", From 25f97b5ef3808f47f95abdf9e43f9f55c1dfedec Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 3 Feb 2014 11:01:50 -0800 Subject: [PATCH 06/11] Upgrade to solarized-light-syntax@0.5.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1da83cc31..65a2102db 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "atom-light-ui": "0.21.0", "base16-tomorrow-dark-theme": "0.10.0", "solarized-dark-syntax": "0.9.0", - "solarized-light-syntax": "0.4.0", + "solarized-light-syntax": "0.5.0", "archive-view": "0.21.0", "autocomplete": "0.21.0", "autoflow": "0.12.0", From b82c808badb3e1074236120e2efc961345589953 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 3 Feb 2014 11:04:07 -0800 Subject: [PATCH 07/11] Upgrade to base16-tomorrow-dark-theme@0.11.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 65a2102db..4d9090af8 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "atom-dark-ui": "0.22.0", "atom-light-syntax": "0.13.0", "atom-light-ui": "0.21.0", - "base16-tomorrow-dark-theme": "0.10.0", + "base16-tomorrow-dark-theme": "0.11.0", "solarized-dark-syntax": "0.9.0", "solarized-light-syntax": "0.5.0", "archive-view": "0.21.0", From 217fd8e271f81e96f04a22e112ae6f45b0787df6 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 3 Feb 2014 11:12:43 -0800 Subject: [PATCH 08/11] Check for non-null theme value --- src/package.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.coffee b/src/package.coffee index ca4450bc6..2c4eb9043 100644 --- a/src/package.coffee +++ b/src/package.coffee @@ -54,7 +54,7 @@ class Package atom.config.pushAtKeyPath('core.disabledPackages', @metadata.name) isTheme: -> - !!@metadata?.theme + @metadata?.theme? # Private: measure: (key, fn) -> From c225d180ba3c4f7c464cc8caf242583e07787a39 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 3 Feb 2014 11:15:31 -0800 Subject: [PATCH 09/11] Set fixture theme types to "ui" --- spec/fixtures/packages/theme-with-index-css/package.json | 2 +- spec/fixtures/packages/theme-with-index-less/package.json | 2 +- .../packages/theme-with-multiple-imported-files/package.json | 2 +- spec/fixtures/packages/theme-with-package-file/package.json | 2 +- spec/fixtures/packages/theme-with-ui-variables/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spec/fixtures/packages/theme-with-index-css/package.json b/spec/fixtures/packages/theme-with-index-css/package.json index a4dc0188d..16e770b05 100644 --- a/spec/fixtures/packages/theme-with-index-css/package.json +++ b/spec/fixtures/packages/theme-with-index-css/package.json @@ -1,3 +1,3 @@ { - "theme": true + "theme": "ui" } diff --git a/spec/fixtures/packages/theme-with-index-less/package.json b/spec/fixtures/packages/theme-with-index-less/package.json index a4dc0188d..16e770b05 100644 --- a/spec/fixtures/packages/theme-with-index-less/package.json +++ b/spec/fixtures/packages/theme-with-index-less/package.json @@ -1,3 +1,3 @@ { - "theme": true + "theme": "ui" } diff --git a/spec/fixtures/packages/theme-with-multiple-imported-files/package.json b/spec/fixtures/packages/theme-with-multiple-imported-files/package.json index a4dc0188d..16e770b05 100644 --- a/spec/fixtures/packages/theme-with-multiple-imported-files/package.json +++ b/spec/fixtures/packages/theme-with-multiple-imported-files/package.json @@ -1,3 +1,3 @@ { - "theme": true + "theme": "ui" } diff --git a/spec/fixtures/packages/theme-with-package-file/package.json b/spec/fixtures/packages/theme-with-package-file/package.json index b429a1151..a5e06495a 100644 --- a/spec/fixtures/packages/theme-with-package-file/package.json +++ b/spec/fixtures/packages/theme-with-package-file/package.json @@ -1,4 +1,4 @@ { - "theme": true, + "theme": "ui", "stylesheets": ["first.css", "second.less", "last.css"] } diff --git a/spec/fixtures/packages/theme-with-ui-variables/package.json b/spec/fixtures/packages/theme-with-ui-variables/package.json index fa1446fd6..047ee57c9 100644 --- a/spec/fixtures/packages/theme-with-ui-variables/package.json +++ b/spec/fixtures/packages/theme-with-ui-variables/package.json @@ -1,4 +1,4 @@ { - "theme": true, + "theme": "ui", "stylesheets": ["editor.less"] } From 8d0ddc051323d131d964fa22c1f47516e98f2d50 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 3 Feb 2014 11:15:59 -0800 Subject: [PATCH 10/11] Upgrade to settings-view@0.64.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4d9090af8..94a73828d 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "metrics": "0.24.0", "package-generator": "0.25.0", "release-notes": "0.17.0", - "settings-view": "0.63.0", + "settings-view": "0.64.0", "snippets": "0.24.0", "spell-check": "0.21.0", "status-bar": "0.32.0", From e23fb98a4166fea6965ebc7189a8e28233dcad4f Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 3 Feb 2014 11:27:45 -0800 Subject: [PATCH 11/11] Upgrade apm for template updates --- vendor/apm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/apm b/vendor/apm index 490e9aee6..97ca21abb 160000 --- a/vendor/apm +++ b/vendor/apm @@ -1 +1 @@ -Subproject commit 490e9aee661b20728f3681a225ef322bf3fbb4eb +Subproject commit 97ca21abb99e8201b57bbda226f6aff67b8cfd20