diff --git a/public/index.html b/public/index.html index c10ff77..c485a61 100644 --- a/public/index.html +++ b/public/index.html @@ -3,14 +3,14 @@ - + <%= htmlWebpackPlugin.options.title %> + + - +
diff --git a/src/App.vue b/src/App.vue index 84f6389..35a5bc5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -32,7 +32,7 @@ - + @@ -229,10 +229,9 @@ export default { right: 0; margin: 0; padding: 0; - line-height: 2.2rem; i { - font-size: 2em; + font-size: 1.75em; } } } diff --git a/src/assets/css/global.less b/src/assets/css/global.less index cedb854..2a70a65 100644 --- a/src/assets/css/global.less +++ b/src/assets/css/global.less @@ -1,4 +1,4 @@ -/* -- 全局样式 -- */ +// 全局样式 // 滚动条 diff --git a/src/assets/css/variable.less b/src/assets/css/variable.less index 3c96bf5..cb63bf9 100644 --- a/src/assets/css/variable.less +++ b/src/assets/css/variable.less @@ -1,4 +1,4 @@ -/* -- 全局变量 -- */ +// 全局变量 @headerHeight: 4rem; diff --git a/src/components/FloatingBtn.vue b/src/components/FloatingBtn.vue index 52396f5..75de380 100644 --- a/src/components/FloatingBtn.vue +++ b/src/components/FloatingBtn.vue @@ -103,6 +103,7 @@ export default { width: 2.6rem; height: 2.6rem; font-size: 1rem; + color: #FFF; } } } @@ -115,8 +116,8 @@ export default { height: 0; background-color: @colorSecondary; font-size: 0; - transition: all calc(@transitionTime * 1.6), - font-size calc(@transitionTime * 0.8); + color: transparent; + transition: all calc(@transitionTime * 1.6); &:not(:first-child) { margin-top: 0.75rem; @@ -171,7 +172,7 @@ export default { } &.animate::after { - animation: floatingBtnClick 0.5s linear; + animation: floatingBtnClick calc(@transitionTime * 2) linear; } } @@ -198,3 +199,12 @@ export default { } } + + diff --git a/src/views/Home.vue b/src/views/Home.vue index cd36113..0660477 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -2,7 +2,7 @@ - + .home-aside { + position: relative; + z-index: 110; width: auto !important; overflow-x: hidden; .side-nav { min-height: 100%; + border: none; } } @@ -409,8 +412,9 @@ export default { flex-direction: column; align-items: center; position: relative; - padding: 1rem 2rem; + padding: 2rem; background-color: @colorWhite; + overflow-x: hidden; overflow-y: scroll; .wrapper { @@ -429,7 +433,7 @@ export default { display: flex; align-items: center; position: sticky; - top: 3rem; + top: 2.5rem; z-index: 100; width: 100%; max-width: 40rem; @@ -494,6 +498,7 @@ export default { .title { margin: 0.5rem 0; + text-align: left; } .el-radio { @@ -650,3 +655,29 @@ export default { } } + +