Merge remote-tracking branch 'sirianni/patch-1'

* sirianni/patch-1:
  Highlight this keyword in javascript

Closes joaoafrmartins/seti-monokai#19.

diff --git a/.npmignore b/.npmignore
deleted file mode 100644 (file)
index c8f50f7..0000000
--- a/.npmignore
+++ /dev/null
@@ -1 +0,0 @@
-npm-debug.log

diff --git a/README.md b/README.md
index 45d634c091dd9e5f51049065e590742f22cb7904..2acf1b8391c318b92fc25bbbf9113e2c1e8e22e3 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,7 +1,12 @@
-# Monokai theme
+# AX Monokai theme
 
-A monokai syntax theme for Atom.
+A Monokai syntax theme for the Atom editor.
 
+Maintainer: [Alex Barton](https://github.com/alexbarton), <alex@barton.de>;
+Project Home: [GitHub](https://github.com/alexbarton/atom-ax-monokai-syntax).
+
+Based on the [seti-monokai](https://github.com/joaoafrmartins/seti-monokai)
+theme of [João Afonso Martins](https://github.com/joaoafrmartins).
 Originally converted from the [TextMate](http://www.monokai.nl/blog/wp-content/asdev/Monokai.tmTheme)
 theme using the [TextMate bundle converter](http://atom.io/docs/latest/converting-a-text-mate-theme).
 

diff --git a/index.less b/index.less
index a0ffd1203833df065b1207813ac47d73880ab2cf..e367da22b64430634291b94034d45fda2df812d3 100644 (file)
--- a/index.less
+++ b/index.less
@@ -1,11 +1,9 @@
-@import 'syntax-variables';
+@import './styles/syntax-variables';
 
-.editor-colors {
+:host, atom-text-editor {
   background-color: @syntax-background-color;
   color: @syntax-text-color;
-}
 
-.editor {
   .invisible-character {
     color: @syntax-invisible-character-color;
   }

diff --git a/package.json b/package.json
index 497723f06d8da06a902c3d9380492842b4fad826..203b389323022ab583955dafb1b2af4441952ff9 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,23 +1,19 @@
 {
-  "name": "seti-monokai",
+  "name": "ax-monokai-syntax",
   "theme": "syntax",
-  "version": "0.3.1",
-  "private": true,
-  "description": "A monokai theme for the seti ui",
+  "version": "0.0.1",
+  "description": "A Monokai theme for the Atom editor (SETI UI)",
   "license": "MIT",
   "engines": {
-    "atom": ">0.39.0"
+    "atom": ">0.174.0 <2.0.0"
   },
   "keywords": [
     "monokai",
-    "seti-ui"
+    "seti-ui",
+    "syntax",
+    "theme"
   ],
-  "homepage": "https://github.com/joaoafrmartins/seti-monokai",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/joaoafrmartins/seti-monokai.git"
-  },
-  "bugs": {
-    "url": "https://github.com/joaoafrmartins/seti-monokai/issues"
-  }
+  "homepage": "https://github.com/alexbarton/atom-ax-monokai-syntax",
+  "repository": "https://github.com/alexbarton/atom-ax-monokai-syntax.git",
+  "bugs": "https://github.com/alexbarton/atom-ax-monokai-syntax/issues"
 }

diff --git a/styles/syntax-variables.less b/styles/syntax-variables.less
new file mode 100644 (file)
index 0000000..9039608
--- /dev/null
+++ b/styles/syntax-variables.less
@@ -0,0 +1,26 @@
+// General colors
+@syntax-text-color: #F8F8F2;
+@syntax-cursor-color: #F8F8F0;
+@syntax-selection-color: #49483E;
+@syntax-background-color: #1D1F21;
+
+// Guide colors
+@syntax-wrap-guide-color: #3D3D3D;
+@syntax-indent-guide-color: #3D3D3D;
+@syntax-invisible-character-color: #3D3D3D;
+
+// For find and replace markers
+@syntax-result-marker-color: #888;
+@syntax-result-marker-color-selected: white;
+
+// Gutter colors
+@syntax-gutter-text-color: @syntax-text-color;
+@syntax-gutter-text-color-selected: @syntax-gutter-text-color;
+@syntax-gutter-background-color: lighten(@syntax-background-color, 3%);
+@syntax-gutter-background-color-selected: @syntax-selection-color;
+
+// For git diff info. i.e. in the gutter
+@syntax-color-renamed: #ffd569;
+@syntax-color-added: #529b2f;
+@syntax-color-modified: #E6DB74;
+@syntax-color-removed: #F92672;

diff --git a/stylesheets/syntax-variables.less b/stylesheets/syntax-variables.less
deleted file mode 100644 (file)
index 9039608..0000000
--- a/stylesheets/syntax-variables.less
+++ /dev/null
@@ -1,26 +0,0 @@
-// General colors
-@syntax-text-color: #F8F8F2;
-@syntax-cursor-color: #F8F8F0;
-@syntax-selection-color: #49483E;
-@syntax-background-color: #1D1F21;
-
-// Guide colors
-@syntax-wrap-guide-color: #3D3D3D;
-@syntax-indent-guide-color: #3D3D3D;
-@syntax-invisible-character-color: #3D3D3D;
-
-// For find and replace markers
-@syntax-result-marker-color: #888;
-@syntax-result-marker-color-selected: white;
-
-// Gutter colors
-@syntax-gutter-text-color: @syntax-text-color;
-@syntax-gutter-text-color-selected: @syntax-gutter-text-color;
-@syntax-gutter-background-color: lighten(@syntax-background-color, 3%);
-@syntax-gutter-background-color-selected: @syntax-selection-color;
-
-// For git diff info. i.e. in the gutter
-@syntax-color-renamed: #ffd569;
-@syntax-color-added: #529b2f;
-@syntax-color-modified: #E6DB74;
-@syntax-color-removed: #F92672;