Skip to content

Commit

Permalink
up
Browse files Browse the repository at this point in the history
  • Loading branch information
@macisi
macisi committed Apr 27, 2016
1 parent 2ac4ee1 commit 9214fe0
Show file tree
Hide file tree
Showing 18 changed files with 28 additions and 23 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ theme/**/*.map
.publish
_site/**/*
*.sublime-*
.vscode
2 changes: 1 addition & 1 deletion _site/components/dialog/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
w.require = function(name){
return w.UXCORE[name];
}
})(window)</script></head><body><nav id="J-head" class="site-nav"><a href="/"><img src="/static/uxcore.png" class="logo"></a><ul class="nav-list"><li data-id="start"><a href="/start/base/">开始使用</a></li><li data-id="css"><a href="/css/base/">样式</a></li><li data-id="components"><a href="/components/button/">组件</a></li><li data-id="scene"><a href="/scene/list/">场景</a></li></ul><img id="J_ThemeSelector" src="/static/iconfont-yifuhuanfu.png" class="theme-selector"><div id="J_ThemePickerBox" class="theme-picker-box"></div></nav><div id="J-main" class="kuma-layout-full site-main"><aside class="site-aside"><h3 class="category-name">交互提醒</h3><ul><li><a href="/components/alert">Alert<small>警告提示</small></a></li><li class="current"><a href="/components/dialog">Dialog<small>对话框</small></a></li><li><a href="/components/message">Message<small>全局提醒</small></a></li><li><a href="/components/popover">Popover<small>弹窗</small></a></li><li><a href="/components/progress">Progress<small>进度条</small></a></li><li><a href="/components/steps">Steps<small>步骤条</small></a></li><li><a href="/components/tooltip">Tooltip<small>文字提示</small></a></li></ul><h3 class="category-name">表单及相关</h3><ul><li><a href="/components/button">Button<small>按钮</small></a></li><li><a href="/components/calendar">Calendar<small>日期选择框</small></a></li><li><a href="/components/form">Form<small>表单</small></a></li><li><a href="/components/pickable">Pickable<small>筛选器</small></a></li><li><a href="/components/select2">Select2<small>选择器</small></a></li><li><a href="/components/uploader">Uploader<small>文件上传</small></a></li></ul><h3 class="category-name">导航</h3><ul><li><a href="/components/collapse">Collapse<small>折叠面板</small></a></li><li><a href="/components/crumb">Crumb<small>面包屑</small></a></li><li><a href="/components/dropdown">Dropdown<small>下拉菜单</small></a></li><li><a href="/components/menu">Menu<small>导航菜单</small></a></li><li><a href="/components/pagination">Pagination<small>分页</small></a></li><li><a href="/components/tabs">Tabs<small>选项卡</small></a></li><li><a href="/components/totop">Totop<small>返回顶部</small></a></li><li><a href="/components/tree">Tree<small>树形控件</small></a></li></ul><h3 class="category-name">布局</h3><ul><li><a href="/components/grid">Grid<small>栅格</small></a></li><li><a href="/components/layout">Layout<small>左右布局</small></a></li></ul><h3 class="category-name">其它</h3><ul><li><a href="/components/mention">Mention<small>At组件</small></a></li><li><a href="/components/transfer">Transfer<small>双栏选择框</small></a></li></ul><h3 class="category-name">表格</h3><ul><li><a href="/components/table">Table<small>表格</small></a></li></ul></aside><article class="site-content"><header class="post-title"><h1>Dialog</h1><section class="meta"><span class="author"><i class="fa fa-user"></i>vincent.bian</span><span class="github"><i class="fa fa-github"></i><a href="https://github.com/uxcore/uxcore-dialog.git" target="_blank">Dialog</a></span><span class="version"> <i class="fa fa-code-fork"></i>0.3.2</span><span class="description"><i class="fa fa-bookmark"></i>uxcore-dialog ui componment for react</span></section></header><h2 class="site-demos"> <i class="kuma-icon kuma-icon-graph"></i>组件演示</h2><div id="code-box-components-dialog-demo-basic" class="code-box"><div class="code-box-meta"><div class="code-box-title"><i class="fa fa-tag"></i><a href="#code-box-components-dialog-demo-basic">基本用法</a></div></div><div class="code-box-demo"><div id="components-dialog-demo-basic"></div></div><div class="code-box-desc"><p>基本用法。</p><a class="code-toggle"><i class="kuma-icon kuma-icon-chevron-down"></i></a></div><div class="code-box-markdown"><script>(function(){'use strict';
})(window)</script></head><body><nav id="J-head" class="site-nav"><a href="/"><img src="/static/uxcore.png" class="logo"></a><ul class="nav-list"><li data-id="start"><a href="/start/base/">开始使用</a></li><li data-id="css"><a href="/css/base/">样式</a></li><li data-id="components"><a href="/components/button/">组件</a></li><li data-id="scene"><a href="/scene/list/">场景</a></li></ul><img id="J_ThemeSelector" src="/static/iconfont-yifuhuanfu.png" class="theme-selector"><div id="J_ThemePickerBox" class="theme-picker-box"></div></nav><div id="J-main" class="kuma-layout-full site-main"><aside class="site-aside"><h3 class="category-name">交互提醒</h3><ul><li><a href="/components/alert">Alert<small>警告提示</small></a></li><li class="current"><a href="/components/dialog">Dialog<small>对话框</small></a></li><li><a href="/components/message">Message<small>全局提醒</small></a></li><li><a href="/components/popover">Popover<small>弹窗</small></a></li><li><a href="/components/progress">Progress<small>进度条</small></a></li><li><a href="/components/steps">Steps<small>步骤条</small></a></li><li><a href="/components/tooltip">Tooltip<small>文字提示</small></a></li></ul><h3 class="category-name">表单及相关</h3><ul><li><a href="/components/button">Button<small>按钮</small></a></li><li><a href="/components/calendar">Calendar<small>日期选择框</small></a></li><li><a href="/components/form">Form<small>表单</small></a></li><li><a href="/components/pickable">Pickable<small>筛选器</small></a></li><li><a href="/components/select2">Select2<small>选择器</small></a></li><li><a href="/components/uploader">Uploader<small>文件上传</small></a></li></ul><h3 class="category-name">导航</h3><ul><li><a href="/components/collapse">Collapse<small>折叠面板</small></a></li><li><a href="/components/crumb">Crumb<small>面包屑</small></a></li><li><a href="/components/dropdown">Dropdown<small>下拉菜单</small></a></li><li><a href="/components/menu">Menu<small>导航菜单</small></a></li><li><a href="/components/pagination">Pagination<small>分页</small></a></li><li><a href="/components/tabs">Tabs<small>选项卡</small></a></li><li><a href="/components/totop">Totop<small>返回顶部</small></a></li><li><a href="/components/tree">Tree<small>树形控件</small></a></li></ul><h3 class="category-name">布局</h3><ul><li><a href="/components/grid">Grid<small>栅格</small></a></li><li><a href="/components/layout">Layout<small>左右布局</small></a></li></ul><h3 class="category-name">其它</h3><ul><li><a href="/components/mention">Mention<small>At组件</small></a></li><li><a href="/components/transfer">Transfer<small>双栏选择框</small></a></li></ul><h3 class="category-name">表格</h3><ul><li><a href="/components/table">Table<small>表格</small></a></li></ul></aside><article class="site-content"><header class="post-title"><h1>Dialog</h1><section class="meta"><span class="author"><i class="fa fa-user"></i>vincent.bian</span><span class="github"><i class="fa fa-github"></i><a href="https://github.com/uxcore/uxcore-dialog.git" target="_blank">Dialog</a></span><span class="version"> <i class="fa fa-code-fork"></i>0.3.4</span><span class="description"><i class="fa fa-bookmark"></i>uxcore-dialog ui componment for react</span></section></header><h2 class="site-demos"> <i class="kuma-icon kuma-icon-graph"></i>组件演示</h2><div id="code-box-components-dialog-demo-basic" class="code-box"><div class="code-box-meta"><div class="code-box-title"><i class="fa fa-tag"></i><a href="#code-box-components-dialog-demo-basic">基本用法</a></div></div><div class="code-box-demo"><div id="components-dialog-demo-basic"></div></div><div class="code-box-desc"><p>基本用法。</p><a class="code-toggle"><i class="kuma-icon kuma-icon-chevron-down"></i></a></div><div class="code-box-markdown"><script>(function(){'use strict';

var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();

Expand Down
2 changes: 1 addition & 1 deletion _site/components/popover/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
w.require = function(name){
return w.UXCORE[name];
}
})(window)</script></head><body><nav id="J-head" class="site-nav"><a href="/"><img src="/static/uxcore.png" class="logo"></a><ul class="nav-list"><li data-id="start"><a href="/start/base/">开始使用</a></li><li data-id="css"><a href="/css/base/">样式</a></li><li data-id="components"><a href="/components/button/">组件</a></li><li data-id="scene"><a href="/scene/list/">场景</a></li></ul><img id="J_ThemeSelector" src="/static/iconfont-yifuhuanfu.png" class="theme-selector"><div id="J_ThemePickerBox" class="theme-picker-box"></div></nav><div id="J-main" class="kuma-layout-full site-main"><aside class="site-aside"><h3 class="category-name">交互提醒</h3><ul><li><a href="/components/alert">Alert<small>警告提示</small></a></li><li><a href="/components/dialog">Dialog<small>对话框</small></a></li><li><a href="/components/message">Message<small>全局提醒</small></a></li><li class="current"><a href="/components/popover">Popover<small>弹窗</small></a></li><li><a href="/components/progress">Progress<small>进度条</small></a></li><li><a href="/components/steps">Steps<small>步骤条</small></a></li><li><a href="/components/tooltip">Tooltip<small>文字提示</small></a></li></ul><h3 class="category-name">表单及相关</h3><ul><li><a href="/components/button">Button<small>按钮</small></a></li><li><a href="/components/calendar">Calendar<small>日期选择框</small></a></li><li><a href="/components/form">Form<small>表单</small></a></li><li><a href="/components/pickable">Pickable<small>筛选器</small></a></li><li><a href="/components/select2">Select2<small>选择器</small></a></li><li><a href="/components/uploader">Uploader<small>文件上传</small></a></li></ul><h3 class="category-name">导航</h3><ul><li><a href="/components/collapse">Collapse<small>折叠面板</small></a></li><li><a href="/components/crumb">Crumb<small>面包屑</small></a></li><li><a href="/components/dropdown">Dropdown<small>下拉菜单</small></a></li><li><a href="/components/menu">Menu<small>导航菜单</small></a></li><li><a href="/components/pagination">Pagination<small>分页</small></a></li><li><a href="/components/tabs">Tabs<small>选项卡</small></a></li><li><a href="/components/totop">Totop<small>返回顶部</small></a></li><li><a href="/components/tree">Tree<small>树形控件</small></a></li></ul><h3 class="category-name">布局</h3><ul><li><a href="/components/grid">Grid<small>栅格</small></a></li><li><a href="/components/layout">Layout<small>左右布局</small></a></li></ul><h3 class="category-name">其它</h3><ul><li><a href="/components/mention">Mention<small>At组件</small></a></li><li><a href="/components/transfer">Transfer<small>双栏选择框</small></a></li></ul><h3 class="category-name">表格</h3><ul><li><a href="/components/table">Table<small>表格</small></a></li></ul></aside><article class="site-content"><header class="post-title"><h1>Popover</h1><section class="meta"><span class="author"><i class="fa fa-user"></i>eternalsky</span><span class="github"><i class="fa fa-github"></i><a href="https://github.com/uxcore/uxcore-popover.git" target="_blank">Popover</a></span><span class="version"> <i class="fa fa-code-fork"></i>0.3.0</span><span class="description"><i class="fa fa-bookmark"></i>uxcore-popover component for uxcore.</span></section></header><h2 class="site-demos"> <i class="kuma-icon kuma-icon-graph"></i>组件演示</h2><div id="code-box-components-popover-demo-hover" class="code-box"><div class="code-box-meta"><div class="code-box-title"><i class="fa fa-tag"></i><a href="#code-box-components-popover-demo-hover">悬浮弹出</a></div></div><div class="code-box-demo"><div id="components-popover-demo-hover"></div></div><div class="code-box-desc"><p>悬浮弹出。</p><a class="code-toggle"><i class="kuma-icon kuma-icon-chevron-down"></i></a></div><div class="code-box-markdown"><script>(function(){'use strict';
})(window)</script></head><body><nav id="J-head" class="site-nav"><a href="/"><img src="/static/uxcore.png" class="logo"></a><ul class="nav-list"><li data-id="start"><a href="/start/base/">开始使用</a></li><li data-id="css"><a href="/css/base/">样式</a></li><li data-id="components"><a href="/components/button/">组件</a></li><li data-id="scene"><a href="/scene/list/">场景</a></li></ul><img id="J_ThemeSelector" src="/static/iconfont-yifuhuanfu.png" class="theme-selector"><div id="J_ThemePickerBox" class="theme-picker-box"></div></nav><div id="J-main" class="kuma-layout-full site-main"><aside class="site-aside"><h3 class="category-name">交互提醒</h3><ul><li><a href="/components/alert">Alert<small>警告提示</small></a></li><li><a href="/components/dialog">Dialog<small>对话框</small></a></li><li><a href="/components/message">Message<small>全局提醒</small></a></li><li class="current"><a href="/components/popover">Popover<small>弹窗</small></a></li><li><a href="/components/progress">Progress<small>进度条</small></a></li><li><a href="/components/steps">Steps<small>步骤条</small></a></li><li><a href="/components/tooltip">Tooltip<small>文字提示</small></a></li></ul><h3 class="category-name">表单及相关</h3><ul><li><a href="/components/button">Button<small>按钮</small></a></li><li><a href="/components/calendar">Calendar<small>日期选择框</small></a></li><li><a href="/components/form">Form<small>表单</small></a></li><li><a href="/components/pickable">Pickable<small>筛选器</small></a></li><li><a href="/components/select2">Select2<small>选择器</small></a></li><li><a href="/components/uploader">Uploader<small>文件上传</small></a></li></ul><h3 class="category-name">导航</h3><ul><li><a href="/components/collapse">Collapse<small>折叠面板</small></a></li><li><a href="/components/crumb">Crumb<small>面包屑</small></a></li><li><a href="/components/dropdown">Dropdown<small>下拉菜单</small></a></li><li><a href="/components/menu">Menu<small>导航菜单</small></a></li><li><a href="/components/pagination">Pagination<small>分页</small></a></li><li><a href="/components/tabs">Tabs<small>选项卡</small></a></li><li><a href="/components/totop">Totop<small>返回顶部</small></a></li><li><a href="/components/tree">Tree<small>树形控件</small></a></li></ul><h3 class="category-name">布局</h3><ul><li><a href="/components/grid">Grid<small>栅格</small></a></li><li><a href="/components/layout">Layout<small>左右布局</small></a></li></ul><h3 class="category-name">其它</h3><ul><li><a href="/components/mention">Mention<small>At组件</small></a></li><li><a href="/components/transfer">Transfer<small>双栏选择框</small></a></li></ul><h3 class="category-name">表格</h3><ul><li><a href="/components/table">Table<small>表格</small></a></li></ul></aside><article class="site-content"><header class="post-title"><h1>Popover</h1><section class="meta"><span class="author"><i class="fa fa-user"></i>eternalsky</span><span class="github"><i class="fa fa-github"></i><a href="https://github.com/uxcore/uxcore-popover.git" target="_blank">Popover</a></span><span class="version"> <i class="fa fa-code-fork"></i>0.3.1</span><span class="description"><i class="fa fa-bookmark"></i>uxcore-popover component for uxcore.</span></section></header><h2 class="site-demos"> <i class="kuma-icon kuma-icon-graph"></i>组件演示</h2><div id="code-box-components-popover-demo-hover" class="code-box"><div class="code-box-meta"><div class="code-box-title"><i class="fa fa-tag"></i><a href="#code-box-components-popover-demo-hover">悬浮弹出</a></div></div><div class="code-box-demo"><div id="components-popover-demo-hover"></div></div><div class="code-box-desc"><p>悬浮弹出。</p><a class="code-toggle"><i class="kuma-icon kuma-icon-chevron-down"></i></a></div><div class="code-box-markdown"><script>(function(){'use strict';

var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();

Expand Down
4 changes: 4 additions & 0 deletions run.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
var nico = require('nico-jsx');
nico.build({
force: true
});
2 changes: 1 addition & 1 deletion style/kuma-base
Submodule kuma-base updated 25 files
+0 −16 core/button.less
+0 −5 core/svg/blue/checkbox-checked.svg
+0 −3 core/svg/blue/checkbox-hover.svg
+0 −4 core/svg/blue/radio-checked.svg
+0 −3 core/svg/blue/radio-hover.svg
+0 −0 core/svg/checkbox-checked-disabled.svg
+0 −0 core/svg/checkbox-checked.svg
+0 −0 core/svg/checkbox-disabled.svg
+0 −0 core/svg/checkbox-hover.svg
+0 −0 core/svg/checkbox-normal.svg
+0 −5 core/svg/orange/checkbox-checked-disabled.svg
+0 −3 core/svg/orange/checkbox-disabled.svg
+0 −3 core/svg/orange/checkbox-normal.svg
+0 −4 core/svg/orange/radio-checked-disabled.svg
+0 −3 core/svg/orange/radio-disabled.svg
+0 −3 core/svg/orange/radio-normal.svg
+0 −0 core/svg/radio-checked-disabled.svg
+1 −1 core/svg/radio-checked.svg
+0 −0 core/svg/radio-disabled.svg
+0 −0 core/svg/radio-hover.svg
+0 −0 core/svg/radio-normal.svg
+42 −47 demo/css/demo.css
+0 −4 demo/demo.html
+2 −2 demo/demo.less
+2 −0 theme/orange.less
2 changes: 1 addition & 1 deletion theme/static/style/index.css
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions theme/templates/components.jade
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
extends layout
include aside
include meta
include markdown
include demos
include ./includes/aside
include ./includes/meta
include ./includes/markdown
include ./includes/demos

block content
+aside('components')
Expand Down
6 changes: 3 additions & 3 deletions theme/templates/css.jade
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
extends layout
include aside
include markdown
include demos
include ./includes/aside
include ./includes/markdown
include ./includes/demos

block content
+aside('css')
Expand Down
0 theme/templates/aside.jade → theme/templates/includes/aside.jade
View file
File renamed without changes.
0 theme/templates/demos.jade → theme/templates/includes/demos.jade
View file
File renamed without changes.
0 theme/templates/footer.jade → theme/templates/includes/footer.jade
View file
File renamed without changes.
0 theme/templates/markdown.jade → theme/templates/includes/markdown.jade
View file
File renamed without changes.
0 theme/templates/meta.jade → theme/templates/includes/meta.jade
View file
File renamed without changes.
0 theme/templates/navigation.jade → theme/templates/includes/navigation.jade
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions theme/templates/layout.jade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ html
}
})(window)
body
include navigation
include ./includes/navigation
#J-main.kuma-layout-full.site-main
block content
include footer
include ./includes/footer
4 changes: 2 additions & 2 deletions theme/templates/newstyle.jade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ html
script(src="https://alinw.alicdn.com/uxcore/uxcore-lib/??es5-shim/4.1.12/es5-shim.min.js,es5-shim/4.1.12/es5-sham.min.js,react/latest/react-with-addons.js,react/latest/react-dom.min.js,rangy/1.3.0/rangy-core.min.js,jquery/1.11.3/jquery.min.js")
script(src="https://alinw.alicdn.com/uxcore/uxcore-lib/tinymce/4.2.5/tinymce-full.min.js")
body
include navigation
include ./includes/navigation
#J-main.kuma-layout-full.site-main
block content
include footer
include ./includes/footer
8 changes: 4 additions & 4 deletions theme/templates/scene.jade
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
extends layout
include aside
include meta
include markdown
include demos
include ./includes/aside
include ./includes/meta
include ./includes/markdown
include ./includes/demos

block content
+aside('scene')
Expand Down
8 changes: 4 additions & 4 deletions theme/templates/start.jade
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
extends layout
include aside
include meta
include markdown
include demos
include ./includes/aside
include ./includes/meta
include ./includes/markdown
include ./includes/demos

block content
+aside('start')
Expand Down

0 comments on commit 9214fe0

Please sign in to comment.