Browse Source

Merge pull request #159 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit '594733a33665ac15d8c583002cf4dc5e370cb9ab':
  公式编辑样式
es6
windy 7 years ago
parent
commit
9fef3200aa
  1. 21
      bi/base.css
  2. 21
      dist/base.css
  3. 21
      dist/bundle.css
  4. 2
      dist/bundle.min.css
  5. 5
      src/css/base/formula/codemirror.css
  6. 16
      src/css/base/single/editor/editor.code.css
  7. 6
      src/less/base/formula/codemirror.less
  8. 18
      src/less/base/single/editor/editor.code.less

21
bi/base.css

@ -275,10 +275,11 @@
color: #00c; color: #00c;
} }
.cm-s-default span[class*="fieldName"] { .cm-s-default span[class*="fieldName"] {
display: inline-block;
color: white; color: white;
padding: 1px;
margin: 1px 0px;
background: #3f8ce8; background: #3f8ce8;
padding: 0 5px;
margin: 1px 1px;
} }
.cm-s-default span[class*="start"] { .cm-s-default span[class*="start"] {
-webkit-border-radius: 3px 0px 0px 3px; -webkit-border-radius: 3px 0px 0px 3px;
@ -815,6 +816,22 @@ li.CodeMirror-hint-active {
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
.bi-code-editor .param {
color: #ffffff;
padding: 0 5px;
margin: 1px 1px;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
background: #3f8ce8;
display: inline-block;
}
.bi-code-editor .error-param {
color: #e85050;
padding: 0 5px;
margin: 1px 1px;
display: inline-block;
}
.bi-editor { .bi-editor {
font-size: 12px; font-size: 12px;
} }

21
dist/base.css vendored

@ -275,10 +275,11 @@
color: #00c; color: #00c;
} }
.cm-s-default span[class*="fieldName"] { .cm-s-default span[class*="fieldName"] {
display: inline-block;
color: white; color: white;
padding: 1px;
margin: 1px 0px;
background: #3f8ce8; background: #3f8ce8;
padding: 0 5px;
margin: 1px 1px;
} }
.cm-s-default span[class*="start"] { .cm-s-default span[class*="start"] {
-webkit-border-radius: 3px 0px 0px 3px; -webkit-border-radius: 3px 0px 0px 3px;
@ -815,6 +816,22 @@ li.CodeMirror-hint-active {
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
.bi-code-editor .param {
color: #ffffff;
padding: 0 5px;
margin: 1px 1px;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
background: #3f8ce8;
display: inline-block;
}
.bi-code-editor .error-param {
color: #e85050;
padding: 0 5px;
margin: 1px 1px;
display: inline-block;
}
.bi-editor { .bi-editor {
font-size: 12px; font-size: 12px;
} }

21
dist/bundle.css vendored

@ -1855,10 +1855,11 @@ i {
color: #00c; color: #00c;
} }
.cm-s-default span[class*="fieldName"] { .cm-s-default span[class*="fieldName"] {
display: inline-block;
color: white; color: white;
padding: 1px;
margin: 1px 0px;
background: #3f8ce8; background: #3f8ce8;
padding: 0 5px;
margin: 1px 1px;
} }
.cm-s-default span[class*="start"] { .cm-s-default span[class*="start"] {
-webkit-border-radius: 3px 0px 0px 3px; -webkit-border-radius: 3px 0px 0px 3px;
@ -2395,6 +2396,22 @@ li.CodeMirror-hint-active {
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
/****** common color(常用颜色,可用于普遍场景) *****/ /****** common color(常用颜色,可用于普遍场景) *****/
/**** custom color(自定义颜色,用于特定场景) ****/ /**** custom color(自定义颜色,用于特定场景) ****/
.bi-code-editor .param {
color: #ffffff;
padding: 0 5px;
margin: 1px 1px;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
background: #3f8ce8;
display: inline-block;
}
.bi-code-editor .error-param {
color: #e85050;
padding: 0 5px;
margin: 1px 1px;
display: inline-block;
}
.bi-editor { .bi-editor {
font-size: 12px; font-size: 12px;
} }

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

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

@ -182,10 +182,11 @@
color: #00c; color: #00c;
} }
.cm-s-default span[class*="fieldName"] { .cm-s-default span[class*="fieldName"] {
display: inline-block;
color: white; color: white;
padding: 1px;
margin: 1px 0px;
background: #3f8ce8; background: #3f8ce8;
padding: 0 5px;
margin: 1px 1px;
} }
.cm-s-default span[class*="start"] { .cm-s-default span[class*="start"] {
-webkit-border-radius: 3px 0px 0px 3px; -webkit-border-radius: 3px 0px 0px 3px;

16
src/css/base/single/editor/editor.code.css

@ -0,0 +1,16 @@
.bi-code-editor .param {
color: #ffffff;
padding: 0 5px;
margin: 1px 1px;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
background: #3f8ce8;
display: inline-block;
}
.bi-code-editor .error-param {
color: #e85050;
padding: 0 5px;
margin: 1px 1px;
display: inline-block;
}

6
src/less/base/formula/codemirror.less

@ -242,11 +242,11 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {
} }
.cm-s-default span[class*="fieldName"] { .cm-s-default span[class*="fieldName"] {
display: inline-block;
color: white; color: white;
padding: 1px;
margin: 1px 0px;
background: @color-bi-text-highlight; background: @color-bi-text-highlight;
padding: 0 5px;
margin: 1px 1px;
} }
.cm-s-default span[class*="start"] { .cm-s-default span[class*="start"] {

18
src/less/base/single/editor/editor.code.less

@ -0,0 +1,18 @@
@import "../../../bibase";
.bi-code-editor{
& .param {
color: @color-bi-text;
padding: 0 5px;
margin: 1px 1px;
.border-radius(2px);
background: @color-bi-background-highlight;
display: inline-block;
}
& .error-param {
color: @color-bi-text-warning;
padding: 0 5px;
margin: 1px 1px;
display: inline-block;
}
}
Loading…
Cancel
Save