merge upstream

This commit is contained in:
jingsam 2016-11-15 09:34:03 +08:00
commit 6924d5dbc7
15 changed files with 8 additions and 13223 deletions

1
.gitignore vendored
View file

@ -16,3 +16,4 @@ npm-debug.log
*.swo *.swo
*.log *.log
test/dist/ test/dist/
dist/

10960
dist/iview.js vendored

File diff suppressed because it is too large Load diff

5
dist/iview.min.js vendored

File diff suppressed because one or more lines are too long

View file

@ -1 +0,0 @@
.ivu-article h1{font-size:26px;font-weight:400}.ivu-article h2{font-size:20px;font-weight:400}.ivu-article h3{font-size:16px;font-weight:400}.ivu-article h4{font-size:14px;font-weight:400}.ivu-article h5,.ivu-article h6{font-size:12px;font-weight:400}.ivu-article blockquote{padding:5px 5px 3px 10px;line-height:1.5;border-left:4px solid #ddd;margin-bottom:20px;color:#666;font-size:14px}.ivu-article ul{padding-left:40px;list-style-type:disc}.ivu-article li{margin-bottom:5px;font-size:14px}.ivu-article ol ul,.ivu-article ul ul{list-style-type:circle}.ivu-article p{margin:5px;font-size:14px}.ivu-article a[target="_blank"]:after{content:"\F220";font-family:Ionicons;color:#aaa;margin-left:3px}

Binary file not shown.

File diff suppressed because it is too large Load diff

Before

Width:  |  Height:  |  Size: 326 KiB

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -1,6 +0,0 @@
/*!
* iView
* Web: https://www.iviewui.com
* Github: https://github.com/iview/iview
* Author: Aresn
*/.signin{color:red}.signup{color:#f60}

View file

@ -1 +0,0 @@
.signin{color:red}

View file

@ -1 +0,0 @@
.signup{color:#f60}

View file

@ -14,12 +14,17 @@
"framework" "framework"
], ],
"main": "dist/iview.js", "main": "dist/iview.js",
"files": [
"dist",
"src"
],
"scripts": { "scripts": {
"dev": "webpack-dev-server --content-base test/ --open --inline --hot --compress --history-api-fallback --port 8081 --config build/webpack.dev.config.js", "dev": "webpack-dev-server --content-base test/ --open --inline --hot --compress --history-api-fallback --port 8081 --config build/webpack.dev.config.js",
"dist:style": "gulp --gulpfile build/build-style.js", "dist:style": "gulp --gulpfile build/build-style.js",
"dist:dev": "webpack --config build/webpack.dist.dev.config.js", "dist:dev": "webpack --config build/webpack.dist.dev.config.js",
"dist:prod": "webpack --config build/webpack.dist.prod.config.js", "dist:prod": "webpack --config build/webpack.dist.prod.config.js",
"build": "npm run dist:style && npm run dist:dev && npm run dist:prod" "dist": "npm run dist:style && npm run dist:dev && npm run dist:prod",
"prepublish": "npm run dist"
}, },
"repository": { "repository": {
"type": "git", "type": "git",

View file

@ -3,7 +3,7 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>iView test page</title> <title>iView test page</title>
<link href="/test/dist/main.css" rel="stylesheet"></head> <link href="/test/dist/main.css" rel="stylesheet">
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>