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 22 additions and 18 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">
<a class="word-title-pager prev js-jump-page" href="/word/detail/${word.id}">语词 <c:if test="${word.word.length() eq 1}">
<span class="icon icon-word-prev"></span> <a class="word-title-pager prev js-jump-page" href="/word/detail/${word.id}">语词
</a> <span class="icon icon-word-prev"></span>
</a>
</c:if>
<h1 class="word-title-inner">${word.word}</h1> <h1 class="word-title-inner">${word.word}</h1>
<a class="word-title-pager next active">百科 <c:if test="${word.word.length() eq 1}">
<span class="icon icon-word-next"></span> <a class="word-title-pager next active">百科
</a> <span class="icon icon-word-next"></span>
</a>
</c:if>
</div> </div>
</div> </div>
<div class="word-footer"> <div class="word-footer">
...@@ -387,12 +391,12 @@ ...@@ -387,12 +391,12 @@
<div class="tab-con js-tab-con"> <div class="tab-con js-tab-con">
<div class="tab-panel active" id="tab01"> <div class="tab-panel active" id="tab01">
<%--<div class="tip-box">--%> <%--<div class="tip-box">--%>
<%--<span> 这段话可设置舒适的文字大小。</span>--%> <%--<span> 这段话可设置舒适的文字大小。</span>--%>
<%--<div class="tip-operation">--%> <%--<div class="tip-operation">--%>
<%--<a class="large-btn" href="#">大</a>--%> <%--<a class="large-btn" href="#">大</a>--%>
<%--<a class="normal-btn" href="#">选中</a>--%> <%--<a class="normal-btn" href="#">选中</a>--%>
<%--<a class="small-btn" href="#">小</a>--%> <%--<a class="small-btn" href="#">小</a>--%>
<%--</div>--%> <%--</div>--%>
<%--</div>--%> <%--</div>--%>
<div class="article">${word.baikeParaphrase}</div> <div class="article">${word.baikeParaphrase}</div>
</div> </div>
...@@ -684,12 +688,12 @@ ...@@ -684,12 +688,12 @@
</div> </div>
</div> </div>
<%--<div class="card card-accordion card-accordion-spe">--%> <%--<div class="card card-accordion card-accordion-spe">--%>
<%--<div class="card-content">--%> <%--<div class="card-content">--%>
<%--<div class="card-content-inner">--%> <%--<div class="card-content-inner">--%>
<%--<span>标签：</span>--%> <%--<span>标签：</span>--%>
<%--<a href="">动物</a>--%> <%--<a href="">动物</a>--%>
<%--</div>--%> <%--</div>--%>
<%--</div>--%> <%--</div>--%>
<%--</div>--%> <%--</div>--%>
<div class="tip-pic"> <div class="tip-pic">
<img src="${ctx}/static/images/cihai-tip.png"> <img src="${ctx}/static/images/cihai-tip.png">
......
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!