Merge branches 'fix-editor-classes' and 'fix-stylesheets-dir' into tmp

* fix-editor-classes:
  Use "atom-text-editor" tag instead of "editor[-colors]" classes

* fix-stylesheets-dir:
  Rename "stylesheets/" directory to "styles/"

diff --git a/index.less b/index.less
index 324f8a50ccffe26f828f0bf59a36924f07a1c86d..ce4401c2755835dba144ad5c81e16e828bcc6fdf 100644 (file)
--- a/index.less
+++ b/index.less
@@ -1,4 +1,4 @@
-@import 'syntax-variables';
+@import './styles/syntax-variables';
 
 :host, atom-text-editor {
   background-color: @syntax-background-color;

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;