Merge branch 'master' into webpack-frontend

3 files changed, 44 insertions, 54 deletions

diff --git a/public/vendor/codemirror/theme/panda-syntax.css b/public/vendor/codemirror/theme/panda-syntax.css
index 0e035003..8c0c7540 100644
--- a/public/vendor/codemirror/theme/panda-syntax.css
+++ b/public/vendor/codemirror/theme/panda-syntax.css
@@ -1,94 +1,85 @@
 /*
-
 	Name:       Panda Syntax
 	Author:     Siamak Mokhtari (http://github.com/siamak/)
-
 	CodeMirror template by Siamak Mokhtari (https://github.com/siamak/atom-panda-syntax)
-
 */
 .cm-s-panda-syntax {
-	/*font-family: 'Operator Mono', 'Source Sans Pro', Helvetica, Arial, sans-serif;*/
-	font-family: 'Operator Mono', 'Source Sans Pro', Menlo, Monaco, Consolas, Courier New, monospace;
 	background: #292A2B;
 	color: #E6E6E6;
+	line-height: 1.5;
+	font-family: 'Operator Mono', 'Source Sans Pro', Menlo, Monaco, Consolas, Courier New, monospace;
 }
+.cm-s-panda-syntax .CodeMirror-cursor { border-color: #ff2c6d; }
 .cm-s-panda-syntax .CodeMirror-activeline-background {
-	background: #404954;
+	background: rgba(99, 123, 156, 0.1);
+}
+.cm-s-panda-syntax .CodeMirror-selected {
+	background: #FFF;
 }
-
 .cm-s-panda-syntax .cm-comment {
 	font-style: italic;
 	color: #676B79;
 }
-.cm-s-panda-syntax .cm-string,
-.cm-s-panda-syntax .cm-string-2 {
+.cm-s-panda-syntax .cm-operator {
+	color: #f3f3f3;
+}
+.cm-s-panda-syntax .cm-string {
 	color: #19F9D8;
 }
+.cm-s-panda-syntax .cm-string-2 {
+    color: #FFB86C;
+}
+
+.cm-s-panda-syntax .cm-tag {
+	color: #ff2c6d;
+}
+.cm-s-panda-syntax .cm-meta {
+	color: #b084eb;
+}
+
 .cm-s-panda-syntax .cm-number {
 	color: #FFB86C;
 }
 .cm-s-panda-syntax .cm-atom {
-	color: #FFB86C;
+	color: #ff2c6d;
 }
-
 .cm-s-panda-syntax .cm-keyword {
 	color: #FF75B5;
 }
-.cm-s-panda-syntax .cm-keyword-2 {
-	color: #FF75B5;
-}
-.cm-s-panda-syntax .cm-keyword-3 {
-	color: #B084EB;
-}
-
 .cm-s-panda-syntax .cm-variable {
-	color: #FF9AC1;
+	color: #ffb86c;
 }
 .cm-s-panda-syntax .cm-variable-2 {
-	color: #e6e6e6;
+	color: #ff9ac1;
 }
 .cm-s-panda-syntax .cm-variable-3 {
-	color: #82B1FF;
+	color: #ff9ac1;
 }
 
 .cm-s-panda-syntax .cm-def {
-	/*font-style: italic;*/
 	color: #e6e6e6;
 }
-.cm-s-panda-syntax .cm-def-2 {
-	font-style: italic;
-	color: #ffcc95;
-}
-
-
 .cm-s-panda-syntax .cm-property {
-	color: #6FC1FF;
+	color: #f3f3f3;
 }
-
-.cm-s-panda-syntax .cm-matchingbracket,
-.CodeMirror .CodeMirror-matchingbracket {
-	color: #E6E6E6 !important;
-	border-bottom: 1px dotted #19f9d8;
-	padding-bottom: 2px;
+.cm-s-panda-syntax .cm-unit {
+    color: #ffb86c;
 }
 
-.cm-s-panda-syntax .CodeMirror-gutters {
-	background: #292A2B;
-	color: #757575;
-	border: none;
+.cm-s-panda-syntax .cm-attribute {
+    color: #ffb86c;
 }
-.cm-s-panda-syntax .CodeMirror-guttermarker, .cm-s-panda-syntax .CodeMirror-guttermarker-subtle, .cm-s-panda-syntax .CodeMirror-linenumber {
-	color: #757575;
+
+.cm-s-panda-syntax .CodeMirror-matchingbracket {
+    border-bottom: 1px dotted #19F9D8;
+    padding-bottom: 2px;
+    color: #e6e6e6;
 }
-.cm-s-panda-syntax .CodeMirror-linenumber {
-	padding-right: 10px;
+.CodeMirror-gutters {
+    background: #292a2b;
+    border-right-color: rgba(255, 255, 255, 0.1);
 }
-.cm-s-panda-syntax .CodeMirror-cursor {
-	border-left: 1px solid #757575;
+.CodeMirror-linenumber {
+    color: #e6e6e6;
+    opacity: 0.6;
 }
-/*.cm-s-panda-syntax div.CodeMirror-selected { background: rgba(255, 255, 255, 0.5); }*/
-.cm-s-panda-syntax.CodeMirror-focused div.CodeMirror-selected { background: rgba(255, 255, 255, 0.25); }
-.cm-s-panda-syntax .CodeMirror-line::selection, .cm-s-panda-syntax .CodeMirror-line > span::selection, .cm-s-panda-syntax .CodeMirror-line > span > span::selection { background: rgba(255, 255, 255, 0.10); }
-.cm-s-panda-syntax .CodeMirror-line::-moz-selection, .cm-s-panda-syntax .CodeMirror-line > span::-moz-selection, .cm-s-panda-syntax .CodeMirror-line > span > span::-moz-selection { background: rgba(255, 255, 255, 0.10); }
-
-.cm-s-panda-syntax .CodeMirror-activeline-background { background: rgba(99, 123, 156, 0.125); }
diff --git a/public/vendor/codemirror/theme/pastel-on-dark.css b/public/vendor/codemirror/theme/pastel-on-dark.css
index 71975092..2603d362 100644
--- a/public/vendor/codemirror/theme/pastel-on-dark.css
+++ b/public/vendor/codemirror/theme/pastel-on-dark.css
@@ -11,7 +11,6 @@
 	background: #2c2827;
 	color: #8F938F;
 	line-height: 1.5;
-	font-size: 14px;
 }
 .cm-s-pastel-on-dark div.CodeMirror-selected { background: rgba(221,240,255,0.2); }
 .cm-s-pastel-on-dark .CodeMirror-line::selection, .cm-s-pastel-on-dark .CodeMirror-line > span::selection, .cm-s-pastel-on-dark .CodeMirror-line > span > span::selection { background: rgba(221,240,255,0.2); }
diff --git a/public/vendor/codemirror/theme/solarized.css b/public/vendor/codemirror/theme/solarized.css
index 4b1e1630..1f39c7ed 100644
--- a/public/vendor/codemirror/theme/solarized.css
+++ b/public/vendor/codemirror/theme/solarized.css
@@ -155,8 +155,8 @@ http://ethanschoonover.com/solarized/img/solarized-palette.png
 .cm-s-solarized .CodeMirror-cursor { border-left: 1px solid #819090; }
 
 /* Fat cursor */
-.cm-s-solarized.cm-s-light.cm-fat-cursor .CodeMirror-cursor { background: #fdf6e3; }
-.cm-s-solarized.cm-s-light .cm-animate-fat-cursor { background-color: #fdf6e3; }
+.cm-s-solarized.cm-s-light.cm-fat-cursor .CodeMirror-cursor { background: #77ee77; }
+.cm-s-solarized.cm-s-light .cm-animate-fat-cursor { background-color: #77ee77; }
 .cm-s-solarized.cm-s-dark.cm-fat-cursor .CodeMirror-cursor { background: #586e75; }
 .cm-s-solarized.cm-s-dark .cm-animate-fat-cursor { background-color: #586e75; }