Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/fui/fineui

# Conflicts: # dist/_fineui.min.js # dist/bundle.min.js # dist/fineui.min.js
6 years ago · 7fad24299d
6 changed files with 6 additions and 6 deletions
--- a/dist/_fineui.min.js
+++ b/dist/_fineui.min.js
--- a/dist/base.js
+++ b/dist/base.js
@ -18175,7 +18175,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
            items: [{
                el: this.watermark,
                top: 0,
-                left: o.lineNumbers ? 5 : 30 + 5
+                left: o.lineNumbers ? 30 + 5 : 5
            }]
        });

--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -53696,7 +53696,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
            items: [{
                el: this.watermark,
                top: 0,
-                left: o.lineNumbers ? 5 : 30 + 5
+                left: o.lineNumbers ? 30 + 5 : 5
            }]
        });

--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/src/base/single/editor/editor.code.js
+++ b/src/base/single/editor/editor.code.js
@ -84,7 +84,7 @@ BI.CodeEditor = BI.inherit(BI.Single, {
            items: [{
                el: this.watermark,
                top: 0,
-                left: o.lineNumbers ? 5 : 30 + 5
+                left: o.lineNumbers ? 30 + 5 : 5
            }]
        });