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

Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop

This commit is contained in:
ouyangxuhua 2015-12-07 17:19:52 +08:00
parent 5198f4dde4 5f6d9f2425
commit 8b14e7c549
2 changed files with 110 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@
<%= favicon %>
<%= javascript_heads %>
<%= heads_for_theme %>
<%= stylesheet_link_tag 'public', 'pleft', 'project','courses','prettify','jquery/jquery-ui-1.9.2','header','repository' %>
<%= stylesheet_link_tag 'public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','header','repository' %>
<%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','attachments' %>
<%= call_hook :view_layouts_base_html_head %>
<!-- page specific tags -->

109
public/stylesheets/project.css
View File

@ -907,3 +907,112 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
border: 1px solid #e4e4e4;
}
/*项目动态新样式*/
.homepageRight {
width: 750px;
float: left;
margin-top: 15px;
margin-bottom: 10px;
}
.homepageRightBanner {
width: 718px;
margin: 0px auto;
float: right;
background-color: #FFF;
padding: 10px 15px;
border: 1px solid #DDD;
}
.resources {
width: 718px;
background-color: #FFF;
padding: 15px;
border: 1px solid #DDD;
float: right;
}
.homepagePostBrief {
width: 720px;
margin: 0px auto;
position: relative;
}
.homepagePostPortrait {
float: left;
width: 50px;
}
.homepagePostDes {
float: left;
width: 655px;
margin-left: 15px;
}
.homepagePostTo {
font-size: 14px;
color: #484848;
margin-bottom: 5px;
}
.m_w600 {
max-width: 600px;
}
.hidden {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.homepagePostTitle {
font-size: 14px;
color: #484848;
margin-bottom: 5px;
font-weight: bold;
}
.maxh360 {
max-height: 360px;
}
.lh18 {
line-height: 18px;
}
.homepagePostIntro {
font-size: 14px;
color: #484848;
overflow: hidden;
}
.homepagePostReply {
width: 710px;
margin: 10px auto 0px;
background-color: #F1F1F1;
}
.topBorder {
border-top: 1px solid #E4E4E4;
}
.homepagePostReplyBanner {
width: 708px;
height: 33px;
border: 1px solid #E4E4E4;
line-height: 33px;
vertical-align: middle;
font-size: 12px;
color: #888;
}
.homepagePostReplyBannerCount {
width: 255px;
display: inline-block;
margin-left: 15px;
}
.homepagePostReplyBannerTime {
width: 85px;
display: inline-block;
}
.homepagePostReplyContainer {
border-bottom: 1px solid #E3E3E3;
width: 680px;
margin: 15px auto 0px;
min-height: 60px;
}
.borderBottomNone {
border-bottom: medium none !important;
}
.homepagePostReplyPortrait {
float: left;
width: 33px;
}
.homepagePostReplyInputContainer {
width: 630px;
float: left;
}