Merge pull request donnemartin#54 from donnemartin/develop

Update to latest prompt-toolkit v1.0.0
Cloudxtreme · May 29, 2016 · 0ad4dff · 0ad4dff
2 parents 46d0870 + 203c804
commit 0ad4dff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/setup.py b/setup.py
@@ -101,7 +101,7 @@ def main():
         skw['install_requires'] = [
             'numpydoc>=0.5,<1.0',
             'ply>=3.4,<4.0',
-            'prompt-toolkit==0.52',
+            'prompt-toolkit>=1.0.0,<1.1.0',
             'requests>=2.8.1,<3.0.0',
             'colorama>=0.3.3,<1.0.0',
             'click>=5.1,<7.0',

diff --git a/xonsh/prompt_toolkit_shell.py b/xonsh/prompt_toolkit_shell.py
@@ -104,6 +104,8 @@ class CustomStyle(Style):
                 Token.Menu.Completions.ProgressButton: 'bg:#003333',
                 Token.Menu.Completions.ProgressBar: 'bg:#00aaaa',
                 Token.Toolbar: 'bg:#222222 #cccccc',
+                Token.Scrollbar: 'bg:#00aaaa',
+                Token.Scrollbar.Button: 'bg:#003333',
                 Token.Toolbar.Off: 'bg:#222222 #696969',
                 Token.Toolbar.On: 'bg:#222222 #ffffff',
                 Token.Toolbar.Search: 'noinherit bold',