diff options
| author | Eric Guzman | 2012-03-12 15:33:04 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-03-12 15:33:04 -0700 |
| commit | 7e3161153b87b891875ac65368a19aed12909fa3 (patch) | |
| tree | b80f48d711a9729fc39dbbdff28c4f0620e7302d /imports/codemirror/theme/monokai.css | |
| parent | 7a28932ba8a7517bbaaabe1f5edf678416aafc9c (diff) | |
| parent | 69d90467865a1384725b2301901be2180c5a841f (diff) | |
| download | ninja-7e3161153b87b891875ac65368a19aed12909fa3.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
Diffstat (limited to 'imports/codemirror/theme/monokai.css')
| -rw-r--r--[-rwxr-xr-x] | imports/codemirror/theme/monokai.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/theme/monokai.css b/imports/codemirror/theme/monokai.css index 470d4c5c..f01d066f 100755..100644 --- a/imports/codemirror/theme/monokai.css +++ b/imports/codemirror/theme/monokai.css | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* Based on Sublime Text's Monokai theme */ | 1 | /* Based on Sublime Text's Monokai theme */ |
| 2 | 2 | ||
| 3 | .cm-s-monokai {background: #272822; color: #f8f8f2;} | 3 | .cm-s-monokai {background: #272822; color: #f8f8f2;} |
| 4 | .cm-s-monokai span.CodeMirror-selected {background: #ffe792 !important;} | 4 | .cm-s-monokai div.CodeMirror-selected {background: #49483E !important;} |
| 5 | .cm-s-monokai .CodeMirror-gutter {background: #272822; border-right: 0px;} | 5 | .cm-s-monokai .CodeMirror-gutter {background: #272822; border-right: 0px;} |
| 6 | .cm-s-monokai .CodeMirror-gutter-text {color: #d0d0d0;} | 6 | .cm-s-monokai .CodeMirror-gutter-text {color: #d0d0d0;} |
| 7 | .cm-s-monokai .CodeMirror-cursor {border-left: 1px solid #f8f8f0 !important;} | 7 | .cm-s-monokai .CodeMirror-cursor {border-left: 1px solid #f8f8f0 !important;} |