Skip to content

Commit 8597dfa

Browse files
author
胡玖龙
committed
加入现有组件
1 parent 351d79d commit 8597dfa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+5221
-107
lines changed

‎build/utils.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ exports.cssLoaders = function (options) {
4949
css: generateLoaders(),
5050
postcss: generateLoaders(),
5151
less: generateLoaders('less'),
52-
sass: generateLoaders('sass', { indentedSyntax: true }),
53-
scss: generateLoaders('sass'),
52+
sass: generateLoaders('sass', { indentedSyntax: true, includePaths: [ path.resolve(__dirname, "../src/assets/styles") ] }),
53+
scss: generateLoaders('sass', { includePaths: [ path.resolve(__dirname, "../src/assets/styles") ] }),
5454
stylus: generateLoaders('stylus'),
5555
styl: generateLoaders('stylus')
5656
}

‎build/webpack.base.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function resolve (dir) {
99

1010
module.exports = {
1111
entry: {
12-
app: './example/index.js'
12+
app: './example/main.js'
1313
},
1414
output: {
1515
path: config.build.assetsRoot,

‎config/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module.exports = {
2727
},
2828
dev: {
2929
env: require('./dev.env'),
30-
port: 8080,
30+
port: 9200,
3131
autoOpenBrowser: true,
3232
assetsSubDirectory: 'static',
3333
assetsPublicPath: '/',

‎example/App.vue

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<template>
2+
<div id="app">
3+
<color-picker></color-picker>
4+
</div>
5+
</template>
6+
<script>
7+
import {
8+
ColorPicker
9+
} from '@'
10+
11+
export default {
12+
name: 'app',
13+
data() {
14+
return {
15+
color: null,
16+
msg: 'Welcome to Your Vue.js App'
17+
}
18+
},
19+
components: {
20+
ColorPicker
21+
}
22+
}
23+
</script>
24+
<style lang="scss">
25+
#app {
26+
font-family: 'Avenir', Helvetica, Arial, sans-serif;
27+
-webkit-font-smoothing: antialiased;
28+
-moz-osx-font-smoothing: grayscale;
29+
text-align: center;
30+
color: #2c3e50;
31+
margin-top: 60px;
32+
}
33+
34+
h1,
35+
h2 {
36+
font-weight: normal;
37+
}
38+
39+
ul {
40+
list-style-type: none;
41+
padding: 0;
42+
}
43+
44+
li {
45+
display: inline-block;
46+
margin: 0 10px;
47+
}
48+
49+
a {
50+
color: #42b983;
51+
}
52+
</style>

‎example/assets/logo.png

6.69 KB
Loading

‎example/index.js

-12
This file was deleted.

‎example/main.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import Vue from 'vue'
2+
import App from './App.vue'
3+
4+
new Vue({
5+
el: '#app',
6+
render: h => h(App)
7+
})

‎package.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"build": "node build/build.js"
1111
},
1212
"dependencies": {
13+
"lodash.throttle": "^4.1.1",
1314
"vue": "^2.3.3",
1415
"vue-router": "^2.3.1"
1516
},
@@ -32,18 +33,20 @@
3233
"friendly-errors-webpack-plugin": "^1.1.3",
3334
"html-webpack-plugin": "^2.28.0",
3435
"http-proxy-middleware": "^0.17.3",
35-
"webpack-bundle-analyzer": "^2.2.1",
36-
"semver": "^5.3.0",
37-
"shelljs": "^0.7.6",
36+
"node-sass": "^4.5.3",
3837
"opn": "^4.0.2",
3938
"optimize-css-assets-webpack-plugin": "^1.3.0",
4039
"ora": "^1.2.0",
4140
"rimraf": "^2.6.0",
41+
"sass-loader": "^6.0.6",
42+
"semver": "^5.3.0",
43+
"shelljs": "^0.7.6",
4244
"url-loader": "^0.5.8",
4345
"vue-loader": "^12.1.0",
4446
"vue-style-loader": "^3.0.1",
4547
"vue-template-compiler": "^2.3.3",
4648
"webpack": "^2.6.1",
49+
"webpack-bundle-analyzer": "^2.2.1",
4750
"webpack-dev-middleware": "^1.10.0",
4851
"webpack-hot-middleware": "^2.18.0",
4952
"webpack-merge": "^4.1.0"

‎src/App.vue

-23
This file was deleted.

‎src/assets/styles/common.scss

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
$globalFontFamily: 'PingFang SC', "Helvetica Neue", Helvetica, "Microsoft YaHei", Arial, sans-serif;
2+
$title: 13px;
3+
$subtitle: 12px;
4+
5+
$blue: #20A0FF;
6+
$lightBlue: #58B7FF;
7+
$darkBlue: #1D8CE0;
8+
9+
$mainColor: #273142;
10+
11+
$warning: #fd9827;
12+
$success: #3dbf74;
13+
$danger: #d9534f;
14+
15+
16+
$fontWhite: #fff;
17+
$fontBlack: rgba(10,18,32,.87);
18+
$fontGray: #889;
19+
$fontLight: rgba(9,17,32,.65);
20+
21+
$bdGray: #ddd;
22+
$bdBlack: #333;
23+
24+
$bdRadius: 3px;
25+
26+
$bgWhite: #fff;
27+
$bgGray: #eee;
28+
$bgBlack: #333;
29+
30+
@mixin reset {
31+
32+
margin: 0;
33+
border: 0;
34+
padding: 0;
35+
box-sizing: border-box;
36+
37+
* {
38+
margin: 0;
39+
border: 0;
40+
padding: 0;
41+
box-sizing: border-box;
42+
}
43+
44+
font-family: $globalFontFamily;
45+
-webkit-font-smoothing: antialiased;
46+
47+
input,
48+
textarea,
49+
button,
50+
select,
51+
*[contenteditable=true] {
52+
outline: none;
53+
}
54+
55+
a {
56+
text-decoration: none;
57+
}
58+
59+
ul,
60+
li {
61+
list-style: none;
62+
}
63+
64+
}
65+
66+
@mixin clearfix {
67+
content: '';
68+
display: block;
69+
visibility: hidden;
70+
clear: both;
71+
}

0 commit comments

Comments
 (0)