Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js

7 files changed, 4 insertions, 4 deletions

diff --git a/imports/codemirror/theme/cobalt.css b/imports/codemirror/theme/cobalt.css
index a6842a40..dbbb7e49 100755..100644
--- a/imports/codemirror/theme/cobalt.css
+++ b/imports/codemirror/theme/cobalt.css
@@ -1,5 +1,5 @@
 .cm-s-cobalt { background: #002240; color: white; }
-.cm-s-cobalt span.CodeMirror-selected { background: #b36539 !important; }
+.cm-s-cobalt div.CodeMirror-selected { background: #b36539 !important; }
 .cm-s-cobalt .CodeMirror-gutter { background: #002240; border-right: 1px solid #aaa; }
 .cm-s-cobalt .CodeMirror-gutter-text { color: #d0d0d0; }
 .cm-s-cobalt .CodeMirror-cursor { border-left: 1px solid white !important; }
diff --git a/imports/codemirror/theme/eclipse.css b/imports/codemirror/theme/eclipse.css
index 41f6fcbd..41f6fcbd 100755..100644
--- a/imports/codemirror/theme/eclipse.css
+++ b/imports/codemirror/theme/eclipse.css
diff --git a/imports/codemirror/theme/elegant.css b/imports/codemirror/theme/elegant.css
index 29afa982..29afa982 100755..100644
--- a/imports/codemirror/theme/elegant.css
+++ b/imports/codemirror/theme/elegant.css
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 @@
 /* Based on Sublime Text's Monokai theme */
 
 .cm-s-monokai {background: #272822; color: #f8f8f2;}
-.cm-s-monokai span.CodeMirror-selected {background: #ffe792 !important;}
+.cm-s-monokai div.CodeMirror-selected {background: #49483E !important;}
 .cm-s-monokai .CodeMirror-gutter {background: #272822; border-right: 0px;}
 .cm-s-monokai .CodeMirror-gutter-text {color: #d0d0d0;}
 .cm-s-monokai .CodeMirror-cursor {border-left: 1px solid #f8f8f0 !important;}
diff --git a/imports/codemirror/theme/neat.css b/imports/codemirror/theme/neat.css
index 6d2dbf5f..6d2dbf5f 100755..100644
--- a/imports/codemirror/theme/neat.css
+++ b/imports/codemirror/theme/neat.css
diff --git a/imports/codemirror/theme/night.css b/imports/codemirror/theme/night.css
index f86c70ea..3b296e4a 100755..100644
--- a/imports/codemirror/theme/night.css
+++ b/imports/codemirror/theme/night.css
@@ -1,7 +1,7 @@
 /* Loosely based on the Midnight Textmate theme */
 
 .cm-s-night { background: #0a001f; color: #f8f8f8; }
-.cm-s-night span.CodeMirror-selected { background: #a8f !important; }
+.cm-s-night div.CodeMirror-selected { background: #a8f !important; }
 .cm-s-night .CodeMirror-gutter { background: #0a001f; border-right: 1px solid #aaa; }
 .cm-s-night .CodeMirror-gutter-text { color: #f8f8f8; }
 .cm-s-night .CodeMirror-cursor { border-left: 1px solid white !important; }
diff --git a/imports/codemirror/theme/rubyblue.css b/imports/codemirror/theme/rubyblue.css
index c7127550..3c67762b 100755..100644
--- a/imports/codemirror/theme/rubyblue.css
+++ b/imports/codemirror/theme/rubyblue.css
@@ -1,7 +1,7 @@
 .cm-s-rubyblue { font:13px/1.4em Trebuchet, Verdana, sans-serif; }      /* - customized editor font - */
 
 .cm-s-rubyblue { background: #112435; color: white; }
-.cm-s-rubyblue span.CodeMirror-selected { background: #0000FF !important; }
+.cm-s-rubyblue div.CodeMirror-selected { background: #38566F !important; }
 .cm-s-rubyblue .CodeMirror-gutter { background: #1F4661; border-right: 7px solid #3E7087; min-width:2.5em; }
 .cm-s-rubyblue .CodeMirror-gutter-text { color: white; }
 .cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white !important; }