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,15 +0,0 @@
|
||||
.topBg {
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: auto;
|
||||
}
|
||||
.contentC {
|
||||
background-color: white;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
margin-top: 10rpx;
|
||||
padding: 50rpx 25rpx;
|
||||
overflow-y: scroll;
|
||||
}
|
||||
Reference in New Issue
Block a user