Browse Source

Merge pull request #631 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '0f13f906bfb3198e5b45c0b68151cdfb64d3563b':
  update
  无JIRA任务 split色覆盖
  无JIRA任务 更新
es6
windy 6 years ago
parent
commit
97fa02b1d3
  1. 3
      Gruntfile.js
  2. 8
      README.md
  3. 2
      dist/bundle.css
  4. 2
      dist/bundle.js
  5. 2
      dist/bundle.min.css
  6. 4
      dist/bundle.min.js
  7. 2
      dist/core.css
  8. 2
      dist/core.js
  9. 2
      dist/core_without_normalize.css
  10. 2
      dist/fineui.css
  11. 4
      dist/fineui.js
  12. 2
      dist/fineui.min.css
  13. 12
      dist/fineui.min.js
  14. 2
      dist/fineui_without_jquery_polyfill.js
  15. 49
      dist/index.html
  16. 2
      dist/polyfill.js
  17. 2
      dist/utils.js
  18. 4
      dist/utils.min.js
  19. 52
      index.html
  20. 2
      src/css/core/utils/common.css
  21. 2
      src/less/core/utils/common.less

3
Gruntfile.js

@ -339,8 +339,7 @@ module.exports = function (grunt) {
}, },
server: { server: {
options: { options: {
port: 9001, port: 9001
base: "./dist"
} }
} }
}, },

8
README.md

