Selaa lähdekoodia

Merge pull request #23 from QingWei-Li/master

fix contribution url
杨奕 9 vuotta sitten
vanhempi
commit
93efbad47c
4 muutettua tiedostoa jossa 30 lisäystä ja 9 poistoa
  1. 1 1
      .github/PULL_REQUEST_TEMPLATE.md
  2. 21 0
      LICENSE
  3. 7 8
      README.md
  4. 1 0
      package.json

+ 1 - 1
.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,5 @@
 Please makes sure these boxes are checked before submitting your PR, thank you!
 
-* [ ] Make sure you follow Element's [Contributing Guide](https://github.com/elemefe/element/blob/master/CONTRIBUTING.md).
+* [ ] Make sure you follow Element's [Contributing Guide](https://github.com/ElemeFE/element/blob/master/.github/CONTRIBUTING.md).
 * [ ] Rebase before creating a PR to keep commit history clear.
 * [ ] Add some descriptions and refer relative issues for you PR.

+ 21 - 0
LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 element-ui
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

+ 7 - 8
README.md

@@ -1,4 +1,4 @@
-# Element
+# Element [![Build Status](https://api.travis-ci.org/ElemeFE/Element.svg)](https://travis-ci.org/ElemeFE/Element) [![npm package](https://img.shields.io/npm/v/element-ui.svg)](https://www.npmjs.org/package/element-ui) [![NPM downloads](http://img.shields.io/npm/dm/element-ui.svg)](https://npmjs.org/package/element-ui)
 > Desktop UI elements for Vue.js 2.0.
 
 ## Docs
@@ -40,15 +40,15 @@ Vue.component(Button.name, Button)
 ``` javascript
 import Vue from 'vue'
 import Element from 'element-ui'
-import 'element-ui/lib/theme-default/index.css';
+import 'element-ui/lib/theme-default/index.css'
 
 Vue.use(Element)
 
 // or
-import Select from 'element-ui/lib/select';
-import Select from 'element-ui/lib/theme-default/select.css';
-import Button from 'element-ui/lib/button';
-import Button from 'element-ui/lib/theme-default/button.css';
+import Select from 'element-ui/lib/select'
+import Select from 'element-ui/lib/theme-default/select.css'
+import Button from 'element-ui/lib/button'
+import Button from 'element-ui/lib/theme-default/button.css'
 
 Vue.component(Select.name, Select)
 Vue.component(Button.name, Button)
@@ -84,10 +84,9 @@ $ npm run dist
 Details changes for each release are documented in the [release notes](https://github.com/ElemeFE/element/releases).
 
 ## Contribution
-Please make sure to read the [Contributing Guide](https://github.com/elemefe/element/blob/master/CONTRIBUTING.md) before making a pull request.
+Please make sure to read the [Contributing Guide](https://github.com/ElemeFE/element/blob/master/.github/CONTRIBUTING.md) before making a pull request.
 
 ## LICENSE
 MIT
 
-<!-- [![Build Status](https://api.travis-ci.org/ElemeFE/element-ui.svg)](https://travis-ci.org/ElemeFE/element-ui) [![npm package](https://img.shields.io/npm/v/element-ui.svg)](https://www.npmjs.org/package/element-ui) [![NPM downloads](http://img.shields.io/npm/dm/element-ui.svg)](https://npmjs.org/package/element-ui) -->
 

+ 1 - 0
package.json

@@ -52,6 +52,7 @@
     "json-loader": "^0.5.4",
     "json-templater": "^1.0.4",
     "lerna": "2.0.0-beta.18",
+    "markdown-it": "^6.1.1",
     "markdown-it-container": "^2.0.0",
     "markdown-it-toc-and-anchor": "^4.1.1",
     "object-assign": "^4.1.0",