From 5f043cb17a220a35bb27dce1b79817566542ec13 Mon Sep 17 00:00:00 2001
From: "Kris, Zhang" <kris.newghost@gmail.com>
Date: Wed, 20 Jan 2016 17:54:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=8C=E6=83=85=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/css/ourjs.css | 35 ++++++++++++++++++++++++++++++++++-
 web/index.tmpl    | 31 +++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/web/css/ourjs.css b/web/css/ourjs.css
index d42754d..795683d 100644
--- a/web/css/ourjs.css
+++ b/web/css/ourjs.css
@@ -1142,6 +1142,38 @@ label.error {
 
 
 
+.stock {
+  border: 1px solid #ddd;
+  border-top: solid #f00;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+  font-size: 16px;
+}
+
+.stock.down {
+  border-top-color: #093;
+}
+
+.stock td:last-child {
+  text-align: right;
+}
+
+.stock i {
+  font-size: 14px;
+}
+
+.stock b {
+  color: #f00;
+}
+
+.stock b.down {
+  color: #093;
+}
+
+
+
+
+
+
 /*for mobile device*/
 @media (max-width: 979px) {
   .jumbotron {
@@ -1296,7 +1328,8 @@ label.error {
   .navbar-fixed-top,
   .layout-pane,
   .article-list,
-  .notice {
+  .notice,
+  .stock {
     margin: 0;
   }
 }
\ No newline at end of file
diff --git a/web/index.tmpl b/web/index.tmpl
index 688d73a..c7a2df5 100644
--- a/web/index.tmpl
+++ b/web/index.tmpl
@@ -21,6 +21,37 @@
     </div>
   </div>
 
+  <div class="row-fluid">
+    <div class="span3">
+      <table class="table stock">
+        <tr><td>上证指数</td><td><i>2890.06</i> <b>-1.034%</b></td></tr>
+        <tr><td>深训成指</td><td><i>2890.06</i> <b>-1.034%</b></td></tr>
+        <tr><td>创业板指</td><td><i>2890.06</i> <b>-1.034%</b></td></tr>
+      </table>
+    </div>
+    <div class="span3">
+      <table class="table stock">
+        <tr><td>恒生指数</td><td><i>2890.06</i> <b>-1.034%</b></td></tr>
+        <tr><td>日经指数</td><td><i>2890.06</i> <b>-1.034%</b></td></tr>
+        <tr><td>中国台湾</td><td><i>2890.06</i> <b class="down">-1.034%</b></td></tr>
+      </table>
+    </div>
+    <div class="span3">
+      <table class="table stock">
+        <tr><td>道琼斯</td><td><i>2890.06</i> <b>-1.034%</b></td></tr>
+        <tr><td>纳斯达克</td><td><i>2890.06</i> <b class="down">-1.034%</b></td></tr>
+        <tr><td>欧洲斯托克</td><td><i>2890.06</i> <b>-1.034%</b></td></tr>
+      </table>
+    </div>
+    <div class="span3">
+      <table class="table stock">
+        <tr><td>黄金</td><td><i>2890.06</i> <b>-1.034%</b></td></tr>
+        <tr><td>原油</td><td><i>2890.06</i> <b class="down">-1.034%</b></td></tr>
+        <tr><td>汇率</td><td><i>2890.06</i> <b>-1.034%</b></td></tr>
+      </table>
+    </div>
+  </div>
+
   <div class="row-fluid">
     <div class="span4">
       <div class="nav-separator"></div>