Merge pull request #12231 from b3log/master

rebase

src/main/webapp/css/default-init.css

@@ -18,7 +18,7 @@
 *
 * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
 * @author <a href="http://88250.b3log.org">Liang Ding</a>
-* @version 1.0.1.7, Apr 15, 2016
+* @version 1.0.2.7, Dec 14, 2016
 */
 html {
     height: 100%;
@@ -146,7 +146,8 @@ button:active {
 .logo {
     float: left;
     padding: 162px 12px 0;
-    width: 153px;
+    width: 217px;
+    text-align: center;
 }
 
 .wrapper {
@@ -225,7 +226,7 @@ button:active {
     padding: 5px;
 }
 
-.a-403, .a-500 {
+.a-403, .a-500, .a-404 {
     margin: 20px 50px 0 0 ;
     text-align: right;
 }
@@ -241,6 +242,10 @@ button:active {
 .a-500 {
     margin: 25px 35px 0 0 ;
 }
+
+.a-404 {
+    margin: 42px 35px 0 0;
+}
 /* end 403/404/500 */
 
 /* start kill */

src/main/webapp/error/404.ftl

@@ -11,7 +11,23 @@
         <div class="wrapper">
             <div class="wrap">
                 <div class="content" style="height: 380px;width: 760px">
-                    <script type="text/javascript" src="http://www.qq.com/404/search_children.js?edition=small" charset="utf-8"></script>
+                    <div class="logo">
+                        <a href="http://b3log.org" target="_blank">
+                            <img border="0" width="153" height="56" alt="B3log" title="B3log" src="${staticServePath}/images/logo.jpg"/>
+                        </a>
+                    </div>
+                    <div class="main">
+                        <h2>404 Not Found!</h2>
+                        <img class="img-t0t" width="488" src="${staticServePath}/images/404.gif" title="404" alt="500: not found!" />
+                        <div class="a-404">
+                            欢迎访问
+                            <a href="https://hacpai.com">黑客与画家</a>
+                        </div>
+                        <a href="http://b3log.org" target="_blank">
+                            <img border="0" class="icon" alt="B3log" title="B3log" src="${staticServePath}/favicon.png"/>
+                        </a>
+                    </div>
+                    <span class="clear"></span>
                 </div>
             </div>
         </div>