Skip to content

石磊 / cihai

Go to a project
Commit 2600fc6f by 石头
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	serverside/cihai-wechat/src/main/webapp/static/css/vendor.css
2 parents 7e809a19 4d5405c7
Inline Side-by-side
Showing 2 changed files with 4 additions and 0 deletions
serverside/cihai-wechat/src/main/webapp/WEB-INF/jsp/portal/word/baike.jsp
...@@ -340,13 +340,17 @@ ...@@ -340,13 +340,17 @@
<div class="single-word"> <div class="single-word">
<div class="word-body"> <div class="word-body">
<div class="word-title"> <div class="word-title">
<c:if test="${word.word.length() eq 1}">
<a class="word-title-pager prev js-jump-page" href="/word/detail/${word.id}">语词 <a class="word-title-pager prev js-jump-page" href="/word/detail/${word.id}">语词
<span class="icon icon-word-prev"></span> <span class="icon icon-word-prev"></span>
</a> </a>
</c:if>
<h1 class="word-title-inner">${word.word}</h1> <h1 class="word-title-inner">${word.word}</h1>
<c:if test="${word.word.length() eq 1}">
<a class="word-title-pager next active">百科 <a class="word-title-pager next active">百科
<span class="icon icon-word-next"></span> <span class="icon icon-word-next"></span>
</a> </a>
</c:if>
</div> </div>
</div> </div>
<div class="word-footer"> <div class="word-footer">
......
serverside/cihai-wechat/src/main/webapp/static/css/vendor.css
This diff could not be displayed because it is too large.
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!