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

This commit is contained in:
daiao 2017-02-23 17:26:35 +08:00
commit 4885ec5afb
2 changed files with 2 additions and 1 deletions

View File

@ -8,7 +8,7 @@
<% end %> <% end %>
<div class=" fl ml5"> <div class=" fl ml5">
<div class="issues_list_titlebox clear"> <div class="issues_list_titlebox clear">
<a href="<%= training_task_path(activity)%>" class="issues_list_title fl" target="_blank" title="<%= activity.subject.to_s %>" > <a href="<%= training_task_path(activity)%>" class="issues_list_title fl task-list-title" target="_blank" title="<%= activity.subject.to_s %>" >
<span class="task-step mr5">step<%= activity.position %></span> <span class="task-step mr5">step<%= activity.position %></span>
<%= activity.subject.to_s %> <%= activity.subject.to_s %>
</a> </a>

View File

@ -675,3 +675,4 @@ span.task-step{ color:#ee4a20;font-style: italic; font-weight:bold; font-size:14
.task-display-span,a.task-display-span{ display:inline-block; border-radius:3px; width: 100%; text-align: center; color: #fff; padding: 5px 0; } .task-display-span,a.task-display-span{ display:inline-block; border-radius:3px; width: 100%; text-align: center; color: #fff; padding: 5px 0; }
.task-bgrey{background:#ccc;} .task-bgrey{background:#ccc;}
.task-title{ width: 830px;} .task-title{ width: 830px;}
a.task-list-title{ max-width: 700px;}