12

zzzqis · Aug 10, 2017 · a83a682 · a83a682
1 parent 358f5ef
commit a83a682
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 21 deletions.
diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
@@ -51,7 +51,7 @@ module.exports = {
         loader: 'url-loader',
         options: {
           limit: 10000,
-          name: utils.assetsPath('img/[name].[hash:7].[ext]')
+          name: utils.assetsPath('./img/[name].[hash:7].[ext]')
         }
       },
       {

diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
@@ -21,7 +21,7 @@ var webpackConfig = merge(baseWebpackConfig, {
       extract: true
     })
   },
-  devtool: config.build.productionSourceMap ? '#source-map' : false,
+  // devtool: config.build.productionSourceMap ? '#source-map' : false,
   output: {
     path: config.build.assetsRoot,
     filename: utils.assetsPath('js/[name].[chunkhash].js'),

diff --git a/src/App.vue b/src/App.vue
@@ -17,7 +17,6 @@ export default {
   -moz-osx-font-smoothing: grayscale;
   text-align: center;
   color: #2c3e50;
-  margin-top: 10px;
 }
 
 </style>
diff --git a/src/assets/css/cssreset.css b/src/assets/css/cssreset.css
@@ -9,7 +9,7 @@ http://yuilibrary.com/license/
 html{
 	color:#000;
 	background:#FFF;
-}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td,footer,article,aside,header,section,nav,figure,figcaption,hgroup{
+}body,div,dl,dt,dd,ul,ol,li,h1,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td,footer,article,aside,header,section,nav,figure,figcaption,hgroup{
 	margin:0;
 	padding:0;
 }table{
@@ -23,10 +23,7 @@ html{
 }ol,ul{
 	list-style:none;
 }caption,th{
-	text-align:left;
-}h1,h2,h3,h4,h5,h6{
-	font-size:100%;
-	font-weight:normal;
+	text-align:left;	
 }q:before,q:after{
 	content:'';
 }abbr,acronym{
@@ -44,4 +41,14 @@ html{
 }legend{
 	color:#000;
 }#yui3-css-stamp.cssreset{ display:none}
-a{text-decoration: none;}
+a{text-decoration: none;}
+
+#login{
+    position: fixed;  
+    background: url('./../img/sky.jpg');
+    background-size: 100% 110%;
+    width: 100%;
+    height: 100%;  
+    margin: 0px;
+    padding: 0px;
+  }
diff --git a/src/assets/img/sky.jpg b/src/assets/img/sky.jpg
diff --git a/src/assets/img/sky1.jpg b/src/assets/img/sky1.jpg
diff --git a/src/view/login.vue b/src/view/login.vue
@@ -1,6 +1,6 @@
 <template>
 	<div id="login">    
-		<div class="login">
+		<div class="login" >
       <h2>餐饮后台管理系统</h2>
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm" >
 
@@ -115,15 +115,6 @@
   }
 </script>
 <style>
- #login{
-    position: fixed;  
-    background: url('./../assets/img/sky.jpg');
-    background-size: 100% 110%;
-    width: 100%;
-    height: 100%;  
-    margin: 0px;
-    padding: 0px;
-  }
 	.login{
     position: relative;
     width: 400px;
@@ -134,11 +125,11 @@
     border-radius: 6px;
     background:#1d2f47;
     padding-right: 50px;
-    padding-top: 20px;	
+    padding-top: 6px;	
 	}
   h2{
     font-size: 1.5em;
-    padding-bottom: 20px;
+    padding-bottom: 6px;
     font-family: "宋体";
     padding-left: 50px;
     color:#fff;