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

Merge branch 'wordh' of 10.0.47.245:/home/trustie2 into wordh

This commit is contained in:
yanxd 2014-01-03 10:33:31 +08:00
parent d114c6abed 1581a3a153
commit d26f274a96
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
<div style="height:200px; margin:0 auto;"> <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;"> <div class="welcome_left" style="max-width: 380px; float: left; margin: 20px 0px 0px 60px;">
<p> <p>
<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>
@ -76,7 +76,7 @@
} }
$(function(){ $(function(){
$("a").attr("target", "_blank"); $("#main").find("a").attr("target", "_blank");
}); });
function showInfo(id, content) { function showInfo(id, content) {