|
|
@@ -51,13 +51,9 @@
|
|
|
position: absolute;
|
|
|
width: 100%;
|
|
|
height: 100%;
|
|
|
+ left: 0;
|
|
|
+ top: 0;
|
|
|
padding: 0.05rem 1.2rem 0;
|
|
|
-<<<<<<< HEAD
|
|
|
- background-image: url('assets/img/IndexScene/background.jpg');
|
|
|
- background-size: cover;
|
|
|
- background-repeat: no-repeat;
|
|
|
- overflow: hidden;
|
|
|
-=======
|
|
|
|
|
|
.index-bg {
|
|
|
position: absolute;
|
|
|
@@ -74,7 +70,6 @@
|
|
|
height: 100%;
|
|
|
}
|
|
|
}
|
|
|
->>>>>>> parent of 9be99d0... Merge branch 'dev_layout_adjust' into dev_winpc_touch
|
|
|
|
|
|
.m-header-user{
|
|
|
height: 0.96rem;
|
|
|
@@ -88,13 +83,10 @@
|
|
|
border-radius: 0.55rem;
|
|
|
padding-left: 0.2rem;
|
|
|
padding-right: 0.3rem;
|
|
|
+ padding-top: 0.1rem;
|
|
|
+ padding-bottom: 0.1rem;
|
|
|
margin-right: -0.3rem;
|
|
|
text-align: right;
|
|
|
-<<<<<<< HEAD
|
|
|
- position: relative;
|
|
|
- border: solid unit(@borderSize, rem) transparent;
|
|
|
-=======
|
|
|
->>>>>>> parent of 9be99d0... Merge branch 'dev_layout_adjust' into dev_winpc_touch
|
|
|
|
|
|
.user-info-text {
|
|
|
float: left;
|
