Merge branch 'refs/heads/feature/3.0.0-pre/design-fixes-accessibility-master' into feature/2.4.0/accessibility-master

Conflicts:
	app/views/news/_news.rhtml
	public/stylesheets/application.css
pull/41/head
Romano Licker 13 years ago
commit b05c497c22
  1. 13
      app/views/news/_news.rhtml
  2. 7
      app/views/welcome/index.rhtml
  3. 8
      public/stylesheets/application.css

@ -1,14 +1,11 @@
<p>
<div class="news">
<%= link_to_project(news.project) + ': ' unless @project %>
<h4 class='overview'><%= link_to h(news.title), news_path(news) %></h4>
<p class="author additional-information"><%= authoring news.created_on, news.author %></p>
<p>
<div>
<%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %>
<% unless news.summary.blank? %>
<p class="summary">
<%=h news.summary %>
</p>
<br />
<p class="summary"><%=h news.summary %></p>
<% end %>
</p>
</p>
</div>
</div>

@ -1,10 +1,13 @@
<div class="splitcontentleft">
<div class="wiki"><%= textilizable Setting.welcome_text %></div>
<% if @news.any? %>
<div class="news box">
<div class="mypage-box">
<h3><%=l(:label_news_latest)%></h3>
<div class="overview">
<%= render :partial => 'news/news', :collection => @news %>
<%= link_to l(:label_news_view_all), :controller => 'news' %>
</div>
</div>
<% end %>
<%= call_hook(:view_welcome_index_left, :projects => @projects) %>
@ -12,7 +15,7 @@
<div class="splitcontentright">
<% if @projects.any? %>
<div class="projects box">
<div class="projects mypage-box overview">
<h3><%=l(:label_project_latest)%></h3>
<ul>
<% for project in @projects %>

@ -2724,3 +2724,11 @@ div.mypage-box div.overview p.author {
#content .additional-information {
font-size: 11px;
}
div.news {
margin-bottom: 30px;
}
div.overview {
padding:6px;
margin-bottom: 10px;
line-height:1.5em;
}

Loading…
Cancel
Save