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

welcome css

This commit is contained in:
yanxd 2014-01-03 21:02:30 +08:00
parent 61f0eef6f3
commit 4c0acc5f3e
5 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/layouts/_base_header.html.erb
View File

@ -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? %> <%= 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? -%> <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>
</div> </div>
<div style="border-top:solid 1px #C6E9F1;width:940px;margin-left:auto;margin-right:auto;margin-bottom: 0px;margin-top: -10px;"></div>

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

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

BIN
public/images/qrweixin.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

11
public/stylesheets/application.css
View File

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

11
public/stylesheets/welcome.css
View File

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