Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
cxt 2018-07-02 11:10:47 +08:00
commit bf9c8c6cab
2 changed files with 3 additions and 2 deletions

View File

@ -9,7 +9,8 @@
</div>
<div class=" fl ml5">
<div class="issues_list_titlebox clear">
<a href="<%= issue_path(activity) %>" class="issues_list_title fl" target="_blank" title="<%= activity.subject.to_s %>"><%= activity.subject.to_s %></a>
<a href="<%= issue_path(activity) %>" class="issues_list_title fl" style="max-width: 350px;" target="_blank" title="<%= activity.subject.to_s %>"><%= activity.subject.to_s %></a>
<span class='<%= "#{get_issue_priority(activity.priority_id)[0]} fl" %>' style="color: #fff;"><%= get_issue_priority(activity.priority_id)[1] %></span>
<div class="cl"></div>
</div>
<div class="issues_list_small">

View File

@ -20,7 +20,7 @@
</li>
<li class="mb10 clear">
<label class="fl ml5">&nbsp;描述&nbsp;&nbsp;:&nbsp;</label>
<%= f.text_field :description, :maxlength => 60, :class=>"w650 fl", :style=>"height:28px;", :no_label => true %>
<%= f.text_field :description, :class=>"w650 fl", :style=>"height:28px;", :no_label => true %>
</li>
<li class="mb10 clear">
<label class=" fl"><span class="c_red f12">*</span>&nbsp;日期&nbsp;&nbsp;:&nbsp;</label>