Browse Source

合并冲突

master
Gao xiaosong 4 years ago
parent
commit
a3440305b8
  1. 4
      assets/css/style.less

4
assets/css/style.less

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

Loading…
Cancel
Save