Browse Source

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

* commit '4004c58e49b20c462c7444bda605a60c2c8bf8d1':
  BI-24359 按照视觉要求修改rlanguage的编辑框背景颜色
es6
lei.wang 7 years ago
parent
commit
dbf25992f7
  1. 5
      dist/base.css
  2. 5
      dist/bundle.css
  3. 2
      dist/bundle.min.css
  4. 5
      dist/fineui.css
  5. 2
      dist/fineui.min.css
  6. 5
      src/css/base/formula/codemirror.css
  7. 7
      src/less/base/formula/codemirror.less

5
dist/base.css vendored

@ -252,8 +252,7 @@
} }
/* GUTTER */ /* GUTTER */
.CodeMirror-gutters { .CodeMirror-gutters {
border-right: 1px solid #ddd; background-color: #F2F4F7;
background-color: #f7f7f7;
white-space: nowrap; white-space: nowrap;
} }
.CodeMirror-linenumber { .CodeMirror-linenumber {
@ -631,7 +630,7 @@ div.CodeMirror-cursors {
background: #d9d9d9; background: #d9d9d9;
} }
.CodeMirror-focused .CodeMirror-selected { .CodeMirror-focused .CodeMirror-selected {
background: #d7d4f0; background: #3685F2;
} }
.CodeMirror-crosshair { .CodeMirror-crosshair {
cursor: crosshair; cursor: crosshair;

5
dist/bundle.css vendored

@ -2092,8 +2092,7 @@ textarea {
} }
/* GUTTER */ /* GUTTER */
.CodeMirror-gutters { .CodeMirror-gutters {
border-right: 1px solid #ddd; background-color: #F2F4F7;
background-color: #f7f7f7;
white-space: nowrap; white-space: nowrap;
} }
.CodeMirror-linenumber { .CodeMirror-linenumber {
@ -2471,7 +2470,7 @@ div.CodeMirror-cursors {
background: #d9d9d9; background: #d9d9d9;
} }
.CodeMirror-focused .CodeMirror-selected { .CodeMirror-focused .CodeMirror-selected {
background: #d7d4f0; background: #3685F2;
} }
.CodeMirror-crosshair { .CodeMirror-crosshair {
cursor: crosshair; cursor: crosshair;

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

5
dist/fineui.css vendored

@ -2092,8 +2092,7 @@ textarea {
} }
/* GUTTER */ /* GUTTER */
.CodeMirror-gutters { .CodeMirror-gutters {
border-right: 1px solid #ddd; background-color: #F2F4F7;
background-color: #f7f7f7;
white-space: nowrap; white-space: nowrap;
} }
.CodeMirror-linenumber { .CodeMirror-linenumber {
@ -2471,7 +2470,7 @@ div.CodeMirror-cursors {
background: #d9d9d9; background: #d9d9d9;
} }
.CodeMirror-focused .CodeMirror-selected { .CodeMirror-focused .CodeMirror-selected {
background: #d7d4f0; background: #3685F2;
} }
.CodeMirror-crosshair { .CodeMirror-crosshair {
cursor: crosshair; cursor: crosshair;

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

5
src/css/base/formula/codemirror.css

@ -22,8 +22,7 @@
} }
/* GUTTER */ /* GUTTER */
.CodeMirror-gutters { .CodeMirror-gutters {
border-right: 1px solid #ddd; background-color: #F2F4F7;
background-color: #f7f7f7;
white-space: nowrap; white-space: nowrap;
} }
.CodeMirror-linenumber { .CodeMirror-linenumber {
@ -401,7 +400,7 @@ div.CodeMirror-cursors {
background: #d9d9d9; background: #d9d9d9;
} }
.CodeMirror-focused .CodeMirror-selected { .CodeMirror-focused .CodeMirror-selected {
background: #d7d4f0; background: #3685F2;
} }
.CodeMirror-crosshair { .CodeMirror-crosshair {
cursor: crosshair; cursor: crosshair;

7
src/less/base/formula/codemirror.less

@ -27,8 +27,7 @@
/* GUTTER */ /* GUTTER */
.CodeMirror-gutters { .CodeMirror-gutters {
border-right: 1px solid #ddd; background-color: #F2F4F7;
background-color: #f7f7f7;
white-space: nowrap; white-space: nowrap;
} }
@ -496,7 +495,7 @@ div.CodeMirror-cursors {
} }
.CodeMirror-focused .CodeMirror-selected { .CodeMirror-focused .CodeMirror-selected {
background: #d7d4f0; background: #3685F2;
} }
.CodeMirror-crosshair { .CodeMirror-crosshair {
@ -585,4 +584,4 @@ span.CodeMirror-selectedtext {
li.CodeMirror-hint-active { li.CodeMirror-hint-active {
background: #08f; background: #08f;
color: white; color: white;
} }

Loading…
Cancel
Save