diff --git a/.idea/workspace.xml b/.idea/workspace.xml index faa7726..b371f6e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,7 +1,15 @@ - + + + + + + + + + - + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -34,7 +96,7 @@ - + @@ -55,8 +117,8 @@ - - + + @@ -66,7 +128,7 @@ - + @@ -101,6 +163,8 @@ @@ -119,10 +183,10 @@ DEFINITION_ORDER - @@ -139,27 +203,25 @@ - - - - - - @@ -169,11 +231,11 @@ - - @@ -187,10 +249,12 @@ + + - + @@ -289,14 +353,16 @@ + + - - + @@ -305,7 +371,7 @@ - + @@ -337,6 +403,134 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -350,7 +544,6 @@ - @@ -379,7 +572,7 @@ - + @@ -389,7 +582,6 @@ - @@ -411,14 +603,7 @@ - - - - - - - - + @@ -432,7 +617,6 @@ - @@ -443,7 +627,6 @@ - @@ -457,14 +640,7 @@ - - - - - - - - + @@ -474,35 +650,25 @@ + + + + + - - - - - - - - - - - - - - - + - @@ -510,58 +676,29 @@ - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - + - - + + @@ -579,18 +716,62 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/package.json b/package.json index cd237d8..9a71d7a 100644 --- a/package.json +++ b/package.json @@ -50,4 +50,4 @@ "node": ">= 4.0.0", "npm": ">= 3.0.0" } -} +} \ No newline at end of file diff --git a/src/components/Hello.vue b/src/components/Hello.vue deleted file mode 100644 index 81d4fa7..0000000 --- a/src/components/Hello.vue +++ /dev/null @@ -1,33 +0,0 @@ - - - - diff --git a/src/components/footer.vue b/src/components/footer.vue index 45cebd7..3e9825f 100644 --- a/src/components/footer.vue +++ b/src/components/footer.vue @@ -10,7 +10,7 @@ menu3
- menu4 + menu4
diff --git a/src/components/secondcomponent.vue b/src/components/secondcomponent.vue new file mode 100644 index 0000000..fbfc8ec --- /dev/null +++ b/src/components/secondcomponent.vue @@ -0,0 +1,36 @@ + + + + + + diff --git a/src/components/thirdcomponent.vue b/src/components/thirdcomponent.vue new file mode 100644 index 0000000..8c95223 --- /dev/null +++ b/src/components/thirdcomponent.vue @@ -0,0 +1,32 @@ + + + + + \ No newline at end of file diff --git a/src/css/common.css b/src/css/common.css index 774e8ce..d4148be 100644 --- a/src/css/common.css +++ b/src/css/common.css @@ -14,7 +14,7 @@ a{ text-decoration:none; outline: none;} a:hover{ text-decoration: none; } a:active, a:focus{ outline:none; } b{ font-weight: normal; } -input ,button{ border: none; outline: none;} +/*input ,button{ border: none; outline: none;}*/ input:not([type="radio"]){appearance:none;-webkit-appearance:none;-o-appearance:none;-moz-appearance:none;} button:active{ transform:scale(0.9); @@ -45,20 +45,11 @@ button{ background: none; } - -@font-face { - /*font-family: "iconfont";*/ - /*src: require('iconfont.woff') format('woff'),*/ - /*require('iconfont.ttf') format('truetype'),*/ - /*require('iconfont.svg#iconfont') format('svg');*/ +.text-center{ + text-align: center; } - -.iconfont { - font-family:"iconfont" !important; - font-style:normal; - -webkit-font-smoothing: antialiased; - -webkit-text-stroke-width: 0.2px; - -moz-osx-font-smoothing: grayscale; +.container{ + padding: 0 10px; } [v-cloak] { diff --git a/src/pages/index.vue b/src/pages/index.vue index 0b7c829..14bfb63 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -1,7 +1,7 @@ diff --git a/src/pages/news.vue b/src/pages/news.vue index 173cf79..03e1ceb 100644 --- a/src/pages/news.vue +++ b/src/pages/news.vue @@ -1,95 +1,12 @@ - - + diff --git a/src/pages/otherPages.vue b/src/pages/otherPages.vue index 5b1e787..39ef600 100644 --- a/src/pages/otherPages.vue +++ b/src/pages/otherPages.vue @@ -1,15 +1,47 @@ + + \ No newline at end of file diff --git a/src/pages/otherPages2.vue b/src/pages/otherPages2.vue new file mode 100644 index 0000000..9ad0791 --- /dev/null +++ b/src/pages/otherPages2.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index d9fa933..6c1634e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -6,9 +6,10 @@ import VueRouter from 'vue-router' Vue.config.debug = true Vue.use(VueRouter); -import secondcomponent from '../pages/otherPages.vue' import Index from '../pages/index.vue' import News from '../pages/news.vue' +import secondcomponent from '../pages/otherPages.vue' +import thirdcomponent from '../pages/otherPages2.vue' export default new VueRouter({ mode: 'history', @@ -25,6 +26,10 @@ export default new VueRouter({ { path: '/second', component: secondcomponent + }, + { + path: '/third', + component: thirdcomponent } ] })