Merge branch 'main' of http://git.zihai.cn/szj1219/JiaZhiQianYan-MiniProgram
# Conflicts: # unpackage/dist/dev/.sourcemap/mp-weixin/pages/concept/historicalTimeline/historicalTimeline.js.map # unpackage/dist/dev/mp-weixin/common/vendor.js
This commit is contained in:
@@ -1 +0,0 @@
|
||||
.logo{margin-left:calc((100% - 144rpx)/2);width:144rpx;height:auto}.loginTitle{margin:40rpx 80rpx 0;font-size:40rpx;font-weight:700;text-align:center}.btn{margin:0 75rpx;line-height:80rpx;border-radius:20rpx;font-size:26rpx;font-weight:500;text-align:center}.btn.oneClickLogin{background-color:#f97316;margin-top:60rpx;color:#fff}.btn.oneClickLogin button{top:0;left:0;width:100%;height:100%}.btn.codeLogin{background-color:#fff1e8;margin-top:28rpx;color:#f97316}.agreeProtocolC{left:0;right:0;bottom:calc(120rpx + env(safe-area-inset-bottom));font-size:26rpx;font-weight:500}.agreeProtocolC .agreeC{padding:14rpx}.agreeProtocolC .agreeC .icon{display:block;width:28rpx;height:auto}.agreeProtocolC .protocol{color:#f97316}
|
||||
Reference in New Issue
Block a user