diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png deleted file mode 100644 index c518e9d..0000000 --- a/src/assets/login_images/bg.png +++ /dev/null Binary files differ diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png deleted file mode 100644 index c518e9d..0000000 --- a/src/assets/login_images/bg.png +++ /dev/null Binary files differ diff --git a/src/assets/login_images/left.jpg b/src/assets/login_images/left.jpg deleted file mode 100644 index 35ba6f0..0000000 --- a/src/assets/login_images/left.jpg +++ /dev/null Binary files differ diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png deleted file mode 100644 index c518e9d..0000000 --- a/src/assets/login_images/bg.png +++ /dev/null Binary files differ diff --git a/src/assets/login_images/left.jpg b/src/assets/login_images/left.jpg deleted file mode 100644 index 35ba6f0..0000000 --- a/src/assets/login_images/left.jpg +++ /dev/null Binary files differ diff --git a/src/assets/login_images/theme0/bg.png b/src/assets/login_images/theme0/bg.png new file mode 100644 index 0000000..c518e9d --- /dev/null +++ b/src/assets/login_images/theme0/bg.png Binary files differ diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png deleted file mode 100644 index c518e9d..0000000 --- a/src/assets/login_images/bg.png +++ /dev/null Binary files differ diff --git a/src/assets/login_images/left.jpg b/src/assets/login_images/left.jpg deleted file mode 100644 index 35ba6f0..0000000 --- a/src/assets/login_images/left.jpg +++ /dev/null Binary files differ diff --git a/src/assets/login_images/theme0/bg.png b/src/assets/login_images/theme0/bg.png new file mode 100644 index 0000000..c518e9d --- /dev/null +++ b/src/assets/login_images/theme0/bg.png Binary files differ diff --git a/src/assets/login_images/theme0/left.jpg b/src/assets/login_images/theme0/left.jpg new file mode 100644 index 0000000..35ba6f0 --- /dev/null +++ b/src/assets/login_images/theme0/left.jpg Binary files differ diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png deleted file mode 100644 index c518e9d..0000000 --- a/src/assets/login_images/bg.png +++ /dev/null Binary files differ diff --git a/src/assets/login_images/left.jpg b/src/assets/login_images/left.jpg deleted file mode 100644 index 35ba6f0..0000000 --- a/src/assets/login_images/left.jpg +++ /dev/null Binary files differ diff --git a/src/assets/login_images/theme0/bg.png b/src/assets/login_images/theme0/bg.png new file mode 100644 index 0000000..c518e9d --- /dev/null +++ b/src/assets/login_images/theme0/bg.png Binary files differ diff --git a/src/assets/login_images/theme0/left.jpg b/src/assets/login_images/theme0/left.jpg new file mode 100644 index 0000000..35ba6f0 --- /dev/null +++ b/src/assets/login_images/theme0/left.jpg Binary files differ diff --git a/src/assets/login_images/theme1/background.png b/src/assets/login_images/theme1/background.png new file mode 100644 index 0000000..9e7de75 --- /dev/null +++ b/src/assets/login_images/theme1/background.png Binary files differ diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png deleted file mode 100644 index c518e9d..0000000 --- a/src/assets/login_images/bg.png +++ /dev/null Binary files differ diff --git a/src/assets/login_images/left.jpg b/src/assets/login_images/left.jpg deleted file mode 100644 index 35ba6f0..0000000 --- a/src/assets/login_images/left.jpg +++ /dev/null Binary files differ diff --git a/src/assets/login_images/theme0/bg.png b/src/assets/login_images/theme0/bg.png new file mode 100644 index 0000000..c518e9d --- /dev/null +++ b/src/assets/login_images/theme0/bg.png Binary files differ diff --git a/src/assets/login_images/theme0/left.jpg b/src/assets/login_images/theme0/left.jpg new file mode 100644 index 0000000..35ba6f0 --- /dev/null +++ b/src/assets/login_images/theme0/left.jpg Binary files differ diff --git a/src/assets/login_images/theme1/background.png b/src/assets/login_images/theme1/background.png new file mode 100644 index 0000000..9e7de75 --- /dev/null +++ b/src/assets/login_images/theme1/background.png Binary files differ diff --git a/src/assets/login_images/theme1/leftImg.png b/src/assets/login_images/theme1/leftImg.png new file mode 100644 index 0000000..ae7d911 --- /dev/null +++ b/src/assets/login_images/theme1/leftImg.png Binary files differ diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png deleted file mode 100644 index c518e9d..0000000 --- a/src/assets/login_images/bg.png +++ /dev/null Binary files differ diff --git a/src/assets/login_images/left.jpg b/src/assets/login_images/left.jpg deleted file mode 100644 index 35ba6f0..0000000 --- a/src/assets/login_images/left.jpg +++ /dev/null Binary files differ diff --git a/src/assets/login_images/theme0/bg.png b/src/assets/login_images/theme0/bg.png new file mode 100644 index 0000000..c518e9d --- /dev/null +++ b/src/assets/login_images/theme0/bg.png Binary files differ diff --git a/src/assets/login_images/theme0/left.jpg b/src/assets/login_images/theme0/left.jpg new file mode 100644 index 0000000..35ba6f0 --- /dev/null +++ b/src/assets/login_images/theme0/left.jpg Binary files differ diff --git a/src/assets/login_images/theme1/background.png b/src/assets/login_images/theme1/background.png new file mode 100644 index 0000000..9e7de75 --- /dev/null +++ b/src/assets/login_images/theme1/background.png Binary files differ diff --git a/src/assets/login_images/theme1/leftImg.png b/src/assets/login_images/theme1/leftImg.png new file mode 100644 index 0000000..ae7d911 --- /dev/null +++ b/src/assets/login_images/theme1/leftImg.png Binary files differ diff --git a/src/assets/login_images/theme1/logo.png b/src/assets/login_images/theme1/logo.png new file mode 100644 index 0000000..46e3614 --- /dev/null +++ b/src/assets/login_images/theme1/logo.png Binary files differ diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png deleted file mode 100644 index c518e9d..0000000 --- a/src/assets/login_images/bg.png +++ /dev/null Binary files differ diff --git a/src/assets/login_images/left.jpg b/src/assets/login_images/left.jpg deleted file mode 100644 index 35ba6f0..0000000 --- a/src/assets/login_images/left.jpg +++ /dev/null Binary files differ diff --git a/src/assets/login_images/theme0/bg.png b/src/assets/login_images/theme0/bg.png new file mode 100644 index 0000000..c518e9d --- /dev/null +++ b/src/assets/login_images/theme0/bg.png Binary files differ diff --git a/src/assets/login_images/theme0/left.jpg b/src/assets/login_images/theme0/left.jpg new file mode 100644 index 0000000..35ba6f0 --- /dev/null +++ b/src/assets/login_images/theme0/left.jpg Binary files differ diff --git a/src/assets/login_images/theme1/background.png b/src/assets/login_images/theme1/background.png new file mode 100644 index 0000000..9e7de75 --- /dev/null +++ b/src/assets/login_images/theme1/background.png Binary files differ diff --git a/src/assets/login_images/theme1/leftImg.png b/src/assets/login_images/theme1/leftImg.png new file mode 100644 index 0000000..ae7d911 --- /dev/null +++ b/src/assets/login_images/theme1/leftImg.png Binary files differ diff --git a/src/assets/login_images/theme1/logo.png b/src/assets/login_images/theme1/logo.png new file mode 100644 index 0000000..46e3614 --- /dev/null +++ b/src/assets/login_images/theme1/logo.png Binary files differ diff --git a/src/assets/login_images/theme2/bg-blue.png b/src/assets/login_images/theme2/bg-blue.png new file mode 100644 index 0000000..a408d14 --- /dev/null +++ b/src/assets/login_images/theme2/bg-blue.png Binary files differ diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png deleted file mode 100644 index c518e9d..0000000 --- a/src/assets/login_images/bg.png +++ /dev/null Binary files differ diff --git a/src/assets/login_images/left.jpg b/src/assets/login_images/left.jpg deleted file mode 100644 index 35ba6f0..0000000 --- a/src/assets/login_images/left.jpg +++ /dev/null Binary files differ diff --git a/src/assets/login_images/theme0/bg.png b/src/assets/login_images/theme0/bg.png new file mode 100644 index 0000000..c518e9d --- /dev/null +++ b/src/assets/login_images/theme0/bg.png Binary files differ diff --git a/src/assets/login_images/theme0/left.jpg b/src/assets/login_images/theme0/left.jpg new file mode 100644 index 0000000..35ba6f0 --- /dev/null +++ b/src/assets/login_images/theme0/left.jpg Binary files differ diff --git a/src/assets/login_images/theme1/background.png b/src/assets/login_images/theme1/background.png new file mode 100644 index 0000000..9e7de75 --- /dev/null +++ b/src/assets/login_images/theme1/background.png Binary files differ diff --git a/src/assets/login_images/theme1/leftImg.png b/src/assets/login_images/theme1/leftImg.png new file mode 100644 index 0000000..ae7d911 --- /dev/null +++ b/src/assets/login_images/theme1/leftImg.png Binary files differ diff --git a/src/assets/login_images/theme1/logo.png b/src/assets/login_images/theme1/logo.png new file mode 100644 index 0000000..46e3614 --- /dev/null +++ b/src/assets/login_images/theme1/logo.png Binary files differ diff --git a/src/assets/login_images/theme2/bg-blue.png b/src/assets/login_images/theme2/bg-blue.png new file mode 100644 index 0000000..a408d14 --- /dev/null +++ b/src/assets/login_images/theme2/bg-blue.png Binary files differ diff --git a/src/assets/login_images/theme2/bg-login.png b/src/assets/login_images/theme2/bg-login.png new file mode 100644 index 0000000..390b452 --- /dev/null +++ b/src/assets/login_images/theme2/bg-login.png Binary files differ diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png deleted file mode 100644 index c518e9d..0000000 --- a/src/assets/login_images/bg.png +++ /dev/null Binary files differ diff --git a/src/assets/login_images/left.jpg b/src/assets/login_images/left.jpg deleted file mode 100644 index 35ba6f0..0000000 --- a/src/assets/login_images/left.jpg +++ /dev/null Binary files differ diff --git a/src/assets/login_images/theme0/bg.png b/src/assets/login_images/theme0/bg.png new file mode 100644 index 0000000..c518e9d --- /dev/null +++ b/src/assets/login_images/theme0/bg.png Binary files differ diff --git a/src/assets/login_images/theme0/left.jpg b/src/assets/login_images/theme0/left.jpg new file mode 100644 index 0000000..35ba6f0 --- /dev/null +++ b/src/assets/login_images/theme0/left.jpg Binary files differ diff --git a/src/assets/login_images/theme1/background.png b/src/assets/login_images/theme1/background.png new file mode 100644 index 0000000..9e7de75 --- /dev/null +++ b/src/assets/login_images/theme1/background.png Binary files differ diff --git a/src/assets/login_images/theme1/leftImg.png b/src/assets/login_images/theme1/leftImg.png new file mode 100644 index 0000000..ae7d911 --- /dev/null +++ b/src/assets/login_images/theme1/leftImg.png Binary files differ diff --git a/src/assets/login_images/theme1/logo.png b/src/assets/login_images/theme1/logo.png new file mode 100644 index 0000000..46e3614 --- /dev/null +++ b/src/assets/login_images/theme1/logo.png Binary files differ diff --git a/src/assets/login_images/theme2/bg-blue.png b/src/assets/login_images/theme2/bg-blue.png new file mode 100644 index 0000000..a408d14 --- /dev/null +++ b/src/assets/login_images/theme2/bg-blue.png Binary files differ diff --git a/src/assets/login_images/theme2/bg-login.png b/src/assets/login_images/theme2/bg-login.png new file mode 100644 index 0000000..390b452 --- /dev/null +++ b/src/assets/login_images/theme2/bg-login.png Binary files differ diff --git a/src/assets/login_images/theme2/small.png b/src/assets/login_images/theme2/small.png new file mode 100644 index 0000000..7d425c4 --- /dev/null +++ b/src/assets/login_images/theme2/small.png Binary files differ diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png deleted file mode 100644 index c518e9d..0000000 --- a/src/assets/login_images/bg.png +++ /dev/null Binary files differ diff --git a/src/assets/login_images/left.jpg b/src/assets/login_images/left.jpg deleted file mode 100644 index 35ba6f0..0000000 --- a/src/assets/login_images/left.jpg +++ /dev/null Binary files differ diff --git a/src/assets/login_images/theme0/bg.png b/src/assets/login_images/theme0/bg.png new file mode 100644 index 0000000..c518e9d --- /dev/null +++ b/src/assets/login_images/theme0/bg.png Binary files differ diff --git a/src/assets/login_images/theme0/left.jpg b/src/assets/login_images/theme0/left.jpg new file mode 100644 index 0000000..35ba6f0 --- /dev/null +++ b/src/assets/login_images/theme0/left.jpg Binary files differ diff --git a/src/assets/login_images/theme1/background.png b/src/assets/login_images/theme1/background.png new file mode 100644 index 0000000..9e7de75 --- /dev/null +++ b/src/assets/login_images/theme1/background.png Binary files differ diff --git a/src/assets/login_images/theme1/leftImg.png b/src/assets/login_images/theme1/leftImg.png new file mode 100644 index 0000000..ae7d911 --- /dev/null +++ b/src/assets/login_images/theme1/leftImg.png Binary files differ diff --git a/src/assets/login_images/theme1/logo.png b/src/assets/login_images/theme1/logo.png new file mode 100644 index 0000000..46e3614 --- /dev/null +++ b/src/assets/login_images/theme1/logo.png Binary files differ diff --git a/src/assets/login_images/theme2/bg-blue.png b/src/assets/login_images/theme2/bg-blue.png new file mode 100644 index 0000000..a408d14 --- /dev/null +++ b/src/assets/login_images/theme2/bg-blue.png Binary files differ diff --git a/src/assets/login_images/theme2/bg-login.png b/src/assets/login_images/theme2/bg-login.png new file mode 100644 index 0000000..390b452 --- /dev/null +++ b/src/assets/login_images/theme2/bg-login.png Binary files differ diff --git a/src/assets/login_images/theme2/small.png b/src/assets/login_images/theme2/small.png new file mode 100644 index 0000000..7d425c4 --- /dev/null +++ b/src/assets/login_images/theme2/small.png Binary files differ diff --git a/src/assets/login_images/theme2/title.png b/src/assets/login_images/theme2/title.png new file mode 100644 index 0000000..718934c --- /dev/null +++ b/src/assets/login_images/theme2/title.png Binary files differ diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png deleted file mode 100644 index c518e9d..0000000 --- a/src/assets/login_images/bg.png +++ /dev/null Binary files differ diff --git a/src/assets/login_images/left.jpg b/src/assets/login_images/left.jpg deleted file mode 100644 index 35ba6f0..0000000 --- a/src/assets/login_images/left.jpg +++ /dev/null Binary files differ diff --git a/src/assets/login_images/theme0/bg.png b/src/assets/login_images/theme0/bg.png new file mode 100644 index 0000000..c518e9d --- /dev/null +++ b/src/assets/login_images/theme0/bg.png Binary files differ diff --git a/src/assets/login_images/theme0/left.jpg b/src/assets/login_images/theme0/left.jpg new file mode 100644 index 0000000..35ba6f0 --- /dev/null +++ b/src/assets/login_images/theme0/left.jpg Binary files differ diff --git a/src/assets/login_images/theme1/background.png b/src/assets/login_images/theme1/background.png new file mode 100644 index 0000000..9e7de75 --- /dev/null +++ b/src/assets/login_images/theme1/background.png Binary files differ diff --git a/src/assets/login_images/theme1/leftImg.png b/src/assets/login_images/theme1/leftImg.png new file mode 100644 index 0000000..ae7d911 --- /dev/null +++ b/src/assets/login_images/theme1/leftImg.png Binary files differ diff --git a/src/assets/login_images/theme1/logo.png b/src/assets/login_images/theme1/logo.png new file mode 100644 index 0000000..46e3614 --- /dev/null +++ b/src/assets/login_images/theme1/logo.png Binary files differ diff --git a/src/assets/login_images/theme2/bg-blue.png b/src/assets/login_images/theme2/bg-blue.png new file mode 100644 index 0000000..a408d14 --- /dev/null +++ b/src/assets/login_images/theme2/bg-blue.png Binary files differ diff --git a/src/assets/login_images/theme2/bg-login.png b/src/assets/login_images/theme2/bg-login.png new file mode 100644 index 0000000..390b452 --- /dev/null +++ b/src/assets/login_images/theme2/bg-login.png Binary files differ diff --git a/src/assets/login_images/theme2/small.png b/src/assets/login_images/theme2/small.png new file mode 100644 index 0000000..7d425c4 --- /dev/null +++ b/src/assets/login_images/theme2/small.png Binary files differ diff --git a/src/assets/login_images/theme2/title.png b/src/assets/login_images/theme2/title.png new file mode 100644 index 0000000..718934c --- /dev/null +++ b/src/assets/login_images/theme2/title.png Binary files differ diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index 2debe8d..939dda6 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -8,6 +8,20 @@ .el-upload__input { display: none; } +// 解决input 填空区占位符的颜色问题 +$placeholder-color:#C0C4CC; +input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{ + color:$placeholder-color !important; +} +input:-moz-placeholder,textarea:-moz-placeholder{ + color:$placeholder-color !important; +} +input::-moz-placeholder,textarea::-moz-placeholder{ + color:$placeholder-color !important; +} +input:-ms-input-placeholder,textarea:-ms-input-placeholder{ + color:$placeholder-color !important; +} //暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461 .el-dialog { @@ -52,12 +66,3 @@ .el-range-separator{ width: 7% !important; } -//高德地图info窗口 -.amap-info-content{ - padding: 0px; -} -.amap-info-close{ - right: 10px !important; - top: 15px; -} - diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png deleted file mode 100644 index c518e9d..0000000 --- a/src/assets/login_images/bg.png +++ /dev/null Binary files differ diff --git a/src/assets/login_images/left.jpg b/src/assets/login_images/left.jpg deleted file mode 100644 index 35ba6f0..0000000 --- a/src/assets/login_images/left.jpg +++ /dev/null Binary files differ diff --git a/src/assets/login_images/theme0/bg.png b/src/assets/login_images/theme0/bg.png new file mode 100644 index 0000000..c518e9d --- /dev/null +++ b/src/assets/login_images/theme0/bg.png Binary files differ diff --git a/src/assets/login_images/theme0/left.jpg b/src/assets/login_images/theme0/left.jpg new file mode 100644 index 0000000..35ba6f0 --- /dev/null +++ b/src/assets/login_images/theme0/left.jpg Binary files differ diff --git a/src/assets/login_images/theme1/background.png b/src/assets/login_images/theme1/background.png new file mode 100644 index 0000000..9e7de75 --- /dev/null +++ b/src/assets/login_images/theme1/background.png Binary files differ diff --git a/src/assets/login_images/theme1/leftImg.png b/src/assets/login_images/theme1/leftImg.png new file mode 100644 index 0000000..ae7d911 --- /dev/null +++ b/src/assets/login_images/theme1/leftImg.png Binary files differ diff --git a/src/assets/login_images/theme1/logo.png b/src/assets/login_images/theme1/logo.png new file mode 100644 index 0000000..46e3614 --- /dev/null +++ b/src/assets/login_images/theme1/logo.png Binary files differ diff --git a/src/assets/login_images/theme2/bg-blue.png b/src/assets/login_images/theme2/bg-blue.png new file mode 100644 index 0000000..a408d14 --- /dev/null +++ b/src/assets/login_images/theme2/bg-blue.png Binary files differ diff --git a/src/assets/login_images/theme2/bg-login.png b/src/assets/login_images/theme2/bg-login.png new file mode 100644 index 0000000..390b452 --- /dev/null +++ b/src/assets/login_images/theme2/bg-login.png Binary files differ diff --git a/src/assets/login_images/theme2/small.png b/src/assets/login_images/theme2/small.png new file mode 100644 index 0000000..7d425c4 --- /dev/null +++ b/src/assets/login_images/theme2/small.png Binary files differ diff --git a/src/assets/login_images/theme2/title.png b/src/assets/login_images/theme2/title.png new file mode 100644 index 0000000..718934c --- /dev/null +++ b/src/assets/login_images/theme2/title.png Binary files differ diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index 2debe8d..939dda6 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -8,6 +8,20 @@ .el-upload__input { display: none; } +// 解决input 填空区占位符的颜色问题 +$placeholder-color:#C0C4CC; +input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{ + color:$placeholder-color !important; +} +input:-moz-placeholder,textarea:-moz-placeholder{ + color:$placeholder-color !important; +} +input::-moz-placeholder,textarea::-moz-placeholder{ + color:$placeholder-color !important; +} +input:-ms-input-placeholder,textarea:-ms-input-placeholder{ + color:$placeholder-color !important; +} //暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461 .el-dialog { @@ -52,12 +66,3 @@ .el-range-separator{ width: 7% !important; } -//高德地图info窗口 -.amap-info-content{ - padding: 0px; -} -.amap-info-close{ - right: 10px !important; - top: 15px; -} - diff --git a/src/styles/element-variables.scss b/src/styles/element-variables.scss new file mode 100644 index 0000000..3c2f0dd --- /dev/null +++ b/src/styles/element-variables.scss @@ -0,0 +1,31 @@ +/** +* I think element-ui's default theme color is too light for long-term use. +* So I modified the default color and you can modify it to your liking. +**/ + +/* theme color */ +$--color-primary: #1890ff; +$--color-success: #13ce66; +$--color-warning: #FFBA00; +$--color-danger: #ff4949; +// $--color-info: #1E1E1E; + +//$--button-font-weight: 400; + +// $--color-text-regular: #1f2d3d; +// +//$--border-color-light: #dfe4ed; +//$--border-color-lighter: #e6ebf5; +// +//$--table-border:1px solid#dfe6ec; +// +///* icon font path, required */ +//$--font-path: '~element-ui/lib/theme-chalk/fonts'; +// +//@import "~element-ui/packages/theme-chalk/src/index"; + +// the :export directive is the magic sauce for webpack +// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass +:export { + theme: $--color-primary; +} diff --git a/src/assets/login_images/bg.png b/src/assets/login_images/bg.png deleted file mode 100644 index c518e9d..0000000 --- a/src/assets/login_images/bg.png +++ /dev/null Binary files differ diff --git a/src/assets/login_images/left.jpg b/src/assets/login_images/left.jpg deleted file mode 100644 index 35ba6f0..0000000 --- a/src/assets/login_images/left.jpg +++ /dev/null Binary files differ diff --git a/src/assets/login_images/theme0/bg.png b/src/assets/login_images/theme0/bg.png new file mode 100644 index 0000000..c518e9d --- /dev/null +++ b/src/assets/login_images/theme0/bg.png Binary files differ diff --git a/src/assets/login_images/theme0/left.jpg b/src/assets/login_images/theme0/left.jpg new file mode 100644 index 0000000..35ba6f0 --- /dev/null +++ b/src/assets/login_images/theme0/left.jpg Binary files differ diff --git a/src/assets/login_images/theme1/background.png b/src/assets/login_images/theme1/background.png new file mode 100644 index 0000000..9e7de75 --- /dev/null +++ b/src/assets/login_images/theme1/background.png Binary files differ diff --git a/src/assets/login_images/theme1/leftImg.png b/src/assets/login_images/theme1/leftImg.png new file mode 100644 index 0000000..ae7d911 --- /dev/null +++ b/src/assets/login_images/theme1/leftImg.png Binary files differ diff --git a/src/assets/login_images/theme1/logo.png b/src/assets/login_images/theme1/logo.png new file mode 100644 index 0000000..46e3614 --- /dev/null +++ b/src/assets/login_images/theme1/logo.png Binary files differ diff --git a/src/assets/login_images/theme2/bg-blue.png b/src/assets/login_images/theme2/bg-blue.png new file mode 100644 index 0000000..a408d14 --- /dev/null +++ b/src/assets/login_images/theme2/bg-blue.png Binary files differ diff --git a/src/assets/login_images/theme2/bg-login.png b/src/assets/login_images/theme2/bg-login.png new file mode 100644 index 0000000..390b452 --- /dev/null +++ b/src/assets/login_images/theme2/bg-login.png Binary files differ diff --git a/src/assets/login_images/theme2/small.png b/src/assets/login_images/theme2/small.png new file mode 100644 index 0000000..7d425c4 --- /dev/null +++ b/src/assets/login_images/theme2/small.png Binary files differ diff --git a/src/assets/login_images/theme2/title.png b/src/assets/login_images/theme2/title.png new file mode 100644 index 0000000..718934c --- /dev/null +++ b/src/assets/login_images/theme2/title.png Binary files differ diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index 2debe8d..939dda6 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -8,6 +8,20 @@ .el-upload__input { display: none; } +// 解决input 填空区占位符的颜色问题 +$placeholder-color:#C0C4CC; +input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{ + color:$placeholder-color !important; +} +input:-moz-placeholder,textarea:-moz-placeholder{ + color:$placeholder-color !important; +} +input::-moz-placeholder,textarea::-moz-placeholder{ + color:$placeholder-color !important; +} +input:-ms-input-placeholder,textarea:-ms-input-placeholder{ + color:$placeholder-color !important; +} //暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461 .el-dialog { @@ -52,12 +66,3 @@ .el-range-separator{ width: 7% !important; } -//高德地图info窗口 -.amap-info-content{ - padding: 0px; -} -.amap-info-close{ - right: 10px !important; - top: 15px; -} - diff --git a/src/styles/element-variables.scss b/src/styles/element-variables.scss new file mode 100644 index 0000000..3c2f0dd --- /dev/null +++ b/src/styles/element-variables.scss @@ -0,0 +1,31 @@ +/** +* I think element-ui's default theme color is too light for long-term use. +* So I modified the default color and you can modify it to your liking. +**/ + +/* theme color */ +$--color-primary: #1890ff; +$--color-success: #13ce66; +$--color-warning: #FFBA00; +$--color-danger: #ff4949; +// $--color-info: #1E1E1E; + +//$--button-font-weight: 400; + +// $--color-text-regular: #1f2d3d; +// +//$--border-color-light: #dfe4ed; +//$--border-color-lighter: #e6ebf5; +// +//$--table-border:1px solid#dfe6ec; +// +///* icon font path, required */ +//$--font-path: '~element-ui/lib/theme-chalk/fonts'; +// +//@import "~element-ui/packages/theme-chalk/src/index"; + +// the :export directive is the magic sauce for webpack +// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass +:export { + theme: $--color-primary; +} diff --git a/src/views/login/index.vue b/src/views/login/index.vue index daf44ff..71a2571 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -1,4 +1,4 @@ - +