diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index fb50605b6..24f2c6ebf 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -81,7 +81,7 @@ <%= l(:label_projects_community) %> -

+

- + <%= l(:label_project_name) %><%= @project.name %> <% if @project.is_public? %> <%= l(:label_public)%> @@ -182,7 +182,7 @@

<%= l(:label_project_overview)%>:

-
+
<%= textilizable(@project.description) if @project.description && !@project.description.blank? %>
@@ -205,7 +205,7 @@
-
+
<%= render_flash_messages %> @@ -213,6 +213,7 @@ <%= call_hook :view_layouts_base_content %>
+
<%= render :partial => 'layouts/new_footer'%> diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb index 1d585a571..a23aa6c04 100644 --- a/app/views/wiki/show.html.erb +++ b/app/views/wiki/show.html.erb @@ -73,7 +73,7 @@ <% end %> -
+

<% other_formats_links do |f| %> <%= f.link_to 'PDF', :url => {:id => @page.title, :version => params[:version]} %> <%= f.link_to 'HTML', :url => {:id => @page.title, :version => params[:version]} %> diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 4cb344430..2f4ca5843 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -71,7 +71,7 @@ a:hover.problem_pic{border:1px solid #64bdd9;} .pro_txt_w{width:610px;} a.problem_name{ color:#ff5722; } a:hover.problem_name{ color:#d33503;} -a.problem_tit{ color:#0781b4; width:430px; font-weight:bold; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} +a.problem_tit{ color:#0781b4; max-width:430px; font-weight:bold; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} a.problem_tit02{ color:#0781b4; font-weight:bold;width:400px; } a:hover.problem_tit,a:hover.problem_tit02{ color:#09658c; } .problem_main{ border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 16d5ccd13..9ff4985cc 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -44,6 +44,7 @@ h4{ font-size:14px; color:#3b3b3b;} .clearfix:after{clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden} .clearfix{clear:both;zoom:1} .break_word{ word-break:break-all; word-wrap: break-word;} +.hidden{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} .flow_hidden{ width:300px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} /* Spacing */