ued / yohogirls_mustache · Commits

Go to a project

Authored by 2586703@qq.com
Commit 2556c1a2ebb09019f3b30b80f7e9ac8b0be179e4 2 parents 3a5e32dc 4ffc9159

Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop

Inline Side-by-side
Showing 17 changed files with 30 additions and 9 deletions
... ... @@ -4,6 +4,7 @@
{{# topItems}}
{{> channel/item}}
{{/ topItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -8,6 +8,7 @@
{{# bottomItems}}
{{> channel/item}}
{{/ bottomItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -15,6 +15,7 @@
{{# topItems2}}
{{> channel/item}}
{{/ topItems2}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -4,6 +4,7 @@
{{# topItems}}
{{> channel/item}}
{{/ topItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -8,6 +8,7 @@
{{# bottomItems}}
{{> channel/item}}
{{/ bottomItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -15,6 +15,7 @@
{{# topItems2}}
{{> channel/item}}
{{/ topItems2}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -4,6 +4,7 @@
{{# topItems}}
{{> channel/item}}
{{/ topItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -8,6 +8,7 @@
{{# bottomItems}}
{{> channel/item}}
{{/ bottomItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -15,6 +15,7 @@
{{# topItems2}}
{{> channel/item}}
{{/ topItems2}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -4,6 +4,7 @@
{{# topItems}}
{{> channel/item}}
{{/ topItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -8,6 +8,7 @@
{{# bottomItems}}
{{> channel/item}}
{{/ bottomItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -15,6 +15,7 @@
{{# topItems2}}
{{> channel/item}}
{{/ topItems2}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -4,6 +4,7 @@
{{# topItems}}
{{> channel/item}}
{{/ topItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -8,6 +8,7 @@
{{# bottomItems}}
{{> channel/item}}
{{/ bottomItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -15,6 +15,7 @@
{{# topItems2}}
{{> channel/item}}
{{/ topItems2}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
<div class="content-item-without-border" style="margin-top:0;">
<div class="follow-us">
{{^ fan}}
{{^ fanti}}
<div class="title">关注我们</div>
{{/ fan}}
{{/ fanti}}
{{# fan}}
{{# fanti}}
<div class="title">Follow us</div>
{{/ fan}}
{{/ fanti}}
<ul class="icons-content">
<li><a href="http://app.yohoshow.com" target="_blank" class="icons show"></a></li>
<li><a href="http://weibo.com/yohomedia" target="_blank" class="icons sina"></a></li>
... ... @@ -19,7 +19,13 @@
</ul>
<div class="follow-us-input-content">
<input type="text" value="" class="followus-input" placeholder="me@email.com">
<button class="button followus-button">订阅</button>
{{^ fanti}}
<button class="button followus-button">订阅</button>
{{/ fanti}}
{{# fanti}}
<button class="button followus-button">訂閱</button>
{{/ fanti}}
</div>
</div>
</div>
\ No newline at end of file
... ...
{{^ fan}}
{{^ fanti}}
{{> layout/footer_jian}}
{{/ fan}}
{{# fan}}
{{/ fanti}}
{{# fanti}}
{{> layout/footer_fan}}
{{/ fan}}
\ No newline at end of file
{{/ fanti}}
\ No newline at end of file
... ...