ued / yohogirls_mustache · Commits

Go to a project

Authored by happyhour7@163.com
Commit 68db4be5bd0cf58cf5a712ac632f2876111c233a 2 parents ff899146 8496bd1a

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

Conflicts:
	partials/layout/header_jian.html
Inline Side-by-side
Showing 5 changed files with 15 additions and 27 deletions
... ... @@ -7,7 +7,7 @@
<p>
{{# author}}
By &nbsp;&nbsp;<a class="detail_author" href="{{link}}" target="_blank">{{name}}</a>
<a class="detail_author" href="{{link}}" target="_blank">By&nbsp;{{name}}</a>
{{/ author}}
<a href="{{channelLink}}">{{channel}}</a>&nbsp;|&nbsp;
<a href="{{twoChannelLink}}">{{twoChannel}}</a>&nbsp;|&nbsp;
... ...
... ... @@ -12,7 +12,7 @@
</div>
</div>
<div class="pagination-content">
<div class="pagination-content"{{^ bannerLength}} style="display:none;" {{/ bannerLength}}>
<div class="pagination pagination-adv">
{{# data}}
<span class="swiper-pagination-switch {{# isChoosen }}swiper-visible-switch{{/ isChoosen}}"></span>
... ...
{{^ fanti}}
{{> layout/header_jian}}
{{/ fanti}}
{{# fanti}}
{{> layout/header_fan}}
{{^ fanti}}
{{> layout/header_jian}}
{{/ fanti}}
{{# fanti}}
{{> layout/header_fan}}
{{/ fanti}}
\ No newline at end of file
... ...
... ... @@ -5,6 +5,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="keywords" content="{{keywords}}" />
<meta name="description" content="{{description}}" />
... ... @@ -15,7 +16,7 @@
<link rel="dns-prefetch" href="//img01.yohoboys.com" />
<link rel="dns-prefetch" href="//img02.yohoboys.com" />
<link rel="dns-prefetch" href="//video.yohoboys.com" />
{{> common/environment_css}}
<link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/girls.css" />
</head>
<body>
<!--开头的集团导航-->
... ... @@ -153,9 +154,9 @@
<li class="item enterprise-boys"><span>YOHO!BOYS</span><a href="http://www.yohoboys.com">男生潮流</a></li>
<li class="item enterprise-girls item-choosen"><span style="color:#000;">YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
<li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
<li class="item enterprise-yohood"><span>YO'HOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年華</a></li>
<li class="jianfan"><a class="unchoosen" href="/go/location">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="choosen" href="#">繁</a></li>
</ul>
</div>
... ... @@ -254,15 +255,8 @@
</span>
</div>
</div>
</div>
</div>
{{# scrollToContent}}
<input type="hidden" id="scrollToContent"/>
{{/ scrollToContent}}
\ No newline at end of file
... ...
... ... @@ -4,6 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="keywords" content="{{keywords}}" />
<meta name="description" content="{{description}}" />
<title>{{title}}</title>
... ... @@ -14,7 +15,6 @@
<link rel="dns-prefetch" href="//img02.yohoboys.com" />
<link rel="dns-prefetch" href="//video.yohoboys.com" />
{{> common/environment_css}}
</head>
<body>
<!--开头的集团导航-->
... ... @@ -27,6 +27,7 @@
<li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
<li class="item enterprise-yohood"><span>YO'HOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年华</a></li>
<li class="jianfan"><a class="choosen" href="#">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen" href="/go/location">繁</a></li>
</ul>
</div>
... ... @@ -62,6 +63,7 @@
</div>
</span>
</div>
<div class="menu-item menu-item-lifestyle">
<span class="menu-link-channel menu-link-sport sports-choosen">
<a class="text">sports</a>
... ... @@ -252,13 +254,4 @@
</div>
</div>
</div>
{{# scrollToContent}}
<input type="hidden" id="scrollToContent"/>
{{/ scrollToContent}}
\ No newline at end of file
... ...