From 4587c840b1a25ee88a4cae3bc1204dd68633d3c4 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Fri, 3 Jan 2014 21:33:01 +0800
Subject: [PATCH] a

---
 app/views/welcome/index.html.erb   | 5 ++++-
 public/stylesheets/application.css | 5 +----
 public/stylesheets/welcome.css     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 315c39c76..ddd7293ac 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -1,5 +1,8 @@
 <div class='top_bar' style="">
-	<%= image_tag '/images/qrweixin.jpg', size: '200x200', alt: 'trustie', class: "weixin" %>
+	<div style="float: left;">
+		<%= image_tag '/images/qrweixin.jpg', size: '200x200', alt: 'trustie', class: "weixin" %>
+		<div style="margin: -15px 0px 0px 0px;"><h3 style="color: #000000; font-size: 15px; text-align:center ">微信扫码</h3></div>
+	</div>
 	<div class="welcome_left" style="">
 			<span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_description) %></span>
 	</div>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index ef41727e1..1d4eaf795 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -744,10 +744,7 @@ ul.tool li{list-style-type:none;
 	float:left;
 	display:inline-block;
 	margin-top: 50px;		
-	padding-left: 10px;
-	/*	
-	width: 49%;
-	*/
+	padding-left: 20px;
 	max-width: 380px;
 }
 
diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css
index e6da64ce8..6af69a6eb 100644
--- a/public/stylesheets/welcome.css
+++ b/public/stylesheets/welcome.css
@@ -62,7 +62,7 @@ span.grey {
     height: auto;
 }
 img.weixin{
-    float: left;
+    display: inline-block;
 }
 div.loginForm{
     float: left;