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

Merge branch 'dev-homepage-revision' into 'develop' 

pull request页面css样式 调整

pull request页面 调整

See merge request !185
This commit is contained in:
陈晓婷 2019-10-11 09:03:47 +08:00
parent 4ebc15e317 de2958a8ff
commit 3eae01f7fc
9 changed files with 68 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
app/views/account/_introduce.html.erb
View File

@ -136,9 +136,10 @@
</div>
<div class="plate_back">
<div>
<span>项目管理</span>
<p class="lh20 mt30 mb100 f14" style="height: 60px;">项目进程管理应用于研发管理、任务分配、目标跟踪等让项目管理流程高效完成。</p>
<a href="javascript:void(0)">查看详情</a>
<p><i class="iconfont icon-menu_date colorWhite f40"></i></p>
<span class="f20 lh20 mt10">项目管理</span>
<p class="lh20 mt60 mb80 f14 justify" style="height: 60px;">项目进程管理应用于研发管理、任务分配、目标跟踪等让项目管理流程高效完成。</p>
<a href="javascript:void(0)" class="homepage_detailBtn">查看详情</a>
</div>
</div>
</li>
@ -149,7 +150,14 @@
<span class="content_span">代码托管</span>
</div>
</div>
<div class="plate_back">2</div>
<div class="plate_back">
<div>
<p><i class="iconfont icon-menu_date colorWhite f40"></i></p>
<span class="f20 lh20 mt10">代码托管</span>
<p class="lh20 mt60 mb80 f14 justify" style="height: 60px;">基于Git的代码托管，提供高性能远端仓库，可保护分支、历史版本比对等高级功能。</p>
<a href="javascript:void(0)" class="homepage_detailBtn">查看详情</a>
</div>
</div>
</li>
<li class="plateContainer">
<div class="plate_before">
@ -158,7 +166,14 @@
<span class="content_span">质量检测</span>
</div>
</div>
<div class="plate_back">2</div>
<div class="plate_back">
<div>
<p><i class="iconfont icon-menu_date colorWhite f40"></i></p>
<span class="f20 lh20 mt10">质量检测</span>
<p class="lh20 mt60 mb80 f14 justify" style="height: 60px;">采用一定检验测试手段和检查方法测定代码质量。</p>
<a href="javascript:void(0)" class="homepage_detailBtn">查看详情</a>
</div>
</div>
</li>
<li class="plateContainer">
<div class="plate_before">
@ -167,18 +182,27 @@
<span class="content_span">交流社区</span>
</div>
</div>
<div class="plate_back">2</div>
<div class="plate_back">
<div>
<p><i class="iconfont icon-menu_date colorWhite f40"></i></p>
<span class="f20 lh20 mt10">交流社区</span>
<p class="lh20 mt60 mb80 f14 justify" style="height: 60px;">提供给IT开发者资源分享、学习交流、了解Trustie的社区。</p>
<a href="javascript:void(0)" class="homepage_detailBtn">查看详情</a>
</div>
</div>
</li>
</ul>
</div>
<div class="homepage_introduce_trustieEduCode homepage_introduce_content_item"></div>
<div class="homepage_introduce_trustieEduCode homepage_introduce_content_item">
<div class="trustieEduCode_container">
</div>
</div>
<div class="homepage_introduce_ossean homepage_introduce_content_item"></div>
<div class="homepage_introduce_trustieCoderpedia homepage_introduce_content_item"></div>
</div>
</div>
<% end %>
<%end %>
<div class="content_Intruduce">
<div class="in_head">

2
app/views/repositories/_change_diff.html.erb
View File

@ -32,7 +32,7 @@
<a><%= new_line.to_s.center(4) %></a>
</td>
<td class="<%= type == 'old' ? 'line_content noteable_line old' : 'line_content new noteable_line' %> " >
<pre style="width:auto;overflow: auto; "><%= Redmine::CodesetUtil.replace_invalid_utf8(line.text).html_safe %></pre>
<pre style="white-space: pre-wrap!important;word-break: break-all;"><%= Redmine::CodesetUtil.replace_invalid_utf8(line.text).html_safe %></pre>
</td>
</tr>
<% end %>

BIN
public/images/introduce/ac_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 68 KiB

BIN
public/images/introduce/ac_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 95 KiB

BIN
public/images/introduce/ac_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 93 KiB

BIN
public/images/introduce/ac_4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 90 KiB

BIN
public/images/introduce/bg_edu.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

5
public/stylesheets/css/common.css
View File

@ -544,4 +544,7 @@ a:hover.btn_green_64_width{ background: #14ad5a; color: #fff;}
.bg_white_bor{background-color: #fff;border:1px solid #dddddd}
#intro_content p{word-break:break-word!important;}
#intro_content p{word-break:break-word!important;}
.justify{text-align: justify}

30
public/stylesheets/css/introduce.css
View File

@ -193,6 +193,18 @@
position: relative;
background:rgba(8,25,52,0.83);
}
.homepage_introduce_trustieForge > ul li:nth-child(1){
background: url("/images/introduce/ac_1.png") 100%;
}
.homepage_introduce_trustieForge > ul li:nth-child(2){
background: url("/images/introduce/ac_2.png") 100%;
}
.homepage_introduce_trustieForge > ul li:nth-child(3){
background: url("/images/introduce/ac_3.png") 100%;
}
.homepage_introduce_trustieForge > ul li:nth-child(4){
background: url("/images/introduce/ac_4.png") 100%;
}
.content_span{
position: relative;
@ -240,12 +252,28 @@
top:0px;
left:0px;
width:100%;
background:rgba(40,120,255,0.6);
background:rgba(40,120,255,0.4);
}
.plateContainer .plate_back > div,.plateContainer .plate_before > div{
width: 210px;
color: #fff;
}
.homepage_detailBtn{
display: block;
background-color: #5393FF;
width: 92px;
height: 30px;
line-height: 30px;
text-align: center;
color: #fff!important;
margin:0px auto;
}
.trustieEduCode_container{
width: 1200px;
height: 680px;
background: url("/images/introduce/bg_edu.png") 100%;
}