Merge pull request #518 in VISUAL/fineui from ~LEI.WANG/fineui:master to master

* commit '4004c58e49b20c462c7444bda605a60c2c8bf8d1': BI-24359 按照视觉要求修改rlanguage的编辑框背景颜色
6 years ago · dbf25992f7
7 changed files with 13 additions and 18 deletions
--- a/dist/base.css
+++ b/dist/base.css
@ -252,8 +252,7 @@
 }
 /* GUTTER */
 .CodeMirror-gutters {
-  border-right: 1px solid #ddd;
-  background-color: #f7f7f7;
+  background-color: #F2F4F7;
  white-space: nowrap;
 }
 .CodeMirror-linenumber {
@ -631,7 +630,7 @@ div.CodeMirror-cursors {
  background: #d9d9d9;
 }
 .CodeMirror-focused .CodeMirror-selected {
-  background: #d7d4f0;
+  background: #3685F2;
 }
 .CodeMirror-crosshair {
  cursor: crosshair;
--- a/dist/bundle.css
+++ b/dist/bundle.css
@ -2092,8 +2092,7 @@ textarea {
 }
 /* GUTTER */
 .CodeMirror-gutters {
-  border-right: 1px solid #ddd;
-  background-color: #f7f7f7;
+  background-color: #F2F4F7;
  white-space: nowrap;
 }
 .CodeMirror-linenumber {
@ -2471,7 +2470,7 @@ div.CodeMirror-cursors {
  background: #d9d9d9;
 }
 .CodeMirror-focused .CodeMirror-selected {
-  background: #d7d4f0;
+  background: #3685F2;
 }
 .CodeMirror-crosshair {
  cursor: crosshair;
--- a/dist/bundle.min.css
+++ b/dist/bundle.min.css
--- a/dist/fineui.css
+++ b/dist/fineui.css
@ -2092,8 +2092,7 @@ textarea {
 }
 /* GUTTER */
 .CodeMirror-gutters {
-  border-right: 1px solid #ddd;
-  background-color: #f7f7f7;
+  background-color: #F2F4F7;
  white-space: nowrap;
 }
 .CodeMirror-linenumber {
@ -2471,7 +2470,7 @@ div.CodeMirror-cursors {
  background: #d9d9d9;
 }
 .CodeMirror-focused .CodeMirror-selected {
-  background: #d7d4f0;
+  background: #3685F2;
 }
 .CodeMirror-crosshair {
  cursor: crosshair;
--- a/dist/fineui.min.css
+++ b/dist/fineui.min.css
--- a/src/css/base/formula/codemirror.css
+++ b/src/css/base/formula/codemirror.css
@ -22,8 +22,7 @@
 }
 /* GUTTER */
 .CodeMirror-gutters {
-  border-right: 1px solid #ddd;
-  background-color: #f7f7f7;
+  background-color: #F2F4F7;
  white-space: nowrap;
 }
 .CodeMirror-linenumber {
@ -401,7 +400,7 @@ div.CodeMirror-cursors {
  background: #d9d9d9;
 }
 .CodeMirror-focused .CodeMirror-selected {
-  background: #d7d4f0;
+  background: #3685F2;
 }
 .CodeMirror-crosshair {
  cursor: crosshair;
--- a/src/less/base/formula/codemirror.less
+++ b/src/less/base/formula/codemirror.less
@ -27,8 +27,7 @@
 /* GUTTER */

 .CodeMirror-gutters {
-  border-right: 1px solid #ddd;
-  background-color: #f7f7f7;
+  background-color: #F2F4F7;
  white-space: nowrap;
 }

@ -496,7 +495,7 @@ div.CodeMirror-cursors {
 }

 .CodeMirror-focused .CodeMirror-selected {
-  background: #d7d4f0;
+  background: #3685F2;
 }

 .CodeMirror-crosshair {
@ -585,4 +584,4 @@ span.CodeMirror-selectedtext {
 li.CodeMirror-hint-active {
  background: #08f;
  color: white;
-}
+}