@ -12,15 +12,9 @@ Documentation
http://fanruan.coding.me/fineui-doc/ http://fanruan.coding.me/fineui-doc/
### API
GithubPages: [https://fanruan.github.io/fineui](https://fanruan.github.io/fineui)
CodingPages: [http://fanruan.coding.me/fineui](http://fanruan.coding.me/fineui)
### Demo ### Demo
CodingPages: [http://fanruan.coding.me/fineui/dist/index.html](http://fanruan.coding.me/fineui/dist/index.html) CodingPages: [http://fanruan.coding.me/fineui](http://fanruan.coding.me/fineui)
License License

2
dist/bundle.css vendored

@ -470,7 +470,7 @@ textarea {
.bi-split-left { .bi-split-left {
border-left: 1px solid #f2f4f7; border-left: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-split {
border: 1px solid #2F3149; border: 1px solid #2F3149;
} }
.bi-theme-dark .bi-split-top { .bi-theme-dark .bi-split-top {

2
dist/bundle.js vendored

@ -16,6 +16,8 @@ if (typeof window !== "undefined") {
} }
if (_global.BI == null) { if (_global.BI == null) {
_global.BI = {prepares: []}; _global.BI = {prepares: []};
} else {
_global.BI.prepares = [];
}/*! }/*!
* jQuery JavaScript Library v1.9.1 * jQuery JavaScript Library v1.9.1
* http://jquery.com/ * http://jquery.com/

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/core.css vendored

@ -470,7 +470,7 @@ textarea {
.bi-split-left { .bi-split-left {
border-left: 1px solid #f2f4f7; border-left: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-split {
border: 1px solid #2F3149; border: 1px solid #2F3149;
} }
.bi-theme-dark .bi-split-top { .bi-theme-dark .bi-split-top {

2
dist/core.js vendored

@ -16,6 +16,8 @@ if (typeof window !== "undefined") {
} }
if (_global.BI == null) { if (_global.BI == null) {
_global.BI = {prepares: []}; _global.BI = {prepares: []};
} else {
_global.BI.prepares = [];
}/*! }/*!
* jQuery JavaScript Library v1.9.1 * jQuery JavaScript Library v1.9.1
* http://jquery.com/ * http://jquery.com/

2
dist/core_without_normalize.css vendored

@ -189,7 +189,7 @@ textarea {
.bi-split-left { .bi-split-left {
border-left: 1px solid #f2f4f7; border-left: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-split {
border: 1px solid #2F3149; border: 1px solid #2F3149;
} }
.bi-theme-dark .bi-split-top { .bi-theme-dark .bi-split-top {

2
dist/fineui.css vendored

@ -470,7 +470,7 @@ textarea {
.bi-split-left { .bi-split-left {
border-left: 1px solid #f2f4f7; border-left: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-split {
border: 1px solid #2F3149; border: 1px solid #2F3149;
} }
.bi-theme-dark .bi-split-top { .bi-theme-dark .bi-split-top {

4
dist/fineui.js vendored

@ -16,6 +16,8 @@ if (typeof window !== "undefined") {
} }
if (_global.BI == null) { if (_global.BI == null) {
_global.BI = {prepares: []}; _global.BI = {prepares: []};
} else {
_global.BI.prepares = [];
}// Production steps of ECMA-262, Edition 5, 15.4.4.14 }// Production steps of ECMA-262, Edition 5, 15.4.4.14
// Reference: http://es5.github.io/#x15.4.4.14 // Reference: http://es5.github.io/#x15.4.4.14
if (!Array.prototype.indexOf) { if (!Array.prototype.indexOf) {
@ -255,6 +257,8 @@ if (typeof window !== "undefined") {
} }
if (_global.BI == null) { if (_global.BI == null) {
_global.BI = {prepares: []}; _global.BI = {prepares: []};
} else {
_global.BI.prepares = [];
}/*! }/*!
* jQuery JavaScript Library v1.9.1 * jQuery JavaScript Library v1.9.1
* http://jquery.com/ * http://jquery.com/

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

12
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui_without_jquery_polyfill.js vendored

@ -16,6 +16,8 @@ if (typeof window !== "undefined") {
} }
if (_global.BI == null) { if (_global.BI == null) {
_global.BI = {prepares: []}; _global.BI = {prepares: []};
} else {
_global.BI.prepares = [];
}/** }/**
* @license * @license
* Lodash (Custom Build) <https://lodash.com/> * Lodash (Custom Build) <https://lodash.com/>

49
dist/index.html vendored

@ -1,49 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title></title>
<!--核心css文件-->
<link rel="stylesheet" type="text/css" href="core.css"/>
<!--基础css文件, 包含一些最基本控件的样式-->
<link rel="stylesheet" type="text/css" href="base.css"/>
<!--BI控件样式-->
<link rel="stylesheet" type="text/css" href="widget.css"/>
<!--资源样式, 包括font、icon、background、app-->
<link rel="stylesheet" type="text/css" href="resource.css"/>
<!--当前demo定义的样式-->
<link rel="stylesheet" type="text/css" href="demo.css"/>
<!--IE9及以下兼容-->
<script src="polyfill.js"></script>
<!--核心js-->
<script src="core.js"></script>
<!--BI路由js-->
<script src="router.js"></script>
<!--fix1.0版本框架, 只用ui的话不用引入, fix1.0依赖于router,引入的顺序需在core.js、router.js之后, 可以和2.0版本同时使用或使用任一个均可-->
<script src="fix/fix-1.0.js"></script>
<!--fix2.0版本框架, 只用ui的话不用引入, 引入的顺序需在core.js之后-->
<script src="fix/fix.js"></script>
<!--基础js, 包括最基本的控件-->
<script src="base.js"></script>
<!--基础js, 存放一些通用组件,如选色组件、富文本组件等-->
<script src="case.js"></script>
<!--BI控件js-->
<script src="widget.js"></script>
<!--fix2.0版本框架与fineui结合的代码, 只用ui的话不用引入, 引入的顺序需在fix和控件库(core/base/case/widget)之后之后-->
<script src="fix/fix.compact.js"></script>
<!--工程配置文件,主要是BI.servletURL(根目录)、BI.resourceURL(资源路径)、BI.i18n(国际化)-->
<script src="config.js"></script>
<script src="demo.js"></script>
</head>
<body>
<div id="wrapper"></div>
</body>
</html>

2
dist/polyfill.js vendored

@ -16,6 +16,8 @@ if (typeof window !== "undefined") {
} }
if (_global.BI == null) { if (_global.BI == null) {
_global.BI = {prepares: []}; _global.BI = {prepares: []};
} else {
_global.BI.prepares = [];
}// Production steps of ECMA-262, Edition 5, 15.4.4.14 }// Production steps of ECMA-262, Edition 5, 15.4.4.14
// Reference: http://es5.github.io/#x15.4.4.14 // Reference: http://es5.github.io/#x15.4.4.14
if (!Array.prototype.indexOf) { if (!Array.prototype.indexOf) {

2
dist/utils.js vendored

@ -16,6 +16,8 @@ if (typeof window !== "undefined") {
} }
if (_global.BI == null) { if (_global.BI == null) {
_global.BI = {prepares: []}; _global.BI = {prepares: []};
} else {
_global.BI.prepares = [];
}/** }/**
* @license * @license
* Lodash (Custom Build) <https://lodash.com/> * Lodash (Custom Build) <https://lodash.com/>

4
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

52
index.html

@ -1,5 +1,49 @@
<html> <!DOCTYPE html>
<script> <html lang="en">
location.href = "docs/_book/index.html"
</script> <head>
<meta charset="utf-8">
<title></title>
<!--核心css文件-->
<link rel="stylesheet" type="text/css" href="dist/core.css"/>
<!--基础css文件, 包含一些最基本控件的样式-->
<link rel="stylesheet" type="text/css" href="dist/base.css"/>
<!--BI控件样式-->
<link rel="stylesheet" type="text/css" href="dist/widget.css"/>
<!--资源样式, 包括font、icon、background、app-->
<link rel="stylesheet" type="text/css" href="dist/resource.css"/>
<!--当前demo定义的样式-->
<link rel="stylesheet" type="text/css" href="dist/demo.css"/>
<!--IE9及以下兼容-->
<script src="dist/polyfill.js"></script>
<!--核心js-->
<script src="dist/core.js"></script>
<!--BI路由js-->
<script src="dist/router.js"></script>
<!--fix1.0版本框架, 只用ui的话不用引入, fix1.0依赖于router,引入的顺序需在core.js、router.js之后, 可以和2.0版本同时使用或使用任一个均可-->
<script src="dist/fix/fix-1.0.js"></script>
<!--fix2.0版本框架, 只用ui的话不用引入, 引入的顺序需在core.js之后-->
<script src="dist/fix/fix.js"></script>
<!--基础js, 包括最基本的控件-->
<script src="dist/base.js"></script>
<!--基础js, 存放一些通用组件,如选色组件、富文本组件等-->
<script src="dist/case.js"></script>
<!--BI控件js-->
<script src="dist/widget.js"></script>
<!--fix2.0版本框架与fineui结合的代码, 只用ui的话不用引入, 引入的顺序需在fix和控件库(core/base/case/widget)之后之后-->
<script src="dist/fix/fix.compact.js"></script>
<!--工程配置文件,主要是BI.servletURL(根目录)、BI.resourceURL(资源路径)、BI.i18n(国际化)-->
<script src="dist/config.js"></script>
<script src="dist/demo.js"></script>
</head>
<body>
<div id="wrapper"></div>
</body>
</html> </html>

2
src/css/core/utils/common.css

@ -189,7 +189,7 @@ textarea {
.bi-split-left { .bi-split-left {
border-left: 1px solid #f2f4f7; border-left: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-split {
border: 1px solid #2F3149; border: 1px solid #2F3149;
} }
.bi-theme-dark .bi-split-top { .bi-theme-dark .bi-split-top {

2
src/less/core/utils/common.less

@ -242,7 +242,7 @@ textarea {
} }
.bi-theme-dark { .bi-theme-dark {
.bi-border { .bi-split {
border: 1px solid @border-color-light-line-theme-dark; border: 1px solid @border-color-light-line-theme-dark;
} }

Loading…
Cancel
Save