Merge pull request #3752 from ccordoba12/backport-3534

Backport pull request #3534 (Solarized themes)
spyder-ide · Nov 27, 2016 · 2d9212f · 2d9212f
2 parents cea8fce + 878aecd
commit 2d9212f
Showing 1 changed file with 44 additions and 5 deletions.
diff --git a/spyder/config/main.py b/spyder/config/main.py
@@ -422,7 +422,8 @@
             ('color_schemes',
              {
               'names': ['emacs', 'idle', 'monokai', 'pydev', 'scintilla',
-                        'spyder', 'spyder/dark', 'zenburn'],
+                        'spyder', 'spyder/dark', 'zenburn', 'solarized/light',
+                        'solarized/dark'],
               'selected': 'spyder',
               # ---- Emacs ----
               'emacs/name':        "Emacs",
@@ -505,7 +506,7 @@
               #         Name             Color     Bold  Italic
               'scintilla/background':  "#ffffff",
               'scintilla/currentline': "#e1f0d1",
-              'scintilla/currentcell': "#edfcdc",  
+              'scintilla/currentcell': "#edfcdc",
               'scintilla/occurrence':   "#ffff99",
               'scintilla/ctrlclick':   "#0000ff",
               'scintilla/sideareas':   "#efefef",
@@ -524,7 +525,7 @@
               #       Name            Color     Bold  Italic
               'spyder/background':  "#ffffff",
               'spyder/currentline': "#f7ecf8",
-              'spyder/currentcell': "#fdfdde",              
+              'spyder/currentcell': "#fdfdde",
               'spyder/occurrence':   "#ffff99",
               'spyder/ctrlclick':   "#0000ff",
               'spyder/sideareas':   "#efefef",
@@ -575,7 +576,45 @@
               'zenburn/comment':    ('#7f9f7f', False, True),
               'zenburn/string':     ('#cc9393', False, False),
               'zenburn/number':     ('#8cd0d3', False, False),
-              'zenburn/instance':   ('#dcdccc', False, True)
+              'zenburn/instance':   ('#dcdccc', False, True),
+              # ---- Solarized Light ----
+              'solarized/light/name':        "Solarized Light",
+              #        Name            Color     Bold  Italic
+              'solarized/light/background':  '#fdf6e3',
+              'solarized/light/currentline': '#f5efdB',
+              'solarized/light/currentcell': '#eee8d5',
+              'solarized/light/occurence':   '#839496',
+              'solarized/light/ctrlclick':   '#d33682',
+              'solarized/light/sideareas':   '#eee8d5',
+              'solarized/light/matched_p':   '#586e75',
+              'solarized/light/unmatched_p': '#dc322f',
+              'solarized/light/normal':     ('#657b83', False, False),
+              'solarized/light/keyword':    ('#859900', False, False),
+              'solarized/light/builtin':    ('#6c71c4', False, False),
+              'solarized/light/definition': ('#268bd2', True, False),
+              'solarized/light/comment':    ('#93a1a1', False, True),
+              'solarized/light/string':     ('#2aa198', False, False),
+              'solarized/light/number':     ('#cb4b16', False, False),
+              'solarized/light/instance':   ('#b58900', False, True),
+              # ---- Solarized Dark ----
+              'solarized/dark/name':        "Solarized Dark",
+              #        Name            Color     Bold  Italic
+              'solarized/dark/background':  '#002b36',
+              'solarized/dark/currentline': '#083f4d',
+              'solarized/dark/currentcell': '#073642',
+              'solarized/dark/occurence':   '#657b83',
+              'solarized/dark/ctrlclick':   '#d33682',
+              'solarized/dark/sideareas':   '#073642',
+              'solarized/dark/matched_p':   '#93a1a1',
+              'solarized/dark/unmatched_p': '#dc322f',
+              'solarized/dark/normal':     ('#839496', False, False),
+              'solarized/dark/keyword':    ('#859900', False, False),
+              'solarized/dark/builtin':    ('#6c71c4', False, False),
+              'solarized/dark/definition': ('#268bd2', True, False),
+              'solarized/dark/comment':    ('#586e75', False, True),
+              'solarized/dark/string':     ('#2aa198', False, False),
+              'solarized/dark/number':     ('#cb4b16', False, False),
+              'solarized/dark/instance':   ('#b58900', False, True)
              })
             ]
 
@@ -590,7 +629,7 @@
 #    or if you want to *rename* options, then you need to do a MAJOR update in
 #    version, e.g. from 3.0.0 to 4.0.0
 # 3. You don't need to touch this value if you're just adding a new option
-CONF_VERSION = '29.0.0'
+CONF_VERSION = '29.2.0'
 
 # Main configuration instance
 try: