字源修改

侯昆
Commit f7c36f84 authored Feb 25, 2018 by 侯昆
Showing 10 changed files with 16 additions and 16 deletions
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/history/event.jsp
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/history/memory.jsp
serverside/cihai-app/src/main/webapp/WEB-INF/jsp/history/people.jsp
serverside/cihai-app/src/main/webapp/static/images/xiang-ziyuan.png
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/home/index.jsp
serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/word/character_paraph.jsp
serverside/cihai-pc/src/main/webapp/static/images/bg-index.jpg
serverside/cihai-pc/src/main/webapp/static/images/logo-search2.png
serverside/cihai-pc/src/main/webapp/static/temp/origin5.png
serverside/cihai-pc/src/main/webapp/static/temp/origin7.png
--- a/serverside/cihai-app/src/main/webapp/WEB-INF/jsp/history/event.jsp
+++ b/serverside/cihai-app/src/main/webapp/WEB-INF/jsp/history/event.jsp
@@ -14,7 +14,7 @@
 <body class="history">
 <div class="container-fluid">
    <div class="wrapper-ipad-app-h5">
-        <h1 class="text-center">一起进入历史上的2月16日</h1>
+        <h1 class="text-center">一起进入历史上的2月14日</h1>
        <nav class="nav justify-content-center">
            <a class="nav-link" href="/history/all">全部</a>
            <a class="nav-link active" href="/history/event">事件</a>

--- a/serverside/cihai-app/src/main/webapp/WEB-INF/jsp/history/memory.jsp
+++ b/serverside/cihai-app/src/main/webapp/WEB-INF/jsp/history/memory.jsp
@@ -14,7 +14,7 @@
 <body class="history">
 <div class="container-fluid">
    <div class="wrapper-ipad-app-h5">
-        <h1 class="text-center">一起进入历史上的2月16日</h1>
+        <h1 class="text-center">一起进入历史上的2月14日</h1>
        <nav class="nav justify-content-center">
            <a class="nav-link" href="/history/all">全部</a>
            <a class="nav-link" href="/history/event">事件</a>

--- a/serverside/cihai-app/src/main/webapp/WEB-INF/jsp/history/people.jsp
+++ b/serverside/cihai-app/src/main/webapp/WEB-INF/jsp/history/people.jsp
@@ -14,7 +14,7 @@
 <body class="history">
 <div class="container-fluid">
    <div class="wrapper-ipad-app-h5">
-        <h1 class="text-center">一起进入历史上的2月16日</h1>
+        <h1 class="text-center">一起进入历史上的2月14日</h1>
        <nav class="nav justify-content-center">
            <a class="nav-link" href="/history/all">全部</a>
            <a class="nav-link" href="/history/event">事件</a>

--- a/serverside/cihai-app/src/main/webapp/static/images/xiang-ziyuan.png
+++ b/serverside/cihai-app/src/main/webapp/static/images/xiang-ziyuan.png
--- a/serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/home/index.jsp
+++ b/serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/home/index.jsp
@@ -63,7 +63,7 @@
    <%--</a>--%>
    <div class="container-fluid search-main">
        <form class="navbar-form clearfix j_search_form" action="/home/search" method="GET">
-            <div class="logo-search">
+            <div class="logo-search" style="top: -50px; margin: 0 120px 30px">
                <img class="img-responsive" src="/static/images/logo-search2.png">
            </div>
            <div class="search-main-input-wrapper">
@@ -104,7 +104,7 @@
                <div class="col-lg-9 col-lg-push-5 col-xs-24">
                    <div class="card">
                        <div class="card-title">每日一字</div>
-                        <div class="card-title">百科知识</div>
+                        <div class="card-title">每日一词</div>
                        <div class="card-main">
                            <div class="card-col card-character">
                                <div class="card-character-main">

--- a/serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/word/character_paraph.jsp
+++ b/serverside/cihai-pc/src/main/webapp/WEB-INF/jsp/word/character_paraph.jsp
@@ -462,29 +462,29 @@
                                                    </div>
                                                    <div class="character-origin-desc">甲骨文</div>
                                                </div>
+                                                    <%--<div class="character-origin-item">--%>
+                                                    <%--<div class="character-origin-image">--%>
+                                                    <%--<img src="/static/temp/origin2.png">--%>
+                                                    <%--</div>--%>
+                                                    <%--<div class="character-origin-desc">金文</div>--%>
+                                                    <%--</div>--%>
                                                <div class="character-origin-item">
                                                    <div class="character-origin-image">
-                                                        <img src="/static/temp/origin2.png">
+                                                        <img src="/static/temp/origin3.png">
                                                    </div>
-                                                    <div class="character-origin-desc">金文</div>
+                                                    <div class="character-origin-desc">篆书</div>
                                                </div>
                                                <div class="character-origin-item">
                                                    <div class="character-origin-image">
-                                                        <img src="/static/temp/origin3.png">
+                                                        <img src="/static/temp/origin7.png">
                                                    </div>
-                                                    <div class="character-origin-desc">篆体</div>
+                                                    <div class="character-origin-desc">隶书</div>
                                                </div>
-                                                    <%--<div class="character-origin-item">--%>
-                                                    <%--<div class="character-origin-image">--%>
-                                                    <%--<img src="/static/temp/origin4.png">--%>
-                                                    <%--</div>--%>
-                                                    <%--<div class="character-origin-desc">康熙字</div>--%>
-                                                    <%--</div>--%>
                                                <div class="character-origin-item">
                                                    <div class="character-origin-image">
                                                        <img src="/static/temp/origin5.png">
                                                    </div>
-                                                    <div class="character-origin-desc">楷体</div>
+                                                    <div class="character-origin-desc">楷书</div>
                                                </div>
                                                <div class="character-origin-item">
                                                    <div class="character-origin-image">

--- a/serverside/cihai-pc/src/main/webapp/static/images/bg-index.jpg
+++ b/serverside/cihai-pc/src/main/webapp/static/images/bg-index.jpg
--- a/serverside/cihai-pc/src/main/webapp/static/images/logo-search2.png
+++ b/serverside/cihai-pc/src/main/webapp/static/images/logo-search2.png
--- a/serverside/cihai-pc/src/main/webapp/static/temp/origin5.png
+++ b/serverside/cihai-pc/src/main/webapp/static/temp/origin5.png
--- a/serverside/cihai-pc/src/main/webapp/static/temp/origin7.png
+++ b/serverside/cihai-pc/src/main/webapp/static/temp/origin7.png