Skip to content

Commit 7838341

Browse files
gongjsvanoneang
authored andcommitted
fix (#147)
1 parent 050dcd7 commit 7838341

4 files changed

Lines changed: 10 additions & 35 deletions

File tree

src/components/base/date-picker/lin-date-picker.vue

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -60,28 +60,3 @@ export default {
6060
},
6161
}
6262
</script>
63-
64-
<style>
65-
.el-popper[x-placement^="bottom"]{
66-
margin-top: 10px;
67-
}
68-
.el-input__inner{
69-
height: 32px;
70-
line-height: 32px;
71-
}
72-
.el-date-editor .el-range__icon {
73-
height: 32px;
74-
}
75-
.el-date-editor .el-range-separator{
76-
height: 32px;
77-
}
78-
.el-date-table td.start-date span, .el-date-table td.end-date span{
79-
background-color: #3963BC;
80-
}
81-
.el-date-table td.today span{
82-
color: #3963BC;
83-
}
84-
.el-picker-panel__shortcut:hover{
85-
color: #3963BC;
86-
}
87-
</style>

src/components/layout/User.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<li class="password" @click="changePassword">
1818
<i class="iconfont icon-weibaoxitongshangchuanlogo-"></i>
1919
<span>修改登录密码</span>
20-
<l-icon name="icon-star" color="#aaa" width="20px" height="20px"></l-icon>
2120
</li>
2221
<li class="account" @click="outLogin">
2322
<i class="iconfont icon-tuichu"></i>

src/views/log/Log.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,10 @@ export default {
256256
</script>
257257

258258
<style lang="scss" scoped>
259-
259+
.log /deep/ .el-button {
260+
padding-top:12px;
261+
padding-bottom:12px;
262+
}
260263
.log {
261264
262265
.log-header {

yarn.lock

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1560,7 +1560,7 @@ babel-plugin-dynamic-import-node@^2.2.0:
15601560
dependencies:
15611561
object.assign "^4.1.0"
15621562

1563-
babel-runtime@6.x, babel-runtime@^6.0.0:
1563+
babel-runtime@6.x:
15641564
version "6.26.0"
15651565
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
15661566
integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
@@ -1603,13 +1603,6 @@ bcrypt-pbkdf@^1.0.0:
16031603
dependencies:
16041604
tweetnacl "^0.14.3"
16051605

1606-
better-scroll@^1.13.2:
1607-
version "1.13.2"
1608-
resolved "https://registry.yarnpkg.com/better-scroll/-/better-scroll-1.13.2.tgz#31e6e088cf2d23ce48e52fad6cc59134ffeb2f56"
1609-
integrity sha512-JUt5aQYuHMjHNOD5JpIvNT502MlHAPXZsHoA6P2rNgLKX6WPQIoHhpwo0gT9FHgm9uTJ8wEg1HN9ZmRFJYjZLg==
1610-
dependencies:
1611-
babel-runtime "^6.0.0"
1612-
16131606
bfj@^6.1.1:
16141607
version "6.1.1"
16151608
resolved "https://registry.yarnpkg.com/bfj/-/bfj-6.1.1.tgz#05a3b7784fbd72cfa3c22e56002ef99336516c48"
@@ -8073,6 +8066,11 @@ schema-utils@^1.0.0:
80738066
ajv-errors "^1.0.0"
80748067
ajv-keywords "^3.1.0"
80758068

8069+
screenfull@4.2.0:
8070+
version "4.2.0"
8071+
resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-4.2.0.tgz#d5252a5a0f56504719abbed9ebbcd9208115da03"
8072+
integrity sha512-qpyI9XbwuMJElWRP5vTgxkFAl4k7HpyhIqBFOZEwX9QBXn0MAuRSpn7LOc6/4CeSwoz61oBu1VPV+2fbIWC+5Q==
8073+
80768074
scss-tokenizer@^0.2.3:
80778075
version "0.2.3"
80788076
resolved "http://r.cnpmjs.org/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"

0 commit comments

Comments
 (0)