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

* commit 'bd6333f30d81c59c254946d1652fa5a34977871f': codemirror line-height
8 years ago · 84c510c606
4 changed files with 4 additions and 4 deletions
--- a/bi/base.css
+++ b/bi/base.css
@ -424,7 +424,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
  margin: 0;
  white-space: pre;
  word-wrap: normal;
-  line-height: 2em;
+  line-height: inherit;
  color: inherit;
  z-index: 2;
  position: relative;
--- a/docs/base.css
+++ b/docs/base.css
@ -424,7 +424,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
  margin: 0;
  white-space: pre;
  word-wrap: normal;
-  line-height: 2em;
+  line-height: inherit;
  color: inherit;
  z-index: 2;
  position: relative;
--- a/src/css/base/formula/codemirror.css
+++ b/src/css/base/formula/codemirror.css
@ -331,7 +331,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
  margin: 0;
  white-space: pre;
  word-wrap: normal;
-  line-height: 2em;
+  line-height: inherit;
  color: inherit;
  z-index: 2;
  position: relative;
--- a/src/less/base/formula/codemirror.less
+++ b/src/less/base/formula/codemirror.less
@ -409,7 +409,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {
  margin: 0;
  white-space: pre;
  word-wrap: normal;
-  line-height: 2em;
+  line-height: inherit;
  color: inherit;
  z-index: 2;
  position: relative;