Merge remote-tracking branch 'origin/hotfix/plusstar'
Showing
2 changed files
with
8 additions
and
2 deletions
1 | <div class='yoho-page plusstar-page'> | 1 | <div class='yoho-page plusstar-page'> |
2 | {{#if result.channel}} | 2 | {{#if result.channel}} |
3 | - <div class="tab-nav {{#if isApp}}isApp{{/if}}"> | 3 | + <div class="tab-nav {{#if isApp}}isapp{{/if}}"> |
4 | <ul> | 4 | <ul> |
5 | {{#each result.channel}} | 5 | {{#each result.channel}} |
6 | <li class='{{#if focus}} focus {{/if}}' data-code='{{code}}'> | 6 | <li class='{{#if focus}} focus {{/if}}' data-code='{{code}}'> |
@@ -9,6 +9,8 @@ | @@ -9,6 +9,8 @@ | ||
9 | {{/each}} | 9 | {{/each}} |
10 | </ul> | 10 | </ul> |
11 | </div> | 11 | </div> |
12 | + | ||
13 | + {{#if isApp}}<div class='isapp-margin-bottom'></div>{{/if}} | ||
12 | {{/if}} | 14 | {{/if}} |
13 | <!--/tab-nav--> | 15 | <!--/tab-nav--> |
14 | 16 |
@@ -20,7 +20,7 @@ | @@ -20,7 +20,7 @@ | ||
20 | background-color: #fff; | 20 | background-color: #fff; |
21 | top: 0; | 21 | top: 0; |
22 | 22 | ||
23 | - &.isApp { | 23 | + &.isapp { |
24 | position: fixed; | 24 | position: fixed; |
25 | } | 25 | } |
26 | 26 | ||
@@ -59,6 +59,10 @@ | @@ -59,6 +59,10 @@ | ||
59 | } | 59 | } |
60 | } | 60 | } |
61 | 61 | ||
62 | + .isapp-margin-bottom { | ||
63 | + margin-bottom: 80px; | ||
64 | + } | ||
65 | + | ||
62 | .empty-height { | 66 | .empty-height { |
63 | height: 72px; | 67 | height: 72px; |
64 | } | 68 | } |
-
Please register or login to post a comment