jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

a

This commit is contained in:
yanxd 2014-01-03 21:33:01 +08:00
parent 4c0acc5f3e
commit 4587c840b1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/welcome/index.html.erb
View File

@ -1,5 +1,8 @@
<div class='top_bar' style=""> <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=""> <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> <span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_description) %></span>
</div> </div>

5
public/stylesheets/application.css
View File

@ -744,10 +744,7 @@ ul.tool li{list-style-type:none;
float:left; float:left;
display:inline-block; display:inline-block;
margin-top: 50px; margin-top: 50px;
padding-left: 10px; padding-left: 20px;
/*
width: 49%;
*/
max-width: 380px; max-width: 380px;
} }

2
public/stylesheets/welcome.css
View File

@ -62,7 +62,7 @@ span.grey {
height: auto; height: auto;
} }
img.weixin{ img.weixin{
float: left; display: inline-block;
} }
div.loginForm{ div.loginForm{
float: left; float: left;