Merge branch 'release/5.0' into dev

pull/6827/head
Oliver Günther 9 years ago
commit 0949c791f4
  1. 8
      app/assets/stylesheets/backlogs/master_backlog.css.sass
  2. 21
      app/views/projects/settings/_backlogs_settings.html.erb
  3. 2
      app/views/projects/settings/_versions.html.erb
  4. 2
      app/views/rb_master_backlogs/_backlog.html.erb
  5. 2
      app/views/rb_taskboards/show.html.erb

@ -143,11 +143,11 @@
width: 23px
cursor: pointer
&:before
content: "\e0d4"
margin-left: 5px
content: "\e08a"
margin-left: 7px
&.closed:before
content: "\e0d2"
margin-left: 5px
content: "\e089"
margin-left: 7px
&:hover
cursor: pointer
background-color: #D8D8D8

@ -26,15 +26,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<%= toolbar title:l('backlogs.definition_of_done') %>
<% statuses_done_for_project = @project.done_statuses.select(:id).map(&:id) %>
<%= styled_form_tag(:controller => '/projects', :action => "project_done_statuses", :id => @project) do %>
<%= styled_form_tag(controller: '/projects', action: "project_done_statuses", id: @project) do %>
<div class="generic-table--container">
<fieldset class="form--fieldset" id="form--backlogs">
<legend class="form--fieldset-legend"><%=l('backlogs.definition_of_done')%></legend>
<div class="form--fieldset-control">
<span class="form--fieldset-control-container">
(<%= check_all_links 'form--backlogs' %>)
</span>
</div>
<div class="generic-table--container">
<div class="generic-table--results-container">
<table interactive-table role="grid" class="generic-table" id="material_budget_items">
<table interactive-table class="generic-table" id="material_budget_items">
<colgroup>
<col highlight-col>
<col highlight-col>
@ -78,10 +84,11 @@ See doc/COPYRIGHT.rdoc for more details.
</table>
<div class="generic-table--header-background"></div>
</div>
</div>
<div class="generic-table--action-buttons">
</div>
<div class="generic-table--action-buttons">
<%= styled_button_tag l(:button_save), class: '-highlight -with-icon icon-checkmark' %>
</div>
</div>
</fieldset>
<% end %>

@ -33,7 +33,7 @@ See doc/COPYRIGHT.rdoc for more details.
</legend>
<div class="generic-table--container">
<div class="generic-table--results-container">
<table interactive-table role="grid" class="generic-table">
<table interactive-table class="generic-table">
<colgroup>
<col highlight-col>
<col highlight-col>

@ -40,7 +40,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= render_backlog_menu backlog %>
<%= render :partial => "rb_sprints/sprint", :object => backlog.sprint %>
<div class="velocity"> </div>
<div class="toggler<%= ' closed' if folded %>"> </div>
<div class="toggler<%= ' closed' if folded %> icon-small"> </div>
</div>
<ul class="stories<%= ' closed' if folded %>">
<% reset_cycle 'stories' %>

@ -39,7 +39,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= stylesheet_link_tag 'backlogs/taskboard.css' %>
<% end %>
<%= toolbar title: h(@sprint.name) do %>
<%= toolbar title: @sprint.name do %>
<% if @sprint.has_burndown? %>
<li class="toolbar-item toolbar-input-group" id="col_width">
<div>

Loading…
Cancel
Save