Merge pull request #23 from Jan200101/PR/subl

Differenciate between Monokai themes

5 files changed, 91 insertions, 34 deletions

diff --git a/colors/monokai-sublime.lua b/colors/monokai-sublime.lua
new file mode 100644
index 0000000..254416a
--- /dev/null
+++ b/colors/monokai-sublime.lua
@@ -0,0 +1,28 @@
+local style = require "core.style"
+local common = require "core.common"
+
+style.background = { common.color "#282923" }
+style.background2 = { common.color "#181915" }
+style.background3 = { common.color "#181915" }
+style.text = { common.color "#9EA191" }
+style.caret = { common.color "#FDFDFC" }
+style.accent = { common.color "#F8F8F2" }
+style.dim = { common.color "#5E6052" }
+style.divider = { common.color "#1B1C17" }
+style.selection = { common.color "#4C4B41" }
+style.line_number = { common.color "#90918B" }
+style.line_number2 = { common.color "#D2D0C6" }
+style.line_highlight = { common.color "#282923" }
+style.scrollbar = { common.color "#53534F" }
+style.scrollbar2 = { common.color "#53534F" }
+
+style.syntax["normal"] = { common.color "#F8F8F2" }
+style.syntax["symbol"] = { common.color "#F8F8F2" }
+style.syntax["comment"] = { common.color "#74705D" }
+style.syntax["keyword"] = { common.color "#F92472" }
+style.syntax["keyword2"] = { common.color "#F92472" }
+style.syntax["number"] = { common.color "#AC80FF" }
+style.syntax["literal"] = { common.color "#E7DB74" }
+style.syntax["string"] = { common.color "#E7DB74" }
+style.syntax["operator"] = { common.color "#F92472" }
+style.syntax["function"] = { common.color "#67D8EF" }
diff --git a/colors/monokai.lua b/colors/monokai.lua
index bbd8d47..9e45f90 100644
--- a/colors/monokai.lua
+++ b/colors/monokai.lua
@@ -1,28 +1,28 @@
 local style = require "core.style"
 local common = require "core.common"
 
-style.background = { common.color "#282923" }
+style.background = { common.color "#272822" }
 style.background2 = { common.color "#181915" }
 style.background3 = { common.color "#181915" }
-style.text = { common.color "#9ea191" }
-style.caret = { common.color "#f8f8f2" }
-style.accent = { common.color "#f8f8f2" }
-style.dim = { common.color "#5e6052" }
-style.divider = { common.color "#1b1c17" }
-style.selection = { common.color "#3a3a32" }
-style.line_number = { common.color "#90918b" }
-style.line_number2 = { common.color "#d2d0c6" }
-style.line_highlight = { common.color "#282923" }
-style.scrollbar = { common.color "#63635f" }
-style.scrollbar2 = { common.color "#3d3d38" }
+style.text = { common.color "#9EA191" }
+style.caret = { common.color "#F8F8F0" }
+style.accent = { common.color "#F8F8F2" }
+style.dim = { common.color "#5E6052" }
+style.divider = { common.color "#181915" }
+style.selection = { common.color "#49483E" }
+style.line_number = { common.color "#90918B" }
+style.line_number2 = { common.color "#D2D0C6" }
+style.line_highlight = { common.color "#49483E" }
+style.scrollbar = { common.color "#53534F" }
+style.scrollbar2 = { common.color "#53534F" }
 
-style.syntax["normal"] = { common.color "#f8f8f2" }
-style.syntax["symbol"] = { common.color "#f8f8f2" }
+style.syntax["normal"] = { common.color "#F8F8F2" }
+style.syntax["symbol"] = { common.color "#F8F8F2" }
 style.syntax["comment"] = { common.color "#75715E" }
