cxc/yshopb2c-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

合并冲突

Browse Source
This commit is contained in:
Gao xiaosong
2021-06-02 01:12:09 +08:00
parent 8309c2b948
commit a3440305b8
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/css/style.less
View File

@ -2005,11 +2005,7 @@ page {
z-index: 5; z-index: 5;
top: 0; top: 0;
/* #ifdef H5 */ /* #ifdef H5 */
<<<<<<< HEAD
// top: calc(44px + env(safe-area-inset-top));
=======
// top: calc(0 + env(safe-area-inset-top)); // top: calc(0 + env(safe-area-inset-top));
>>>>>>> 11d6bda8681ad955f5e73286c3478a238ee58593
/* #endif */ /* #endif */
} }