Skip to content

S
style_tool
Commit e0e38917 authored by 于广洋's avatar 于广洋
Browse files
Options

调整按钮

parent f6c97b2b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 149 additions and 1030 deletions
build/utils.js
View file @ e0e38917
...@@ -60,15 +60,7 @@ exports.cssLoaders = function (options) { ...@@ -60,15 +60,7 @@ exports.cssLoaders = function (options) {
postcss: generateLoaders(), postcss: generateLoaders(),
less: generateLoaders('less'), less: generateLoaders('less'),
sass: generateLoaders('sass', { indentedSyntax: true }), sass: generateLoaders('sass', { indentedSyntax: true }),
scss: generateLoaders('sass').concat( scss: generateLoaders('sass'),
{
loader: 'sass-resources-loader',
options: {
//你自己的scss全局文件的路径
resources: path.resolve(__dirname, '../src/assets/element-variables.scss')
}
}
),
stylus: generateLoaders('stylus'), stylus: generateLoaders('stylus'),
styl: generateLoaders('stylus') styl: generateLoaders('stylus')
} }
......
package-lock.json
View file @ e0e38917
{ {
"name": "tax_related_institutions", "name": "style-tool",
"version": "1.0.0", "version": "1.0.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
...@@ -2556,6 +2556,23 @@ ...@@ -2556,6 +2556,23 @@
"integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
"dev": true "dev": true
}, },
"clone-deep": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
"integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
"requires": {
"is-plain-object": "^2.0.4",
"kind-of": "^6.0.2",
"shallow-clone": "^3.0.0"
},
"dependencies": {
"kind-of": {
"version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
}
}
},
"co": { "co": {
"version": "4.6.0", "version": "4.6.0",
"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
...@@ -4504,6 +4521,12 @@ ...@@ -4504,6 +4521,12 @@
"integrity": "sha512-zcUd1p/7yzTSdWkCTrqGvbnEOASy96d0RJL/lc5BDJoO23Z3G/VHd0yIPbguDU9n8QNUTCigLO7oEdtOb7fp2A==", "integrity": "sha512-zcUd1p/7yzTSdWkCTrqGvbnEOASy96d0RJL/lc5BDJoO23Z3G/VHd0yIPbguDU9n8QNUTCigLO7oEdtOb7fp2A==",
"dev": true "dev": true
}, },
"element-theme-chalk": {
"version": "2.13.0",
"resolved": "https://registry.npmjs.org/element-theme-chalk/-/element-theme-chalk-2.13.0.tgz",
"integrity": "sha512-xiftE/xHeBPH+sj3jO1Yv3FqGiVhYawVCixmHiPp3pyv6e4Ie8gAw6kvVif0/6fZh0b3+/MtoowphlBSDpuBDA==",
"dev": true
},
"element-ui": { "element-ui": {
"version": "2.13.0", "version": "2.13.0",
"resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.13.0.tgz", "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.13.0.tgz",
...@@ -6782,6 +6805,11 @@ ...@@ -6782,6 +6805,11 @@
"extend": "3" "extend": "3"
} }
}, },
"i": {
"version": "0.3.6",
"resolved": "https://registry.npmjs.org/i/-/i-0.3.6.tgz",
"integrity": "sha1-2WyScyB28HJxG2sQ/X1PZa2O4j0="
},
"iconv-lite": { "iconv-lite": {
"version": "0.4.24", "version": "0.4.24",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
...@@ -7167,7 +7195,6 @@ ...@@ -7167,7 +7195,6 @@
"version": "2.0.4", "version": "2.0.4",
"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
"dev": true,
"requires": { "requires": {
"isobject": "^3.0.1" "isobject": "^3.0.1"
}, },
...@@ -7175,8 +7202,7 @@ ...@@ -7175,8 +7202,7 @@
"isobject": { "isobject": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
"dev": true
} }
} }
}, },
...@@ -13308,6 +13334,72 @@ ...@@ -13308,6 +13334,72 @@
} }
} }
}, },
"sass-loader": {
"version": "7.3.1",
"resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.3.1.tgz",
"integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==",
"dev": true,
"requires": {
"clone-deep": "^4.0.1",
"loader-utils": "^1.0.1",
"neo-async": "^2.5.0",
"pify": "^4.0.1",
"semver": "^6.3.0"
},
"dependencies": {
"pify": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
"dev": true
},
"semver": {
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
}
}
},
"sass-resources-loader": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/sass-resources-loader/-/sass-resources-loader-2.0.1.tgz",
"integrity": "sha512-UsjQWm01xglINC1kPidYwKOBBzOElVupm9RwtOkRlY0hPA4GKi2KFsn4BZypRD1kudaXgUnGnfbiVOE7c+ybAg==",
"dev": true,
"requires": {
"async": "^2.1.4",
"chalk": "^1.1.3",
"glob": "^7.1.1",
"loader-utils": "^1.0.4"
},
"dependencies": {
"ansi-styles": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
"dev": true
},
"chalk": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
"ansi-styles": "^2.2.1",
"escape-string-regexp": "^1.0.2",
"has-ansi": "^2.0.0",
"strip-ansi": "^3.0.0",
"supports-color": "^2.0.0"
}
},
"supports-color": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
"dev": true
}
}
},
"sax": { "sax": {
"version": "1.2.4", "version": "1.2.4",
"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
...@@ -13515,6 +13607,21 @@ ...@@ -13515,6 +13607,21 @@
"safe-buffer": "^5.0.1" "safe-buffer": "^5.0.1"
} }
}, },
"shallow-clone": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
"requires": {
"kind-of": "^6.0.2"
},
"dependencies": {
"kind-of": {
"version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
}
}
},
"shebang-command": { "shebang-command": {
"version": "1.2.0", "version": "1.2.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
......
package.json
View file @ e0e38917
...@@ -13,7 +13,9 @@ ...@@ -13,7 +13,9 @@
"build": "node build/build.js" "build": "node build/build.js"
}, },
"dependencies": { "dependencies": {
"clone-deep": "^4.0.1",
"element-ui": "^2.13.0", "element-ui": "^2.13.0",
"i": "^0.3.6",
"vue": "^2.5.2", "vue": "^2.5.2",
"vue-router": "^3.0.1" "vue-router": "^3.0.1"
}, },
......
src/assets/css/ivn.scss deleted 100644 → 0
View file @ f6c97b2b
This diff is collapsed.
src/assets/element-variables.scss
View file @ e0e38917
...@@ -16,7 +16,7 @@ $--color-transition-base: color .2s cubic-bezier(.645,.045,.355,1) !default; ...@@ -16,7 +16,7 @@ $--color-transition-base: color .2s cubic-bezier(.645,.045,.355,1) !default;
/* Color /* Color
-------------------------- */ -------------------------- */
/// color|1|Brand Color|0 /// color|1|Brand Color|0
$--color-primary: #409EFF !default; $--color-primary: #0994DC !default;
/// color|1|Background Color|4 /// color|1|Background Color|4
$--color-white: #FFFFFF !default; $--color-white: #FFFFFF !default;
/// color|1|Background Color|4 /// color|1|Background Color|4
...@@ -57,7 +57,7 @@ $--color-text-secondary: #909399 !default; ...@@ -57,7 +57,7 @@ $--color-text-secondary: #909399 !default;
/// color|1|Font Color|2 /// color|1|Font Color|2
$--color-text-placeholder: #C0C4CC !default; $--color-text-placeholder: #C0C4CC !default;
/// color|1|Border Color|3 /// color|1|Border Color|3
$--border-color-base: #DCDFE6 !default; $--border-color-base: $--color-primary !default;
/// color|1|Border Color|3 /// color|1|Border Color|3
$--border-color-light: #E4E7ED !default; $--border-color-light: #E4E7ED !default;
/// color|1|Border Color|3 /// color|1|Border Color|3
...@@ -81,9 +81,9 @@ $--border-style-base: solid !default; ...@@ -81,9 +81,9 @@ $--border-style-base: solid !default;
$--border-color-hover: $--color-text-placeholder !default; $--border-color-hover: $--color-text-placeholder !default;
$--border-base: $--border-width-base $--border-style-base $--border-color-base !default; $--border-base: $--border-width-base $--border-style-base $--border-color-base !default;
/// borderRadius|1|Radius|0 /// borderRadius|1|Radius|0
$--border-radius-base: 4px !default; $--border-radius-base: 3px !default;
/// borderRadius|1|Radius|0 /// borderRadius|1|Radius|0
$--border-radius-small: 2px !default; $--border-radius-small: 3px !default;
/// borderRadius|1|Radius|0 /// borderRadius|1|Radius|0
$--border-radius-circle: 100% !default; $--border-radius-circle: 100% !default;
/// borderRadius|1|Radius|0 /// borderRadius|1|Radius|0
...@@ -506,7 +506,7 @@ $--tab-vertical-header-width: 90px !default; ...@@ -506,7 +506,7 @@ $--tab-vertical-header-width: 90px !default;
$--tab-vertical-header-count-color: $--color-white !default; $--tab-vertical-header-count-color: $--color-white !default;
$--tab-vertical-header-count-fill: $--color-text-secondary !default; $--tab-vertical-header-count-fill: $--color-text-secondary !default;
/* Button /* Button 按钮字体 默认
-------------------------- */ -------------------------- */
/// fontSize||Font|1 /// fontSize||Font|1
$--button-font-size: $--font-size-base !default; $--button-font-size: $--font-size-base !default;
...@@ -515,49 +515,49 @@ $--button-font-weight: $--font-weight-primary !default; ...@@ -515,49 +515,49 @@ $--button-font-weight: $--font-weight-primary !default;
/// borderRadius||Border|2 /// borderRadius||Border|2
$--button-border-radius: $--border-radius-base !default; $--button-border-radius: $--border-radius-base !default;
/// padding||Spacing|3 /// padding||Spacing|3
$--button-padding-vertical: 12px !default; $--button-padding-vertical: 11px !default;
/// padding||Spacing|3 /// padding||Spacing|3
$--button-padding-horizontal: 20px !default; $--button-padding-horizontal: 20px !default;
/// fontSize||Font|1 /// fontSize||Font|1 中等
$--button-medium-font-size: $--font-size-base !default; $--button-medium-font-size: $--font-size-base !default;
/// borderRadius||Border|2 /// borderRadius||Border|2
$--button-medium-border-radius: $--border-radius-base !default; $--button-medium-border-radius: $--border-radius-base !default;
/// padding||Spacing|3 /// padding||Spacing|3
$--button-medium-padding-vertical: 10px !default; $--button-medium-padding-vertical: 9px !default;
/// padding||Spacing|3 /// padding||Spacing|3
$--button-medium-padding-horizontal: 20px !default; $--button-medium-padding-horizontal: 20px !default;
/// fontSize||Font|1 /// fontSize||Font|1 小
$--button-small-font-size: 12px !default; $--button-small-font-size: 12px !default;
$--button-small-border-radius: #{$--border-radius-base - 1} !default; $--button-small-border-radius: $--border-radius-base !default;
/// padding||Spacing|3 /// padding||Spacing|3
$--button-small-padding-vertical: 9px !default; $--button-small-padding-vertical: 8px !default;
/// padding||Spacing|3 /// padding||Spacing|3
$--button-small-padding-horizontal: 15px !default; $--button-small-padding-horizontal: 15px !default;
/// fontSize||Font|1 /// fontSize||Font|1
$--button-mini-font-size: 12px !default; $--button-mini-font-size: 12px !default;
$--button-mini-border-radius: #{$--border-radius-base - 1} !default; $--button-mini-border-radius: #{$--border-radius-base - 1} !default;
/// padding||Spacing|3 /// padding||Spacing|3
$--button-mini-padding-vertical: 7px !default; $--button-mini-padding-vertical: 6px !default;
/// padding||Spacing|3 /// padding||Spacing|3
$--button-mini-padding-horizontal: 15px !default; $--button-mini-padding-horizontal: 15px !default;
/// color||Color|0 /// color||Color|0 默认按钮
$--button-default-font-color: $--color-text-regular !default; $--button-default-font-color: $--color-primary !default;
/// color||Color|0 /// color||Color|0
$--button-default-background-color: $--color-white !default; $--button-default-background-color: $--color-white !default;
/// color||Color|0 /// color||Color|0
$--button-default-border-color: $--border-color-base !default; $--button-default-border-color: $--border-color-base !default;
/// color||Color|0 /// color||Color|0 禁用按钮
$--button-disabled-font-color: $--color-text-placeholder !default; $--button-disabled-font-color: $--color-text-placeholder !default;
/// color||Color|0 /// color||Color|0
$--button-disabled-background-color: $--color-white !default; $--button-disabled-background-color: $--color-white !default;
/// color||Color|0 /// color||Color|0
$--button-disabled-border-color: $--border-color-lighter !default; $--button-disabled-border-color: $--border-color-lighter !default;
/// color||Color|0 /// color||Color|0 主要按钮 成功 警告 危险，信息
$--button-primary-border-color: $--color-primary !default; $--button-primary-border-color: $--color-primary !default;
/// color||Color|0 /// color||Color|0
$--button-primary-font-color: $--color-white !default; $--button-primary-font-color: $--color-white !default;
......
src/components/homePage.vue
View file @ e0e38917
<template> <template>
<div> <div>
<el-row> <el-row>
<el-button>默认按钮</el-button>
<el-button type="primary">主要按钮</el-button> <el-button type="primary">主要按钮</el-button>
<el-button type="success">成功按钮</el-button> <el-button size="medium" type="primary">主要按钮</el-button>
<el-button type="info">信息按钮</el-button> <el-button size="small" type="primary">主要按钮</el-button>
<el-button type="warning">警告按钮</el-button> <el-button size="mini" type="primary">主要按钮</el-button>
<el-button type="danger">危险按钮</el-button> </el-row>
<el-row style="padding-top: 20px">
<el-button>默认按钮</el-button>
<el-button size="medium">默认按钮</el-button>
<el-button size="small">默认按钮</el-button>
<el-button size="mini">默认按钮</el-button>
</el-row> </el-row>
<el-row style="padding-top: 20px">
<el-button plain>朴素按钮</el-button>
<el-button size="medium" plain>朴素按钮</el-button>
<el-button size="small" plain>朴素按钮</el-button>
<el-button size="mini" plain>朴素按钮</el-button>
</el-row>
</div> </div>
</template> </template>
......
src/main.js
View file @ e0e38917
...@@ -5,8 +5,8 @@ import App from './App' ...@@ -5,8 +5,8 @@ import App from './App'
import router from './router' import router from './router'
import ElementUI from 'element-ui' import ElementUI from 'element-ui'
/*import 'element-ui/lib/theme-chalk/index.css';*/ /*import 'element-ui/lib/theme-chalk/index.css';*/
/*import '../src/assets/element-variables.scss'*/ import '../src/assets/element-variables.scss'
import '../theme/index.css' /*import '../theme/index.css'*/
Vue.config.productionTip = false Vue.config.productionTip = false
Vue.use(ElementUI) Vue.use(ElementUI)
/* eslint-disable no-new */ /* eslint-disable no-new */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment