<% 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(: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 @@
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;}
}
-