diff --git a/components.json b/components.json index d21df290b..2a8c24a1b 100644 --- a/components.json +++ b/components.json @@ -1,5 +1,4 @@ { - "sample": "./packages/sample/index.js", "button": "./packages/button/index.js", "switch": "./packages/switch/index.js", "field": "./packages/field/index.js", diff --git a/docs/assets/docs.less b/docs/assets/docs.less index 16cbf50c1..2f038afb2 100644 --- a/docs/assets/docs.less +++ b/docs/assets/docs.less @@ -53,18 +53,4 @@ ul { -webkit-font-smoothing: auto; } -// 操作类图标 - 导出 -@font-face { - font-family: "handle"; - src: url("./fonts/iconfont.eot"); /* IE9*/ - src: url("./fonts/iconfont.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */ - url("./fonts/iconfont.woff") format("woff"), /* chrome、firefox */ - url("./fonts/iconfont.ttf") format("truetype"), /* chrome、firefox、opera、Safari, Android, iOS 4.2+*/ - url("./fonts/iconfont.svg#iconfont") format("svg"); /* iOS 4.1- */ -} -.iconhandle { - font-family: "handle"; - font-size: 16px; - font-style: normal; -} diff --git a/docs/assets/fonts/iconfont.eot b/docs/assets/fonts/iconfont.eot deleted file mode 100644 index d7067e210..000000000 Binary files a/docs/assets/fonts/iconfont.eot and /dev/null differ diff --git a/docs/assets/fonts/iconfont.svg b/docs/assets/fonts/iconfont.svg deleted file mode 100644 index 97301945b..000000000 --- a/docs/assets/fonts/iconfont.svg +++ /dev/null @@ -1,326 +0,0 @@ - - - - -Created by FontForge 20120731 at Fri Sep 23 11:54:25 2016 - By admin - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/assets/fonts/iconfont.ttf b/docs/assets/fonts/iconfont.ttf deleted file mode 100644 index 6519546fb..000000000 Binary files a/docs/assets/fonts/iconfont.ttf and /dev/null differ diff --git a/docs/assets/fonts/iconfont.woff b/docs/assets/fonts/iconfont.woff deleted file mode 100644 index 763033714..000000000 Binary files a/docs/assets/fonts/iconfont.woff and /dev/null differ diff --git a/docs/examples/sample.md b/docs/examples/sample.md deleted file mode 100644 index 5ae3ac3a8..000000000 --- a/docs/examples/sample.md +++ /dev/null @@ -1,28 +0,0 @@ - - -## sample组件 - -### 基础用法 - -author设置为test - -:::demo 样例代码 -```html - -``` -::: - - -### API - -| 参数 | 说明 | 类型 | 默认值 | 可选值 | -|-----------|-----------|-----------|-------------|-------------| -| className | 自定义额外类名 | string | '' | '' | diff --git a/docs/index.js b/docs/index.js index 7874cc66f..65a18152b 100644 --- a/docs/index.js +++ b/docs/index.js @@ -1,4 +1,5 @@ import './assets/docs.less'; +// import '../packages/zenui/index.pcss'; import Vue from 'vue'; import VueRouter from 'vue-router'; import App from './App'; diff --git a/docs/nav.config.json b/docs/nav.config.json index 88eefc099..28b555022 100644 --- a/docs/nav.config.json +++ b/docs/nav.config.json @@ -1,27 +1,30 @@ { "zh-CN": [ { - "name": "基础组件", + "name": "oxygen组件", "groups": [ - { - "groupName": "Basic", - "list": [ - { - "path": "/sample", - "title": "Sample" - }, - { - "path": "/button", - "title": "Button" - } - ] - }, { "groupName": "CSS组件", "list": [ + { + "path": "/button", + "title": "Button" + }, { "path": "/cell", "title": "Cell" + }, + { + "path": "/loading", + "title": "Loading" + }, + { + "path": "/progress", + "title": "Progress" + }, + { + "path": "/card", + "title": "Card" } ] }, @@ -45,6 +48,55 @@ "title": "Checkbox" } ] + }, + { + "groupName": "JS组件", + "list": [ + { + "path": "/tab", + "title": "Tab" + }, + { + "path": "/toast", + "title": "Toast" + }, + { + "path": "/img-uploader", + "title": "Img Uploader" + }, + { + "path": "/picker", + "title": "Picker" + }, + { + "path": "/datetime-picker", + "title": "Datetime Picker" + }, + { + "path": "/lazyload", + "title": "Lazyload" + }, + { + "path": "/pop", + "title": "Pop" + }, + { + "path": "/swipe", + "title": "Swipe" + }, + { + "path": "/waterfall", + "title": "Waterfall" + }, + { + "path": "/dialog", + "title": "Dialog" + }, + { + "path": "/img-preview", + "title": "Img Preview" + } + ] } ] } diff --git a/packages/cell/src/cell.vue b/packages/cell/src/cell.vue index 115e164df..4ed2758e8 100644 --- a/packages/cell/src/cell.vue +++ b/packages/cell/src/cell.vue @@ -2,7 +2,7 @@
- + diff --git a/packages/sample/CHANGELOG.md b/packages/sample/CHANGELOG.md deleted file mode 100644 index e88c472b3..000000000 --- a/packages/sample/CHANGELOG.md +++ /dev/null @@ -1,8 +0,0 @@ -## 0.0.2 (2017-01-20) - -* 改了bug A -* 加了功能B - -## 0.0.1 (2017-01-10) - -* 第一版 diff --git a/packages/sample/README.md b/packages/sample/README.md deleted file mode 100644 index 4c6172563..000000000 --- a/packages/sample/README.md +++ /dev/null @@ -1,26 +0,0 @@ -# @youzan/<%= name %> - -!!! 请在此处填写你的文档最简单描述 !!! - -[![version][version-image]][download-url] -[![download][download-image]][download-url] - -[version-image]: http://npm.qima-inc.com/badge/v/@youzan/<%= name %>.svg?style=flat-square -[download-image]: http://npm.qima-inc.com/badge/d/@youzan/<%= name %>.svg?style=flat-square -[download-url]: http://npm.qima-inc.com/package/@youzan/<%= name %> - -## Demo - -## Usage - -## API - -| 参数 | 说明 | 类型 | 默认值 | 可选值 | -|-----------|-----------|-----------|-------------|-------------| -| className | 自定义额外类名 | string | '' | '' | - - - - -## License -[MIT](https://opensource.org/licenses/MIT) diff --git a/packages/sample/index.js b/packages/sample/index.js deleted file mode 100644 index 59bd195b2..000000000 --- a/packages/sample/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import SampleComponent from './src/main'; - -export default SampleComponent; diff --git a/packages/sample/package.json b/packages/sample/package.json deleted file mode 100644 index 87ec1b163..000000000 --- a/packages/sample/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "@youzan/your-component-name", - "version": "0.0.1", - "description": "vue component", - "main": "./lib/index.js", - "author": "who r u", - "license": "MIT", - "devDependencies": {}, - "dependencies": {} -} diff --git a/packages/sample/src/main.vue b/packages/sample/src/main.vue deleted file mode 100644 index 0d2c38ebd..000000000 --- a/packages/sample/src/main.vue +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/packages/zenui/src/icon.pcss b/packages/zenui/src/icon.pcss new file mode 100644 index 000000000..afdc91bc2 --- /dev/null +++ b/packages/zenui/src/icon.pcss @@ -0,0 +1,66 @@ +/* DO NOT EDIT! Generated by fount */ + +@font-face { + font-family: 'zuiicon'; + src: url('https://b.yzcdn.cn/zui/font/zuiicon-b37948cf5d.eot'); + src: url('https://b.yzcdn.cn/zui/font/zuiicon-b37948cf5d.eot?#iefix') format('embedded-opentype'), + url('https://b.yzcdn.cn/zui/font/zuiicon-b37948cf5d.woff2') format('woff2'), + url('https://b.yzcdn.cn/zui/font/zuiicon-b37948cf5d.woff') format('woff'), + url('https://b.yzcdn.cn/zui/font/zuiicon-b37948cf5d.ttf') format('truetype') +} + +.zui-icon { + display: inline-block; +} +.zui-icon::before { + font-family: "zuiicon" !important; + font-style: normal; + font-weight: normal; + speak: none; + + display: inline-block; + text-decoration: inherit; + width: 1em; + text-align: center; + + /* For safety - reset parent styles, that can break glyph codes*/ + font-variant: normal; + text-transform: none; + + /* fix buttons height, for twitter bootstrap */ + line-height: 1em; + + /* Animation center compensation - margins should be symmetric */ + /* remove if not needed */ + /* margin-left: .2em; */ + + /* you can be more comfortable with increased icons size */ + /* font-size: 120%; */ + + /* Font smoothing. That was taken from TWBS */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + + /* Uncomment for 3D effect */ + /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ +} +/* DO NOT EDIT! Generated by fount */ + + +.zui-icon-album:before { content: '\e800'; } /* '' */ +.zui-icon-arrow:before { content: '\e801'; } /* '' */ +.zui-icon-camera:before { content: '\e802'; } /* '' */ +.zui-icon-certificate:before { content: '\e803'; } /* '' */ +.zui-icon-check:before { content: '\e804'; } /* '' */ +.zui-icon-checked:before { content: '\e805'; } /* '' */ +.zui-icon-close:before { content: '\e806'; } /* '' */ +.zui-icon-gift:before { content: '\e807'; } /* '' */ +.zui-icon-home:before { content: '\e808'; } /* '' */ +.zui-icon-location:before { content: '\e809'; } /* '' */ +.zui-icon-message:before { content: '\e80a'; } /* '' */ +.zui-icon-send:before { content: '\e80b'; } /* '' */ +.zui-icon-shopping-cart:before { content: '\e80c'; } /* '' */ +.zui-icon-sign:before { content: '\e80d'; } /* '' */ +.zui-icon-store:before { content: '\e80e'; } /* '' */ +.zui-icon-topay:before { content: '\e80f'; } /* '' */ +.zui-icon-tosend:before { content: '\e810'; } /* '' */ \ No newline at end of file diff --git a/packages/zenui/src/index.pcss b/packages/zenui/src/index.pcss index 15f7ab28b..6ef6a9441 100644 --- a/packages/zenui/src/index.pcss +++ b/packages/zenui/src/index.pcss @@ -3,3 +3,4 @@ */ @import '../../button/index.pcss'; @import '../../switch/index.pcss'; +@import './icon.pcss';