p49726105
/
bigdir
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
zhangyang 2013-08-01 19:38:46 +08:00
parent 980b852c17 caa04e68e5
commit f1f4a29a66
5 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/issues/_list.html.erb
View File

@ -78,6 +78,7 @@
<li id="issue-<%= issue.id %>" class="hascontextmenu <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
<% column_content = ( query.inline_columns.map {|column| "<li class=\"#{column.css_classes}\">#{column_content(column, issue)}</li>"}) %>
<%= image_tag("/images/issues.png", :class => "img-tag-issues") %>
<ul class="issue_list">
<%= raw column_content[0] %>
<%= raw column_content[4] %>

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

@ -137,9 +137,7 @@
<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
<% end %>
<% end %>
</p>
<p>
<%= user.changesets.count == 0 ? '' : "#{l(:label_total_commit, :total_commit => user.changesets.count)}" %> | managed 7 projects | Most experience in c++
<%= user.changesets.count == 0 ? '' : ",#{l(:label_total_commit, :total_commit => user.changesets.count)}" %>
</p>
</div>
<% end -%>

BIN
public/images/issues-closed.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
public/images/issues.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

31
public/themes/redpenny-master/stylesheets/application.css
View File

@ -1103,7 +1103,9 @@ a.project {
float: left;
margin-top: 0px;
width: 908px;
height: 148px;
min-height: 120px;
height: auto;
margin-bottom: 5px;
}
a.root {
@ -1118,7 +1120,7 @@ a.root {
margin-right: auto;
margin-bottom: 10px;
width: 908px;
height: 250px;
height: auto;
padding-top: 10px;
padding-left: 10px;
padding-bottom: 10px;
@ -1191,9 +1193,11 @@ a.img-tag3{
}
.add-info {
margin-top: 160px;
float: left;
margin-top: 0px;
height: 20px;
width: 908px;
margin-bottom: 5px;
}
.main-language {
float: left;
@ -1247,8 +1251,8 @@ a.tag {
div.well {
color: black;
min-height: 20px;
height: 110px;
padding: 19px;
height: auto;
padding: 19px 19px 6px 19px;
margin-bottom: 20px;
background-color: #f5f5f5;
border: 1px solid #eee;
@ -1400,6 +1404,7 @@ div.issue-note .description {
*/
div.autoscroll ul.issue_list {
margin-left: 30px;
}
div.autoscroll ul {
@ -1415,9 +1420,10 @@ div.autoscroll li.hascontextmenu{
position: relative;
display: block;
margin-bottom: -1px;
margin-left: 10px;
padding: 8px 10px 10px 10px;/*by young*/
border: 1px solid rgb(229,229,229);
width: 650px;/*by young*/
width: 600px;/*by young*/
}
div.autoscroll li.id {
@ -1434,12 +1440,12 @@ div.autoscroll li.id a {
div.autoscroll li.subject {
margin:0px 60px 0px 0px;
font-size: 15px;
font-size: small;
line-height: 1.3;
word-wrap: break-word;
}
div.autoscroll li.subject a{
color: rgb(0, 0, 0);
color: rgb(51, 51, 51);
}
div.autoscroll ul.list-group-item-meta{
font-size: 11px;
@ -1454,10 +1460,17 @@ div.autoscroll ul.list-group-item-meta li {
}
div.autoscroll li.tracker, div.autoscroll li.status, div.autoscroll li.priority{
color: rgb(17, 102, 153);
color: rgb(51, 51, 51);
font: 10px/1.4 Helvetica,arial,freesans,clean,sans-serif;
}
li.issue img.img-tag-issues {
float: left;
height: 24px;
width: 24px;
}
/*
*/