Wrap "splitcontentright" and "splitcontentleft" containers with a flexbox (#30168).

Patch by Max Johansson.

git-svn-id: http://svn.redmine.org/redmine/trunk@17790 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/custom_fields/_form.html.erb b/app/views/custom_fields/_form.html.erb
index 44a7a4b4adb740128edb2b5cefc85778341a5c98..1407385053737d9cf1706bfa0564a0639a995195 100644 (file)
--- a/app/views/custom_fields/_form.html.erb
+++ b/app/views/custom_fields/_form.html.erb
@@ -1,5 +1,6 @@
 <%= error_messages_for 'custom_field' %>
 
+<div class="splitcontent">
 <div class="splitcontentleft">
 <div class="box tabular">
 <p><%= f.select :field_format, custom_field_formats_for_select(@custom_field), {}, :disabled => !@custom_field.new_record? %></p>
@@ -127,5 +128,6 @@ when "IssueCustomField" %>
   </fieldset>
 <% end %>
 </div>
+</div>
 
 <% include_calendar_headers_tags %>

diff --git a/app/views/issues/bulk_edit.html.erb b/app/views/issues/bulk_edit.html.erb
index 097e14e6f42e93825d5081999098144445b91e76..1298f0365031b446260efdef2d8f602fada64af7 100644 (file)
--- a/app/views/issues/bulk_edit.html.erb
+++ b/app/views/issues/bulk_edit.html.erb
@@ -28,6 +28,7 @@
 <fieldset class="attributes">
 <legend><%= l(:label_change_properties) %></legend>
 
+<div class="splitcontent">
 <div class="splitcontentleft">
 <% if @allowed_projects.present? %>
 <p>
@@ -188,6 +189,7 @@
 </p>
 <% end %>
 </div>
+</div>
 </fieldset>
 
 <fieldset>

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 44c75f2a31bad7d11ec0c33a184e32f8e883218e..63402c977ea1111074d9c5384f9adc4e409857a9 100644 (file)
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -15,6 +15,7 @@
                      :url => { :action => "account" },
                      :html => { :id => 'my_account_form',
                                 :method => :post, :multipart => true } do |f| %>
+<div class="splitcontent">
 <div class="splitcontentleft">
 <fieldset class="box tabular">
   <legend><%=l(:label_information_plural)%></legend>
@@ -51,6 +52,7 @@
 
 <p class="mobile-show"><%= submit_tag l(:button_save) %></p>
 </div>
+</div>
 <% end %>
 
 <% content_for :sidebar do %>

diff --git a/app/views/my/page.html.erb b/app/views/my/page.html.erb
index ba150fd790d00dced9aebee37a6f778d75c180d6..61c836ec4c72790928f976c31a05a15d5018df9c 100644 (file)
--- a/app/views/my/page.html.erb
+++ b/app/views/my/page.html.erb
@@ -8,12 +8,14 @@
 <h2><%=l(:label_my_page)%></h2>
 
 <div id="my-page">
+<div class="splitcontent">
 <% @groups.each do |group| %>
   <div id="list-<%= group %>" class="block-receiver">
     <%= render_blocks(@blocks[group], @user) %>
   </div>
 <% end %>
 </div>
+</div>
 
 <%= context_menu %>
 

diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index e894bcd394bbfff2866455e440f2f1ccd6fc3665..a36afeb6c45d40a8516755bf9afda1c4697cffae 100644 (file)
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -17,6 +17,7 @@
   <p class="warning"><span class="icon icon-lock"><%= l(:text_project_closed) %></span></p>
 <% end %>
 
+<div class="splitcontent">
 <div class="splitcontentleft">
   <% if @project.description.present? %>
   <div class="wiki">
@@ -118,6 +119,7 @@
 
   <%= call_hook(:view_projects_show_right, :project => @project) %>
 </div>
+</div>
 
 <% content_for :sidebar do %>
   <%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %>

diff --git a/app/views/reports/issue_report.html.erb b/app/views/reports/issue_report.html.erb
index 95c40ad6dc57a6ce8f695a35c4eb14342d5f947b..63d05e6e31a6a2259132ee2922a447972b4a57e6 100644 (file)
--- a/app/views/reports/issue_report.html.erb
+++ b/app/views/reports/issue_report.html.erb
@@ -1,5 +1,6 @@
 <h2><%=l(:label_report_plural)%></h2>
 
+<div class="splitcontent">
 <div class="splitcontentleft">
 <h3>
   <%=l(:field_tracker)%>&nbsp;
@@ -72,4 +73,4 @@
 <br />
 <%= call_hook(:view_reports_issue_report_split_content_right, :project => @project) %>
 </div>
-
+</div>

diff --git a/app/views/trackers/_form.html.erb b/app/views/trackers/_form.html.erb
index 3f5b88acbec8f18d8fee53753cdb1608dde73437..9697adb071d5437a4373ca961daa62709daf1b69 100644 (file)
--- a/app/views/trackers/_form.html.erb
+++ b/app/views/trackers/_form.html.erb
@@ -1,5 +1,6 @@
 <%= error_messages_for 'tracker' %>
 
+<div class="splitcontent">
 <div class="splitcontentleft">
 <div class="box tabular">
 <!--[form:tracker]-->
@@ -55,3 +56,4 @@ end %>
 </fieldset>
 <% end %>
 </div>
+</div>

diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 413e3550badc39c1f98f50d15c20bf0b548b459c..ce5b1f6c7b860057a2b52b6af1b10ba6d7db0029 100644 (file)
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -2,6 +2,7 @@
 
 <div id="user_form">
 <!--[form:user]-->
+<div class="splitcontent">
 <div class="splitcontentleft">
 <fieldset class="box tabular">
   <legend><%=l(:label_information_plural)%></legend>
@@ -52,6 +53,7 @@
 </fieldset>
 </div>
 </div>
+</div>
 <div style="clear:left;"></div>
 <!--[eoform:user]-->
 

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 9dee5a886cb57bce73f565c99dceebd98363a1fe..b7ceba01ac065a57a15f08841f635fbf6e1ab174 100644 (file)
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -4,6 +4,7 @@
 
 <h2><%= avatar @user, :size => "50" %> <%= @user.name %></h2>
 
+<div class="splitcontent">
 <div class="splitcontentleft">
 <ul>
   <li><%=l(:field_login)%>: <%= @user.login %></li>
@@ -61,5 +62,5 @@
 <% end %>
 <%= call_hook :view_account_right_bottom, :user => @user %>
 </div>
-
+</div>
 <% html_title @user.name %>

diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index ba0924a7c1f3ceca53086c5df4c0835fb1d0cedd..32e338fdfea49ab27a422d86bd8e14b3e87892b8 100644 (file)
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -1,5 +1,6 @@
 <h2><%= l(:label_home) %></h2>
 
+<div class="splitcontent">
 <div class="splitcontentleft">
   <div class="wiki">
     <%= textilizable Setting.welcome_text %>
@@ -17,6 +18,7 @@
   <% end %>
   <%= call_hook(:view_welcome_index_right) %>
 </div>
+</div>
 
 <% content_for :header_tags do %>
 <%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'},

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 039cc07a9dbfae494ea94e270baf495bf36f360b..fa59d6abd297b0838ddb2083377122e85c8d174b 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -441,9 +441,10 @@ div.square {
 .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; }

diff --git a/public/stylesheets/responsive.css b/public/stylesheets/responsive.css
index ac8a36fe1ab44247884c8eb1735d53ac309d6c53..c944dec1aed46d81cc3dc6edfcae4cbc96a93887 100644 (file)
--- a/public/stylesheets/responsive.css
+++ b/public/stylesheets/responsive.css
@@ -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;}
 }
-