Frans 6 years ago
parent
commit
46f8b643a4

+ 1 - 1
README-zh_CN.md

@@ -46,7 +46,7 @@
 
 https://nutui.jd.com
 
-文档:[2.X](https://nutui.jd.com/default.html#/start) | [1.X](https://nutui.jd.com/1x/index.html#/intro)
+文档:[2.x](https://nutui.jd.com/default.html#/start) | [1.x](https://nutui.jd.com/1x/index.html#/intro)
 
 ## 链接
 * [意见反馈](https://github.com/jdf2e/nutui/issues)

+ 0 - 60
README.cn.md

@@ -1,60 +0,0 @@
-# NutUI 2
-![npm version](https://img.shields.io/npm/v/@nutui/nutui.svg)  [![Build Status](https://api.travis-ci.org/jdf2e/nutui.svg?branch=master)](https://github.com/jdf2e/nutui/) [![Coverage Status](https://coveralls.io/repos/github/jdf2e/nutui/badge.svg?branch=master)](https://coveralls.io/github/jdf2e/nutui?branch=master) ![license](https://img.shields.io/npm/l/@nutui/nutui.svg)
- 
-A light mobile Toolkit based on Vue
-    
-![NutUI](https://img11.360buyimg.com/uba/jfs/t1/11117/21/3608/18942/5c20ab52E35e5a500/02e3c1f89cd3dad1.png)
-
-
-## Features
-
-* Cross-platform,automatically convert to WeChat Mini Program components(coming soon)
-* New structure
-* Used by 30+ JD mobile projects
-* Refer to JD APP 7.0 visual specification
-* On-demand loading support
-* Detailed documents and examples
-* Customize themes support
-* Multiple languages support (Internationalization)
-* TypeScript support
-* Vue Server-side Rendering support(Vue SSR)
-* Unit test blessing
-* A Webpack-based build tool is available to quickly create a Vue project with this component library built in 
-
-> If you want to use the 1.x version, please specify the version number when installing,such as: `npm i @nutui/nutui@1.3.2 -S`
-
-## Environment Support
-
-* Android 4.0+
-* iOS 8.0+
-* Support Vue Server-side Rendering
-
-## Version
-
-* Stable:[![npm](https://img.shields.io/npm/v/@nutui/nutui.svg)](https://www.npmjs.com/package/@nutui/nutui)
-
-> You can also subscribe to: https://github.com/jdf2e/nutui/releases.atom for the notifications of stable releases。
-
-## Examples
-
-![NutUI Demo](https://img14.360buyimg.com/uba/jfs/t1/32118/11/559/2782/5c3d81ecEbda0c0f1/5f2b637d11817204.png)
-
-## Installation
-
-Please refer to the NutUI offcial website for the details on how to use it 
-
-https://nutui.jd.com
-
-Documents:[2.X](https://nutui.jd.com/default.html#/start) | [1.X](https://nutui.jd.com/1x/index.html#/intro)
-
-## Links
-* [Feedback](https://github.com/jdf2e/nutui/issues)
-* [Change Logs](https://github.com/jdf2e/nutui/releases)
-* [On-demand plugins](https://www.npmjs.com/package/@nutui/babel-plugin-separate-import)
-* [Template project command line tool(Gaea-cli)](https://github.com/jdf2e/Gaea4)
-* Contact us:nutui@jd.com
-
-
-## Open Source LICENSE
-
-Based on **MIT** LICENSE

build/webpack.disperse.conf.js → build/webpack.prod.disperse.conf.js


+ 3 - 2
package.json

@@ -22,7 +22,7 @@
     "build:site": "npm run build:demo && npm run build:doc",
     "build:prod": "cross-env NODE_ENV=production webpack --hide-modules --progress --config build/webpack.prod.conf.js && node scripts/createIndexScss.js",
     "build:prodmin": "cross-env NODE_ENV=production webpack --hide-modules --progress --config build/webpack.prod.mini.conf.js",
-    "build:disp": "cross-env NODE_ENV=production webpack --hide-modules --progress --config build/webpack.disperse.conf.js",
+    "build:disp": "cross-env NODE_ENV=production webpack --hide-modules --progress --config build/webpack.prod.disperse.conf.js",
     "build:cmn": "cross-env NODE_ENV=production webpack --hide-modules --progress --config build/webpack.prod.cmn.conf.js",
     "build": "npm run build:prod && npm run build:prodmin && npm run build:cmn && npm run build:disp",
     "eslint": "eslint src/packages/**/*.{js,vue}",
@@ -80,7 +80,7 @@
     "copy": "0.3.2",
     "copy-webpack-plugin": "4.5.4",
     "coveralls": "^3.0.2",
-    "cross-env": "5.2.0",
+    "cross-env": "^5.2.0",
     "css-loader": "1.0.0",
     "eslint": "4.19.1",
     "eslint-loader": "2.1.1",
@@ -107,6 +107,7 @@
     "node-filelist": "^1.0.0",
     "node-notifier": "5.2.1",
     "node-sass": "4.9.3",
+    "npm-run-all": "^4.1.5",
     "nyc": "10.0.0",
     "offline-plugin": "^5.0.6",
     "optimize-css-assets-webpack-plugin": "5.0.0",

+ 1 - 0
src/packages/dialog/dialog.scss

@@ -168,6 +168,7 @@ body.dialog-open {
     background: $btn-gradient-bg;
     background-origin: border-box;
     color: $btn-gradient-color;
+    margin-right:-1px;
     &:active {
         background: $btn-gradient-active-bg;
     }

+ 1 - 0
src/packages/radiogroup/index.js

@@ -1,4 +1,5 @@
 import RadioGroup from './radiogroup.vue';
+import './radiogroup.scss';
 
 RadioGroup.install = function(Vue) {
   Vue.component(RadioGroup.name, RadioGroup);