Browse Source

Merge branch 'dev' of https://github.com/jdf2e/nutui into dev

zhenyulei 7 years ago
parent
commit
f029a084a8
2 changed files with 2 additions and 2 deletions
  1. 1 1
      src/demo.vue
  2. 1 1
      webpack.config.js

+ 1 - 1
src/demo.vue

@@ -22,11 +22,11 @@ body{
 }
 }
 .demo-wrapper{
 .demo-wrapper{
   background-color:#F8F8F8;
   background-color:#F8F8F8;
+  min-height:100vh;
 }
 }
 .demo{
 .demo{
   padding: 8px;
   padding: 8px;
   padding-top: 40px;
   padding-top: 40px;
-  min-height:100vh;
   box-sizing:border-box;
   box-sizing:border-box;
 }
 }
 .button-primary {
 .button-primary {

+ 1 - 1
webpack.config.js

@@ -122,7 +122,7 @@ if (isProduction) {
     webpackConfig.devServer = {
     webpackConfig.devServer = {
         contentBase: path.resolve(__dirname, 'dist'),
         contentBase: path.resolve(__dirname, 'dist'),
         compress: true, //gzip压缩
         compress: true, //gzip压缩
-        // host:'10.0.39.18',
+        //host:'10.0.39.18',
         historyApiFallback: true
         historyApiFallback: true
     };
     };
 }
 }