Merge pull request daylerees#197 from arminrosu/master

Update Atom Syntax to Atom 1.0 API
wxb · Apr 16, 2016 · 734e7aa · 734e7aa
2 parents 6e170d1 + a37a241
commit 734e7aa
Show file tree

Hide file tree

Showing 10 changed files with 224 additions and 156 deletions.
diff --git a/README.md b/README.md
@@ -8,6 +8,7 @@ Oh also, I'm British. I'm not making a spelling mistake. It is COLOUR. With the
 
 This package currently supports colour schemes for:
 
+- [Atom](http://www.atom.io/) (2 & 3)
 - [Sublime Text](http://www.sublimetext.com/) (2 & 3)
 - [Sublime Text UI](http://www.sublimetext.com/) (2 & 3)
 - [Textmate](http://macromates.com/) (Use sublime schemes)
@@ -47,6 +48,18 @@ Xcode                                      | 90%
 
 Installation of the colour schemes depends greatly upon the type of software that you intend to use them with. Here are the guides for common editors and libraries.
 
+* [Atom](#atom)
+* [Bootstrap](#bootstrap)
+* [Coda 2](#coda-2)
+* [HighlightJS](#highlightjs)
+* [IntelliJ](#intellij)
+* [Sublime Text](#sublime-text)
+* [Sublime UI Themes](#sublime-ui-themes)
+* [TextMate 1.5.x](#textmate-15x)
+* [Textmate 2](#textmate-2)
+* [VIM](#vim)
+* [Xcode Colour Schemes](#xcode-colour-schemes)
+
 ### Sublime Text
 
 With the Sublime Text editor the themes can be installed using [Package Control](http://wbond.net/sublime_packages/package_control). Simply install the `Dayle Rees Color Schemes` package from the official repository.

diff --git a/build/resources/patterns/atom/atom.json b/build/resources/patterns/atom/atom.json
@@ -3,17 +3,35 @@
     "directory":       "atom",
 
     "templates": [
+	    {
+            "file":         "package.pattern",
+            "name":         "%theme.slug%-syntax/package",
+            "directory":    "",
+            "extension":    ".json"
+        },
         {
-            "file":         "style.pattern",
-            "name":         "%theme.slug%/index",
+            "file":         "index.pattern",
+            "name":         "%theme.slug%-syntax/index",
             "directory":    "",
             "extension":    ".less"
         },
         {
-            "file":         "package.pattern",
-            "name":         "%theme.slug%/package",
+            "file":         "base.pattern",
+            "name":         "%theme.slug%-syntax/styles/base",
             "directory":    "",
-            "extension":    ".json"
+            "extension":    ".less"
+        },
+        {
+            "file":         "colors.pattern",
+            "name":         "%theme.slug%-syntax/styles/colors",
+            "directory":    "",
+            "extension":    ".less"
+        },
+        {
+            "file":         "syntax-variables.pattern",
+            "name":         "%theme.slug%-syntax/styles/syntax-variables",
+            "directory":    "",
+            "extension":    ".less"
         }
     ]
 }
diff --git a/build/resources/patterns/atom/base.pattern b/build/resources/patterns/atom/base.pattern
@@ -0,0 +1,126 @@
+@import "syntax-variables";
+
+atom-text-editor, :host {
+	background-color: {{ background }};
+	color: {{ foreground }};
+
+	.invisible-character,
+	.indent-guide {
+		color: {{ line_highlight }};
+	}
+
+	.gutter {
+		background-color: {{ background }};
+	}
+
+	.gutter .line-number {
+		opacity: 0.3;
+	}
+
+	.gutter .line-number.folded,
+	.gutter .line-number:after,
+	.fold-marker:after {
+		color: {{ second }};
+	}
+
+	.cursor {
+		border-color: {{ caret }};
+	}
+
+	.selection .region {
+		background-color: {{ selection_background }};
+		color: {{ selection_foreground }};
+	}
+
+	.line-number.cursor-line-no-selection {
+		background-color: {{ line_highlight }};
+	}
+}
+
+.bracket-matcher {
+	background-color: {{ second }};
+	opacity: 0.4;
+}
+
+.comment {
+	color: {{ comment }};
+}
+
+.entity {
+	color: {{ third }};
+}
+
+.entity.name.type.class {
+	color: {{ foreground }};
+}
+
+.keyword {
+	color: {{ fourth }};
+}
+
+.storage.type {
+	color: {{ first }};
+}
+
+.storage.modifier {
+	color: {{ second }};
+}
+
+.constant {
+	color: {{ second }};
+
+	&.numeric,
+	&.boolean {
+		color: {{ number }};
+	}
+}
+
+.variable {
+	color: {{ foreground }};
+}
+
+.delimiter, .brace {
+	color: {{ foreground }};
+}
+
+.delimiter.period {
+	color: {{ second }};
+}
+
+.invalid.deprecated {
+	text-decoration: underline;
+	color: @red;
+}
+
+.invalid.illegal {
+	color: @red;
+}
+
+.string {
+	color: {{ string }};
+
+	.constant.character.escape {
+		color: @red;
+	}
+
+	&.regexp {
+		color: {{ number }};
+
+		.source.ruby.embedded,
+		.string.regexp.arbitrary-repitition {
+			color: @red;
+		}
+	}
+}
+
+.keyword.other.phpdoc {
+	color: {{ docblock }};
+}
+
+.entity.name.tag {
+	color: {{ first }};
+}
+
+.entity.other.attribute-name {
+	color: {{ second }};
+}
diff --git a/build/resources/patterns/atom/colors.pattern b/build/resources/patterns/atom/colors.pattern
@@ -0,0 +1,17 @@
+@base03: {{ background }};
+@base02: #073642;
+@base01: #586e75;
+@base00: #657b83;
+@base0: #839496;
+@base1: #93a1a1;
+@base2: #eee8d5;
+@base3: #fdf6e3;
+
+@yellow: #b58900;
+@orange: #cb4b16;
+@red: #dc322f;
+@magenta: #d33682;
+@violet: #6c71c4;
+@blue: #268bd2;
+@cyan: #2aa198;
+@green: #859900;
diff --git a/build/resources/patterns/atom/index.pattern b/build/resources/patterns/atom/index.pattern
@@ -0,0 +1 @@
+@import "./styles/base.less";
diff --git a/build/resources/patterns/atom/package.pattern b/build/resources/patterns/atom/package.pattern
@@ -1,12 +1,16 @@
 {
-  "name": "{{ theme.name }}",
+  "name": "{{ theme.slug }}-syntax",
   "theme": "syntax",
   "version": "1.0.0",
   "private": false,
   "description": "Theme by Dayle Rees.",
+  "keywords": [
+    "syntax",
+    "theme"
+  ],
   "repository": "https://github.com/daylerees/colour-schemes",
   "license": "MIT",
   "engines": {
-    "atom": ">0.50.0"
+    "atom": ">=1.0.0 <2.0.0"
   }
 }
diff --git a/build/resources/patterns/atom/style.pattern b/build/resources/patterns/atom/style.pattern