From ca043789fd746311574e293783099dc16930dcb2 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sat, 12 Jan 2019 02:51:41 +0000 Subject: [PATCH] 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 --- app/views/custom_fields/_form.html.erb | 2 ++ app/views/issues/bulk_edit.html.erb | 2 ++ app/views/my/account.html.erb | 2 ++ app/views/my/page.html.erb | 2 ++ app/views/projects/show.html.erb | 2 ++ app/views/reports/issue_report.html.erb | 3 ++- app/views/trackers/_form.html.erb | 2 ++ app/views/users/_form.html.erb | 2 ++ app/views/users/show.html.erb | 3 ++- app/views/welcome/index.html.erb | 2 ++ public/stylesheets/application.css | 7 ++++--- public/stylesheets/responsive.css | 5 ++++- 12 files changed, 28 insertions(+), 6 deletions(-) diff --git a/app/views/custom_fields/_form.html.erb b/app/views/custom_fields/_form.html.erb index 44a7a4b4a..140738505 100644 --- 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' %> +

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

@@ -127,5 +128,6 @@ when "IssueCustomField" %> <% end %>
+
<% include_calendar_headers_tags %> diff --git a/app/views/issues/bulk_edit.html.erb b/app/views/issues/bulk_edit.html.erb index 097e14e6f..1298f0365 100644 --- a/app/views/issues/bulk_edit.html.erb +++ b/app/views/issues/bulk_edit.html.erb @@ -28,6 +28,7 @@
<%= l(:label_change_properties) %> +
<% if @allowed_projects.present? %>

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

<% end %>
+
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index 44c75f2a3..63402c977 100644 --- 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| %> +
<%=l(:label_information_plural)%> @@ -51,6 +52,7 @@

<%= submit_tag l(:button_save) %>

+
<% end %> <% content_for :sidebar do %> diff --git a/app/views/my/page.html.erb b/app/views/my/page.html.erb index ba150fd79..61c836ec4 100644 --- a/app/views/my/page.html.erb +++ b/app/views/my/page.html.erb @@ -8,12 +8,14 @@

<%=l(:label_my_page)%>

+
<% @groups.each do |group| %>
<%= render_blocks(@blocks[group], @user) %>
<% end %>
+
<%= context_menu %> diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index e894bcd39..a36afeb6c 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -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) %> diff --git a/app/views/reports/issue_report.html.erb b/app/views/reports/issue_report.html.erb index 95c40ad6d..63d05e6e3 100644 --- a/app/views/reports/issue_report.html.erb +++ b/app/views/reports/issue_report.html.erb @@ -1,5 +1,6 @@

<%=l(:label_report_plural)%>

+

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

- +
diff --git a/app/views/trackers/_form.html.erb b/app/views/trackers/_form.html.erb index 3f5b88acb..9697adb07 100644 --- a/app/views/trackers/_form.html.erb +++ b/app/views/trackers/_form.html.erb @@ -1,5 +1,6 @@ <%= error_messages_for 'tracker' %> +
@@ -55,3 +56,4 @@ end %>
<% end %>
+ diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb index 413e3550b..ce5b1f6c7 100644 --- a/app/views/users/_form.html.erb +++ b/app/views/users/_form.html.erb @@ -2,6 +2,7 @@
+
<%=l(:label_information_plural)%> @@ -52,6 +53,7 @@
+
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 9dee5a886..b7ceba01a 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -4,6 +4,7 @@

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

+
  • <%=l(:field_login)%>: <%= @user.login %>
    • @@ -61,5 +62,5 @@ <% end %> <%= call_hook :view_account_right_bottom, :user => @user %>
- +
<% html_title @user.name %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index ba0924a7c..32e338fdf 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -1,5 +1,6 @@

<%= l(:label_home) %>

+
<%= textilizable Setting.welcome_text %> @@ -17,6 +18,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'}, diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 039cc07a9..fa59d6abd 100644 --- 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 ac8a36fe1..c944dec1a 100644 --- 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;} } - -- 2.39.5