welcome css

app/views/layouts/_base_header.html.erb

@@ -9,5 +9,3 @@
 		<%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %>		
 		<%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>			
 </div>
-<div style="border-top:solid 1px #C6E9F1;width:940px;margin-left:auto;margin-right:auto;margin-bottom: 0px;margin-top: -10px;"></div>
-

app/views/welcome/index.html.erb

@@ -1,12 +1,11 @@
-<div style="height:auto; margin:0; padding: 0; margin-bottom: 20px;">
-	<div class="welcome_left" style="max-width: 380px; float: left; margin: 20px 0px 0px 60px;">
-		<p>
+<div class='top_bar' style="">
+	<%= image_tag '/images/qrweixin.jpg', size: '200x200', alt: 'trustie', class: "weixin" %>
+	<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>
-		</p>
 	</div>
-	<div style="display:inline;">
+	<div class='loginForm' style="">
 		<%= call_hook :view_account_login_top %>
-		<div id="login-form_new" style="margin-left: 510px;">
+		<div id="login-form_new" style="">
 			<%= form_tag(signin_path) do %>
 				<%= back_url_hidden_field_tag if is_logout? %>
 				<% unless User.current.logged? %> 
@@ -67,6 +66,7 @@
 	</div>
 </div>
 
+	<div style="clear:both"></div>
 <script type="text/javascript" language="javascript">
 	function clearInfo(id, content) {
 		var text = $('#' + id);

public/stylesheets/application.css

@@ -741,10 +741,14 @@ ul.tool li{list-style-type:none;
 .spaceright{float:left; width:620px;}
 
 .welcome_left{
-	margin-top: 70px;		
 	float:left;
+	display:inline-block;
+	margin-top: 50px;		
 	padding-left: 10px;
+	/*	
 	width: 49%;
+	*/
+	max-width: 380px;
 }
 
 .welcome_right{	
@@ -1483,9 +1487,10 @@ margin-left:-10px;
 	height:50px;
 }
 
-#header a {font-family:'微软雅黑', Verdana, sans-serif; font-size: 12px; color:#808080;}
+/*#header a {font-family:'微软雅黑', Verdana, sans-serif; font-size: 12px; color:#808080;}*/
 #login-form_new table/*Added by young*/
 {
+	height: 165px;
 	padding:20px 25px;
 	background:#fff;
 	text-align:left;
@@ -1493,7 +1498,7 @@ margin-left:-10px;
 	margin-top: 50px;
 	width:320px;
 	
-	font-family:微软雅黑,lucida grande,verdana;
+	/*font-family:微软雅黑,lucida grande,verdana;*/
 	font-size:12px;
 	-webkit-border-radius:10px;
 	-moz-border-radius:10px;

public/stylesheets/welcome.css

@@ -58,7 +58,16 @@ span.grey {
     padding:5px 5px;
     margin:0;
 }*/
-
+.top_bar{
+    height: auto;
+}
+img.weixin{
+    float: left;
+}
+div.loginForm{
+    float: left;
+    margin-top: -30px;
+}
 .welcome-message-list li.message-brief-intro{
 	position: relative;
     display: block;