Patch #30168 » splitcontent-wrapper-fix-unix.diff
| app/views/custom_fields/_form.html.erb (working copy) | ||
|---|---|---|
| 1 | 1 |
<%= error_messages_for 'custom_field' %> |
| 2 | 2 | |
| 3 |
<div class="splitcontent"> |
|
| 3 | 4 |
<div class="splitcontentleft"> |
| 4 | 5 |
<div class="box tabular"> |
| 5 | 6 |
<p><%= f.select :field_format, custom_field_formats_for_select(@custom_field), {}, :disabled => !@custom_field.new_record? %></p>
|
| ... | ... | |
| 127 | 128 |
</fieldset> |
| 128 | 129 |
<% end %> |
| 129 | 130 |
</div> |
| 130 | ||
| 131 |
</div> |
|
| 131 | 132 |
<% include_calendar_headers_tags %> |
| app/views/issues/bulk_edit.html.erb (working copy) | ||
|---|---|---|
| 28 | 28 |
<fieldset class="attributes"> |
| 29 | 29 |
<legend><%= l(:label_change_properties) %></legend> |
| 30 | 30 | |
| 31 |
<div class="splitcontent"> |
|
| 31 | 32 |
<div class="splitcontentleft"> |
| 32 | 33 |
<% if @allowed_projects.present? %> |
| 33 | 34 |
<p> |
| ... | ... | |
| 188 | 189 |
</p> |
| 189 | 190 |
<% end %> |
| 190 | 191 |
</div> |
| 192 |
</div> |
|
| 191 | 193 |
</fieldset> |
| 192 | 194 | |
| 193 | 195 |
<fieldset> |
| app/views/my/account.html.erb (working copy) | ||
|---|---|---|
| 15 | 15 |
:url => { :action => "account" },
|
| 16 | 16 |
:html => { :id => 'my_account_form',
|
| 17 | 17 |
:method => :post, :multipart => true } do |f| %> |
| 18 |
<div class="splitcontent"> |
|
| 18 | 19 |
<div class="splitcontentleft"> |
| 19 | 20 |
<fieldset class="box tabular"> |
| 20 | 21 |
<legend><%=l(:label_information_plural)%></legend> |
| ... | ... | |
| 51 | 52 | |
| 52 | 53 |
<p class="mobile-show"><%= submit_tag l(:button_save) %></p> |
| 53 | 54 |
</div> |
| 55 |
</div> |
|
| 54 | 56 |
<% end %> |
| 55 | 57 | |
| 56 | 58 |
<% content_for :sidebar do %> |
| app/views/my/page.html.erb (working copy) | ||
|---|---|---|
| 8 | 8 |
<h2><%=l(:label_my_page)%></h2> |
| 9 | 9 | |
| 10 | 10 |
<div id="my-page"> |
| 11 |
<div class="splitcontent"> |
|
| 11 | 12 |
<% @groups.each do |group| %> |
| 12 | 13 |
<div id="list-<%= group %>" class="block-receiver"> |
| 13 | 14 |
<%= render_blocks(@blocks[group], @user) %> |
| 14 | 15 |
</div> |
| 15 | 16 |
<% end %> |
| 16 | 17 |
</div> |
| 18 |
</div> |
|
| 17 | 19 | |
| 18 | 20 |
<%= context_menu %> |
| 19 | 21 | |
| app/views/projects/show.html.erb (working copy) | ||
|---|---|---|
| 17 | 17 |
<p class="warning"><span class="icon icon-lock"><%= l(:text_project_closed) %></span></p> |
| 18 | 18 |
<% end %> |
| 19 | 19 | |
| 20 |
<div class="splitcontent"> |
|
| 20 | 21 |
<div class="splitcontentleft"> |
| 21 | 22 |
<% if @project.description.present? %> |
| 22 | 23 |
<div class="wiki"> |
| ... | ... | |
| 118 | 119 | |
| 119 | 120 |
<%= call_hook(:view_projects_show_right, :project => @project) %> |
| 120 | 121 |
</div> |
| 122 |
</div> |
|
| 121 | 123 | |
| 122 | 124 |
<% content_for :sidebar do %> |
| 123 | 125 |
<%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %> |
| app/views/reports/issue_report.html.erb (working copy) | ||
|---|---|---|
| 1 | 1 |
<h2><%=l(:label_report_plural)%></h2> |
| 2 | ||
| 2 |
<div class="splitcontent"> |
|
| 3 | 3 |
<div class="splitcontentleft"> |
| 4 | 4 |
<h3> |
| 5 | 5 |
<%=l(:field_tracker)%> |
| ... | ... | |
| 72 | 72 |
<br /> |
| 73 | 73 |
<%= call_hook(:view_reports_issue_report_split_content_right, :project => @project) %> |
| 74 | 74 |
</div> |
| 75 | ||
| 75 |
</div> |
|
| app/views/trackers/_form.html.erb (working copy) | ||
|---|---|---|
| 1 | 1 |
<%= error_messages_for 'tracker' %> |
| 2 | ||
| 2 |
<div class="splitcontent"> |
|
| 3 | 3 |
<div class="splitcontentleft"> |
| 4 | 4 |
<div class="box tabular"> |
| 5 | 5 |
<!--[form:tracker]--> |
| ... | ... | |
| 55 | 55 |
</fieldset> |
| 56 | 56 |
<% end %> |
| 57 | 57 |
</div> |
| 58 |
</div> |
|
| app/views/users/_form.html.erb (working copy) | ||
|---|---|---|
| 2 | 2 | |
| 3 | 3 |
<div id="user_form"> |
| 4 | 4 |
<!--[form:user]--> |
| 5 |
<div class="splitcontent"> |
|
| 5 | 6 |
<div class="splitcontentleft"> |
| 6 | 7 |
<fieldset class="box tabular"> |
| 7 | 8 |
<legend><%=l(:label_information_plural)%></legend> |
| ... | ... | |
| 52 | 53 |
</fieldset> |
| 53 | 54 |
</div> |
| 54 | 55 |
</div> |
| 56 |
</div> |
|
| 55 | 57 |
<div style="clear:left;"></div> |
| 56 | 58 |
<!--[eoform:user]--> |
| 57 | 59 | |
| app/views/users/show.html.erb (working copy) | ||
|---|---|---|
| 3 | 3 |
</div> |
| 4 | 4 | |
| 5 | 5 |
<h2><%= avatar @user, :size => "50" %> <%= @user.name %></h2> |
| 6 | ||
| 6 |
<div class="splitcontent"> |
|
| 7 | 7 |
<div class="splitcontentleft"> |
| 8 | 8 |
<ul> |
| 9 | 9 |
<% if User.current.admin? %> |
| ... | ... | |
| 63 | 63 |
<% end %> |
| 64 | 64 |
<%= call_hook :view_account_right_bottom, :user => @user %> |
| 65 | 65 |
</div> |
| 66 | ||
| 66 |
</div> |
|
| 67 | 67 |
<% html_title @user.name %> |
| app/views/welcome/index.html.erb (working copy) | ||
|---|---|---|
| 1 | 1 |
<h2><%= l(:label_home) %></h2> |
| 2 | ||
| 2 |
<div class="splitcontent"> |
|
| 3 | 3 |
<div class="splitcontentleft"> |
| 4 | 4 |
<div class="wiki"> |
| 5 | 5 |
<%= textilizable Setting.welcome_text %> |
| ... | ... | |
| 17 | 17 |
<% end %> |
| 18 | 18 |
<%= call_hook(:view_welcome_index_right) %> |
| 19 | 19 |
</div> |
| 20 |
</div> |
|
| 20 | 21 | |
| 21 | 22 |
<% content_for :header_tags do %> |
| 22 | 23 |
<%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
|
| public/stylesheets/application.css (working copy) | ||
|---|---|---|
| 441 | 441 |
.contextual input, .contextual select {font-size:0.9em;}
|
| 442 | 442 |
.message .contextual { margin-top: 0; }
|
| 443 | 443 | |
| 444 |
.splitcontent {overflow:auto;}
|
|
| 445 |
.splitcontentleft, #list-left {float:left; width:49%;}
|
|
| 446 |
.splitcontentright, #list-right {float:right; width:49%;}
|
|
| 444 |
.splitcontent {overflow:auto; display:flex; flex-wrap: wrap;}
|
|
| 445 |
.splitcontentleft, #list-left {flex: 1; margin-right: 5px;}
|
|
| 446 |
.splitcontentright, #list-right {flex: 1; margin-left: 5px;}
|
|
| 447 |
#list-top {width: 100%;}
|
|
| 447 | 448 |
form {display: inline;}
|
| 448 | 449 |
input, select {vertical-align: middle; margin-top: 1px; margin-bottom: 1px;}
|
| 449 | 450 |
input[type="submit"] { -webkit-appearance: button; }
|
| public/stylesheets/responsive.css (working copy) | ||
|---|---|---|
| 219 | 219 | |
| 220 | 220 |
.splitcontentleft, #list-left {
|
| 221 | 221 |
width: 100%; |
| 222 |
flex: auto; |
|
| 223 |
margin-right: 0; |
|
| 222 | 224 |
} |
| 223 | 225 | |
| 224 | 226 |
.splitcontentright, #list-right {
|
| 225 | 227 |
width: 100%; |
| 228 |
flex: auto; |
|
| 229 |
margin-left: 0; |
|
| 226 | 230 |
} |
| 227 | 231 | |
| 228 | 232 |
/*----------------------------------------*\ |
| ... | ... | |
| 855 | 859 | |
| 856 | 860 |
#login-form {width:100%; margin-top:2em;}
|
| 857 | 861 |
} |
| 858 | ||