Skip to content

Commit

Permalink
Merge fron 3.x: PR #3752
Browse files Browse the repository at this point in the history
  • Loading branch information
ccordoba12 committed Nov 27, 2016
2 parents 6879c5a + 2d9212f commit 4d95eba
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions spyder/config/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,8 @@
('color_schemes',
{
'names': ['emacs', 'idle', 'monokai', 'pydev', 'scintilla',
'spyder', 'spyder/dark', 'zenburn', 'solarized/light', 'solarized/dark'],
'spyder', 'spyder/dark', 'zenburn', 'solarized/light',
'solarized/dark'],
'selected': 'spyder',
# ---- Emacs ----
'emacs/name': "Emacs",
Expand Down Expand Up @@ -578,7 +579,7 @@
'solarized/light/name': "Solarized Light",
# Name Color Bold Italic
'solarized/light/background': '#fdf6e3',
'solarized/light/currentline': '#eee8d5',
'solarized/light/currentline': '#f5efdB',
'solarized/light/currentcell': '#eee8d5',
'solarized/light/occurence': '#839496',
'solarized/light/ctrlclick': '#d33682',
Expand All @@ -597,7 +598,7 @@
'solarized/dark/name': "Solarized Dark",
# Name Color Bold Italic
'solarized/dark/background': '#002b36',
'solarized/dark/currentline': '#073642',
'solarized/dark/currentline': '#083f4d',
'solarized/dark/currentcell': '#073642',
'solarized/dark/occurence': '#657b83',
'solarized/dark/ctrlclick': '#d33682',
Expand Down Expand Up @@ -626,7 +627,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 = '30.0.0'
CONF_VERSION = '30.1.0'

# Main configuration instance
try:
Expand Down

0 comments on commit 4d95eba

Please sign in to comment.