Index: app/views/custom_fields/_form.html.erb =================================================================== --- app/views/custom_fields/_form.html.erb (revision 17727) +++ app/views/custom_fields/_form.html.erb (working copy) @@ -1,5 +1,6 @@ <%= error_messages_for 'custom_field' %> +

<%= f.select :field_format, custom_field_formats_for_select(@custom_field), {}, :disabled => !@custom_field.new_record? %>

@@ -127,5 +128,5 @@ <% end %>
- +
<% include_calendar_headers_tags %> Index: app/views/issues/bulk_edit.html.erb =================================================================== --- app/views/issues/bulk_edit.html.erb (revision 17727) +++ app/views/issues/bulk_edit.html.erb (working copy) @@ -28,6 +28,7 @@
<%= l(:label_change_properties) %> +
<% if @allowed_projects.present? %>

@@ -188,6 +189,7 @@

<% end %>
+
Index: app/views/my/account.html.erb =================================================================== --- app/views/my/account.html.erb (revision 17727) +++ app/views/my/account.html.erb (working copy) @@ -15,6 +15,7 @@ :url => { :action => "account" }, :html => { :id => 'my_account_form', :method => :post, :multipart => true } do |f| %> +
<%=l(:label_information_plural)%> @@ -51,6 +52,7 @@

<%= submit_tag l(:button_save) %>

+
<% end %> <% content_for :sidebar do %> Index: app/views/my/page.html.erb =================================================================== --- app/views/my/page.html.erb (revision 17727) +++ app/views/my/page.html.erb (working copy) @@ -8,6 +8,7 @@

<%=l(:label_my_page)%>

+
<% @groups.each do |group| %>
<%= render_blocks(@blocks[group], @user) %> @@ -14,6 +15,7 @@
<% end %>
+
<%= context_menu %> Index: app/views/projects/show.html.erb =================================================================== --- app/views/projects/show.html.erb (revision 17727) +++ app/views/projects/show.html.erb (working copy) @@ -17,6 +17,7 @@

<%= l(:text_project_closed) %>

<% end %> +
<% if @project.description.present? %>
@@ -118,6 +119,7 @@ <%= call_hook(:view_projects_show_right, :project => @project) %>
+
<% content_for :sidebar do %> <%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %> Index: app/views/reports/issue_report.html.erb =================================================================== --- app/views/reports/issue_report.html.erb (revision 17727) +++ app/views/reports/issue_report.html.erb (working copy) @@ -1,5 +1,5 @@

<%=l(:label_report_plural)%>

- +

<%=l(:field_tracker)%>  @@ -72,4 +72,4 @@
<%= call_hook(:view_reports_issue_report_split_content_right, :project => @project) %>

- +
Index: app/views/trackers/_form.html.erb =================================================================== --- app/views/trackers/_form.html.erb (revision 17727) +++ app/views/trackers/_form.html.erb (working copy) @@ -1,5 +1,5 @@ <%= error_messages_for 'tracker' %> - +
@@ -55,3 +55,4 @@
<% end %>
+ Index: app/views/users/_form.html.erb =================================================================== --- app/views/users/_form.html.erb (revision 17727) +++ app/views/users/_form.html.erb (working copy) @@ -2,6 +2,7 @@
+
<%=l(:label_information_plural)%> @@ -52,6 +53,7 @@
+
Index: app/views/users/show.html.erb =================================================================== --- app/views/users/show.html.erb (revision 17727) +++ app/views/users/show.html.erb (working copy) @@ -3,7 +3,7 @@

<%= avatar @user, :size => "50" %> <%= @user.name %>

- +
- +
<% html_title @user.name %> Index: app/views/welcome/index.html.erb =================================================================== --- app/views/welcome/index.html.erb (revision 17727) +++ app/views/welcome/index.html.erb (working copy) @@ -1,5 +1,5 @@

<%= l(:label_home) %>

- +
<%= textilizable Setting.welcome_text %> @@ -17,6 +17,7 @@ <% end %> <%= call_hook(:view_welcome_index_right) %>
+
<% content_for :header_tags do %> <%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'}, Index: public/stylesheets/application.css =================================================================== --- public/stylesheets/application.css (revision 17727) +++ public/stylesheets/application.css (working copy) @@ -441,9 +441,10 @@ .contextual input, .contextual select {font-size:0.9em;} .message .contextual { margin-top: 0; } -.splitcontent {overflow:auto;} -.splitcontentleft, #list-left {float:left; width:49%;} -.splitcontentright, #list-right {float:right; width:49%;} +.splitcontent {overflow:auto; display:flex; flex-wrap: wrap;} +.splitcontentleft, #list-left {flex: 1; margin-right: 5px;} +.splitcontentright, #list-right {flex: 1; margin-left: 5px;} +#list-top {width: 100%;} form {display: inline;} input, select {vertical-align: middle; margin-top: 1px; margin-bottom: 1px;} input[type="submit"] { -webkit-appearance: button; } Index: public/stylesheets/responsive.css =================================================================== --- public/stylesheets/responsive.css (revision 17727) +++ public/stylesheets/responsive.css (working copy) @@ -219,10 +219,14 @@ .splitcontentleft, #list-left { width: 100%; + flex: auto; + margin-right: 0; } .splitcontentright, #list-right { width: 100%; + flex: auto; + margin-left: 0; } /*----------------------------------------*\ @@ -855,4 +859,3 @@ #login-form {width:100%; margin-top:2em;} } -