-style.syntax["keyword"] = { common.color "#f92472" }
-style.syntax["keyword2"] = { common.color "#f92472" }
-style.syntax["number"] = { common.color "#ac80ff" }
-style.syntax["literal"] = { common.color "#e7db74" }
-style.syntax["string"] = { common.color "#e7db74" }
-style.syntax["operator"] = { common.color "#f92472" }
-style.syntax["function"] = { common.color "#5cd5ef" }
+style.syntax["keyword"] = { common.color "#F92672" }
+style.syntax["keyword2"] = { common.color "#F92672" }
+style.syntax["number"] = { common.color "#AE81FF" }
+style.syntax["literal"] = { common.color "#E6DB74" }
+style.syntax["string"] = { common.color "#E6DB74" }
+style.syntax["operator"] = { common.color "#F92472" }
+style.syntax["function"] = { common.color "#A6E22E" }
diff --git a/manifest.json b/manifest.json
index bfb83c1..049745d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -245,6 +245,17 @@
          "version" : "0.1"
       },
       {
+         "id" : "monokai-sublime",
+         "mod_version" : "3.0.0",
+         "name" : "monokai-sublime",
+         "path" : "colors/monokai-sublime.lua",
+         "tags" : [
+            "dark"
+         ],
+         "type" : "color",
+         "version" : "0.1"
+      },
+      {
          "id" : "monokai-pro-classic",
          "mod_version" : "3.0.0",
          "name" : "monokai-pro-classic",
diff --git a/previews/monokai-sublime.svg b/previews/monokai-sublime.svg
new file mode 100644
index 0000000..ea25ed2
--- /dev/null
+++ b/previews/monokai-sublime.svg
@@ -0,0 +1,18 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="16" shape-rendering="crispEdges"> 
+<rect x="0.0" width="12.5" height="16" fill="rgb(24, 25, 21)"></rect> 
+<rect x="12.5" width="12.5" height="16" fill="rgb(27, 28, 23)"></rect> 
+<rect x="25.0" width="12.5" height="16" fill="rgb(40, 41, 35)"></rect> 
+<rect x="37.5" width="12.5" height="16" fill="rgb(76, 75, 65)"></rect> 
+<rect x="50.0" width="12.5" height="16" fill="rgb(83, 83, 79)"></rect> 
+<rect x="62.5" width="12.5" height="16" fill="rgb(94, 96, 82)"></rect> 
+<rect x="75.0" width="12.5" height="16" fill="rgb(116, 112, 93)"></rect> 
+<rect x="87.5" width="12.5" height="16" fill="rgb(249, 36, 114)"></rect> 
+<rect x="100.0" width="12.5" height="16" fill="rgb(144, 145, 139)"></rect> 
+<rect x="112.5" width="12.5" height="16" fill="rgb(158, 161, 145)"></rect> 
+<rect x="125.0" width="12.5" height="16" fill="rgb(172, 128, 255)"></rect> 
+<rect x="137.5" width="12.5" height="16" fill="rgb(103, 216, 239)"></rect> 
+<rect x="150.0" width="12.5" height="16" fill="rgb(231, 219, 116)"></rect> 
+<rect x="162.5" width="12.5" height="16" fill="rgb(210, 208, 198)"></rect> 
+<rect x="175.0" width="12.5" height="16" fill="rgb(248, 248, 242)"></rect> 
+<rect x="187.5" width="12.5" height="16" fill="rgb(253, 253, 252)"></rect> 
+</svg>
\ No newline at end of file
diff --git a/previews/monokai.svg b/previews/monokai.svg
index 5b44f9f..e1d4e34 100644
--- a/previews/monokai.svg
+++ b/previews/monokai.svg
@@ -1,18 +1,18 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="16" shape-rendering="crispEdges"> 
 <rect x="0.0" width="12.5" height="16" fill="rgb(24, 25, 21)"></rect> 
-<rect x="12.5" width="12.5" height="16" fill="rgb(27, 28, 23)"></rect> 
-<rect x="25.0" width="12.5" height="16" fill="rgb(40, 41, 35)"></rect> 
-<rect x="37.5" width="12.5" height="16" fill="rgb(58, 58, 50)"></rect> 
-<rect x="50.0" width="12.5" height="16" fill="rgb(61, 61, 56)"></rect> 
-<rect x="62.5" width="12.5" height="16" fill="rgb(94, 96, 82)"></rect> 
-<rect x="75.0" width="12.5" height="16" fill="rgb(99, 99, 95)"></rect> 
-<rect x="87.5" width="12.5" height="16" fill="rgb(117, 113, 94)"></rect> 
-<rect x="100.0" width="12.5" height="16" fill="rgb(249, 36, 114)"></rect> 
-<rect x="112.5" width="12.5" height="16" fill="rgb(144, 145, 139)"></rect> 
+<rect x="12.5" width="12.5" height="16" fill="rgb(39, 40, 34)"></rect> 
+<rect x="25.0" width="12.5" height="16" fill="rgb(73, 72, 62)"></rect> 
+<rect x="37.5" width="12.5" height="16" fill="rgb(83, 83, 79)"></rect> 
+<rect x="50.0" width="12.5" height="16" fill="rgb(94, 96, 82)"></rect> 
+<rect x="62.5" width="12.5" height="16" fill="rgb(117, 113, 94)"></rect> 
+<rect x="75.0" width="12.5" height="16" fill="rgb(249, 36, 114)"></rect> 
+<rect x="87.5" width="12.5" height="16" fill="rgb(249, 38, 114)"></rect> 
+<rect x="100.0" width="12.5" height="16" fill="rgb(144, 145, 139)"></rect> 
+<rect x="112.5" width="12.5" height="16" fill="rgb(166, 226, 46)"></rect> 
 <rect x="125.0" width="12.5" height="16" fill="rgb(158, 161, 145)"></rect> 
-<rect x="137.5" width="12.5" height="16" fill="rgb(92, 213, 239)"></rect> 
-<rect x="150.0" width="12.5" height="16" fill="rgb(172, 128, 255)"></rect> 
-<rect x="162.5" width="12.5" height="16" fill="rgb(231, 219, 116)"></rect> 
-<rect x="175.0" width="12.5" height="16" fill="rgb(210, 208, 198)"></rect> 
+<rect x="137.5" width="12.5" height="16" fill="rgb(174, 129, 255)"></rect> 
+<rect x="150.0" width="12.5" height="16" fill="rgb(230, 219, 116)"></rect> 
+<rect x="162.5" width="12.5" height="16" fill="rgb(210, 208, 198)"></rect> 
+<rect x="175.0" width="12.5" height="16" fill="rgb(248, 248, 240)"></rect> 
 <rect x="187.5" width="12.5" height="16" fill="rgb(248, 248, 242)"></rect> 
 </svg>
\ No newline at end of file