fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #119 in FUI/fineui from ~GUY/fineui:master to master 

* commit '117c266898665dbc5ff79f02c4b55ded19f3eb1a':
  add
es6
guy 7 years ago
parent
2a9c869658 117c266898
commit
caa0632cfd
11 changed files with 9 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      docs/START.md
  2. 2
      docs/_book/START.html
  3. 4
      docs/_book/base/pager.html
  4. 2
      docs/_book/base/pager.md
  5. 2
      docs/_book/search_index.json
  6. 1
      src/less/lib/background.less
  7. 9
      src/less/lib/colors.less
  8. 5
      src/less/lib/constant.less
  9. 2
      src/less/lib/icon.less
  10. 4
      src/less/resource/font.less
  11. 1
      src/less/var.less

2
docs/START.md
Unescape View File

@ -34,4 +34,4 @@ bower install fineui
</body>
</html>
```
```

2
docs/_book/START.html
Unescape View File

@ -2507,7 +2507,7 @@
<script>
var gitbook = gitbook || [];
gitbook.push(function() {
gitbook.page.hasChanged({"page":{"title":"起步","level":"1.2","depth":1,"next":{"title":"高级教程","level":"1.3","depth":1,"path":"COURSE.md","ref":"COURSE.md","articles":[]},"previous":{"title":"概览","level":"1.1","depth":1,"path":"README.md","ref":"README.md","articles":[]},"dir":"ltr"},"config":{"gitbook":"*","theme":"default","variables":{},"plugins":["jsfiddle","splitter","theme-api","expandable-chapters","livereload"],"pluginsConfig":{"livereload":{},"jsfiddle":{"type":"script","tabs":["result","js","html"],"height":"100","width":"500","fontColor":"00FF00"},"splitter":{},"search":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"fontsettings":{"theme":"white","family":"sans","size":2},"highlight":{},"theme-api":{"languages":[],"split":true,"theme":"light"},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false},"expandable-chapters":{}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"}},"file":{"path":"START.md","mtime":"2017-09-20T06:21:12.400Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2017-09-20T08:46:20.890Z"},"basePath":".","book":{"language":""}});
gitbook.page.hasChanged({"page":{"title":"起步","level":"1.2","depth":1,"next":{"title":"高级教程","level":"1.3","depth":1,"path":"COURSE.md","ref":"COURSE.md","articles":[]},"previous":{"title":"概览","level":"1.1","depth":1,"path":"README.md","ref":"README.md","articles":[]},"dir":"ltr"},"config":{"gitbook":"*","theme":"default","variables":{},"plugins":["jsfiddle","splitter","theme-api","expandable-chapters","livereload"],"pluginsConfig":{"livereload":{},"jsfiddle":{"type":"script","tabs":["result","js","html"],"height":"100","width":"500","fontColor":"00FF00"},"splitter":{},"search":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"fontsettings":{"theme":"white","family":"sans","size":2},"highlight":{},"theme-api":{"languages":[],"split":true,"theme":"light"},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false},"expandable-chapters":{}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"}},"file":{"path":"START.md","mtime":"2017-09-20T12:56:04.539Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2017-09-20T08:46:20.890Z"},"basePath":".","book":{"language":""}});
});
</script>
</div>

4
docs/_book/base/pager.html
Unescape View File

@ -2494,7 +2494,7 @@ BI.createWidget({
<td style="text-align:left">pages</td>
<td style="text-align:left">&#x662F;&#x5426;&#x663E;&#x793A;&#x603B;&#x9875;&#x6570;</td>
<td style="text-align:left">boolean/number</td>
<td style="text-align:left">true,false,number</td>
<td style="text-align:left">false,number</td>
<td style="text-align:left">false</td>
</tr>
<tr>
@ -2677,7 +2677,7 @@ BI.createWidget({
<script>
var gitbook = gitbook || [];
gitbook.push(function() {
gitbook.page.hasChanged({"page":{"title":"pager","level":"4.8","depth":1,"next":{"title":"svg","level":"4.9","depth":1,"path":"base/svg.md","ref":"base/svg.md","articles":[]},"previous":{"title":"resizable_table","level":"4.7.4","depth":2,"path":"base/table/resizable_table.md","ref":"base/table/resizable_table.md","articles":[]},"dir":"ltr"},"config":{"gitbook":"*","theme":"default","variables":{},"plugins":["jsfiddle","splitter","theme-api","expandable-chapters","livereload"],"pluginsConfig":{"livereload":{},"jsfiddle":{"type":"script","tabs":["result","js","html"],"height":"100","width":"500","fontColor":"00FF00"},"splitter":{},"search":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"fontsettings":{"theme":"white","family":"sans","size":2},"highlight":{},"theme-api":{"languages":[],"split":true,"theme":"light"},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false},"expandable-chapters":{}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"}},"file":{"path":"base/pager.md","mtime":"2017-09-20T09:23:34.456Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2017-09-20T08:46:20.890Z"},"basePath":"..","book":{"language":""}});
gitbook.page.hasChanged({"page":{"title":"pager","level":"4.8","depth":1,"next":{"title":"svg","level":"4.9","depth":1,"path":"base/svg.md","ref":"base/svg.md","articles":[]},"previous":{"title":"resizable_table","level":"4.7.4","depth":2,"path":"base/table/resizable_table.md","ref":"base/table/resizable_table.md","articles":[]},"dir":"ltr"},"config":{"gitbook":"*","theme":"default","variables":{},"plugins":["jsfiddle","splitter","theme-api","expandable-chapters","livereload"],"pluginsConfig":{"livereload":{},"jsfiddle":{"type":"script","tabs":["result","js","html"],"height":"100","width":"500","fontColor":"00FF00"},"splitter":{},"search":{},"lunr":{"maxIndexSize":1000000,"ignoreSpecialCharacters":false},"fontsettings":{"theme":"white","family":"sans","size":2},"highlight":{},"theme-api":{"languages":[],"split":true,"theme":"light"},"sharing":{"facebook":true,"twitter":true,"google":false,"weibo":false,"instapaper":false,"vk":false,"all":["facebook","google","twitter","weibo","instapaper"]},"theme-default":{"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"},"showLevel":false},"expandable-chapters":{}},"structure":{"langs":"LANGS.md","readme":"README.md","glossary":"GLOSSARY.md","summary":"SUMMARY.md"},"pdf":{"pageNumbers":true,"fontSize":12,"fontFamily":"Arial","paperSize":"a4","chapterMark":"pagebreak","pageBreaksBefore":"/","margin":{"right":62,"left":62,"top":56,"bottom":56}},"styles":{"website":"styles/website.css","pdf":"styles/pdf.css","epub":"styles/epub.css","mobi":"styles/mobi.css","ebook":"styles/ebook.css","print":"styles/print.css"}},"file":{"path":"base/pager.md","mtime":"2017-09-20T09:24:06.996Z","type":"markdown"},"gitbook":{"version":"3.2.3","time":"2017-09-20T08:46:20.890Z"},"basePath":"..","book":{"language":""}});
});
</script>
</div>

2
docs/_book/base/pager.md
Unescape View File

@ -30,7 +30,7 @@ BI.createWidget({
| dynamicShow | 是否动态显示上一页、下一页、首页、尾页， 若为false，则指对其设置使能状态 | boolean| true,false | true|
| dynamicShowFirstLast | 是否动态显示首页、尾页,dynamicShow为false时生效| boolean| true,false | false |
| dynamicShowPrevNext | 是否动态显示上一页、下一页,dynamicShow为false时生效 | boolean| true,false | false|
| pages | 是否显示总页数 | boolean/number| true,false,number|false|
| pages | 是否显示总页数 | boolean/number| false,number|false|
| curr | 初始化当前页 | function | —| function(){return 1;}|
| groups | 连续显示分页数 | number | — | 0 |
| jump | 页数跳转| function |— | —|

2
docs/_book/search_index.json
View File

File diff suppressed because one or more lines are too long

1
src/less/lib/background.less
Unescape View File

@ -1,3 +1,2 @@
@background-loading: "icon/loading.gif";
@background-auto-color: "background/auto-color.png";
@background-trans-color: "background/trans-color.png";

9
src/less/lib/colors.less
Unescape View File

@ -54,12 +54,6 @@
@color-bi-background-warning: @background-color-warning;
//背景提亮色
@color-bi-background-highlight: @background-color-highlight;
//橘色tooltip背景
@color-bi-background-orange: @background-color-orange;
@color-bi-background-green: @background-color-green;
@color-bi-background-virtual-blue: @background-color-virtual-blue;
//黑色边框色
@color-bi-border-black: @border-color-black;
@ -84,9 +78,6 @@
//边框提亮
@color-bi-border-highlight: @border-color-highlight;
//黑色阴影
@color-bi-shadow-normal: @shadow-color-black;
//bubble、toast、tooltip通用
@color-bi-tip-warning-background: @background-color-alert;

5
src/less/lib/constant.less
Unescape View File

@ -41,11 +41,6 @@
@background-color-gray: #999999;
@background-color-disabled: #cccccc;
@background-color-orange: #fef6de;
@background-color-green: #eefbff;
@background-color-yellow: #f9a744;
@background-color-virtual-blue: #d8f3fe;
@background-color-alert: #fddddd;
@background-color-warning: #fbb03b;
@background-color-negative: #e85050;

2
src/less/lib/icon.less
Unescape View File

@ -40,6 +40,4 @@
@icon-tree-vertical-line-3-theme-dark: "icon/dark/tree-vertical-line-3.png";
@icon-tree-vertical-line-4-theme-dark: "icon/dark/tree-vertical-line-4.png";
@icon-loading-bar: "icon/loading_bar.gif";
@icon-loading: "icon/loading.gif";

4
src/less/resource/font.less
Unescape View File

@ -4,13 +4,13 @@
@font-face {
font-family: 'bi';
src: url('@{webUrl}font/iconfont.eot'), /* IE6-IE8 */ url('@{webUrl}font/iconfont.woff') format('woff'), /* chrome、firefox */ url('@{webUrl}font/iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('@{webUrl}font/iconfont.svg#svgFontName') format('svg'); /* iOS 4.1- */
src: url('@{fontUrl}iconfont.eot'), /* IE6-IE8 */ url('@{fontUrl}iconfont.woff') format('woff'), /* chrome、firefox */ url('@{fontUrl}iconfont.ttf') format('truetype'), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ url('@{fontUrl}iconfont.svg#svgFontName') format('svg'); /* iOS 4.1- */
}
html.ie9below {
@font-face {
font-family: 'bi';
src: url('@{webUrl}font/iconfont.eot') /* IE6-IE8 */
src: url('@{fontUrl}iconfont.eot') /* IE6-IE8 */
}
}

1
src/less/var.less
Unescape View File

@ -1,4 +1,5 @@
@webUrl: '';
@fontUrl: 'font/'; //字体存放路径
@imageUrl: 'images/1x/'; //图片的基本地址
@image2xUrl: 'images/2x/'; //2x图片的基本地址

Write Preview
Loading…
Cancel
Save