diff --git a/src/components/SimpleKeyboard.vue b/src/components/SimpleKeyboard.vue index 2b1b797..ad6aeb1 100644 --- a/src/components/SimpleKeyboard.vue +++ b/src/components/SimpleKeyboard.vue @@ -177,14 +177,12 @@ export default { .hg-theme-default visibility hidden position fixed - left: 0; - right: 0; - bottom: 0; - z-index: 1000; - width 100%; - padding: 1em; - background-color: #eee; - box-shadow: 0 -3px 10px rgba(0,0,0,.3); + right: 64px; + bottom: 54px; + z-index 1000 + width 66.917% + padding: 5px; + background-color: #ececec; border-radius: 10px; font-family: -apple-system,BlinkMacSystemFont,'Helvetica Neue',Helvetica,Segoe UI,Arial,Roboto,'PingFang SC',miui,'Hiragino Sans GB','Microsoft Yahei',sans-serif; overflow visible @@ -192,23 +190,23 @@ export default { width: 100%; margin: 0; & .hg-row:not(:last-child) - margin-bottom: 0.5em; + margin-bottom: 5px; & .hg-row justify-content: space-around; & .hg-row .hg-button:not(:last-child) - margin-right: 0.5em; + margin-right: 5px; & .hg-button flex: 40; - height: 2.2em; - line-height: 2.2em; + height: 60px; + line-height: 60px; overflow: hidden; vertical-align: middle; - border: 1px solid #ccc; - color: #333; background-color: #fff; - box-shadow: 0 2px 2px rgba(0,0,0,.6); - border-radius: 0.35em; - font-size: 1.25em; + border-bottom: 1px solid #b5b5b5; + border-radius: 5px; + box-shadow: 0 0 3px -1px rgba(0,0,0,.3); + color: #333; + font-size: 23px; text-align: center; white-space: nowrap; -webkit-user-select: none; @@ -234,22 +232,22 @@ export default { background-repeat: no-repeat; background-size: 35%; color: #fff; - background-color: #7d7d7d; + background-color: #b3b3b3; border-color: #656565; span color transparent & .hg-gray - color: #fff; - background-color: #7d7d7d; - border-color: #656565; + // color: #fff; + // background-color: #7d7d7d; + // border-color: #656565; & .hg-blue - color: #fff; - background-color: #337ab7; - border-color: #2e6da4; + // color: #fff; + // background-color: #337ab7; + // border-color: #2e6da4; & .hg-blue2 - color: #fff; - background-color: #5bc0de; - border-color: #46b8da; + // color: #fff; + // background-color: #5bc0de; + // border-color: #46b8da; & .hg-button-tab flex: 60 1 0%; & .hg-button-lock, .hg-button-enter diff --git a/src/pages/modules/login/login.vue b/src/pages/modules/login/login.vue index 8de1a62..8ae522d 100644 --- a/src/pages/modules/login/login.vue +++ b/src/pages/modules/login/login.vue @@ -307,19 +307,6 @@ export default { _font(14px, 24px, #fff,,center) .footer_p2 _font(15px, 24px, #fff,,center) -#keyboard - position fixed - left 0 - right 0 - bottom 0 - z-index 1000 - width 100% - // max-width 1366px - margin 0 auto - padding 1em - background-color #EEE - box-shadow 0px -3px 10px rgba(black, 0.3) - border-radius 10px .enClass .login_value width calc(100% - 165px) diff --git a/src/style/common.styl b/src/style/common.styl index 0144412..08f6e99 100644 --- a/src/style/common.styl +++ b/src/style/common.styl @@ -408,17 +408,32 @@ _fj(center) #keyboard position fixed - left 0 - right 0 - bottom 0 + right: 64px; + bottom: 54px; z-index 1000 - width 100% - // max-width 1366px - margin 0 auto - padding 1em - background-color #EEE + width 66.917% + padding: 5px; + background-color: #ececec; box-shadow 0px -3px 10px rgba(black, 0.3) border-radius 10px + .keyboard + .line:not(:last-child) + margin-bottom: 5px; + .key + height: 60px; + line-height: 60px; + background-color: #fff; + border: none; + border-bottom: 1px solid #b5b5b5; + border-radius: 5px; + box-shadow: 0 0 3px -1px rgba(0,0,0,.3); + color: #333; + font-size: 23px; + &:not(:last-child) + margin-right: 5px; + .backspace + background-color: #b3b3b3; + // 用户管理 .buttons_wrapper