changeset 1344:e5d5cb1bc3be live

Merge from branch cannam

--- a/app/views/welcome/index.html.erb	Thu Jun 20 13:10:50 2013 +0100
+++ b/app/views/welcome/index.html.erb	Fri Jun 21 11:19:15 2013 +0100
@@ -5,10 +5,18 @@
   </div>
 <% end %>
 
+<div id="welcomepagenews">
+  <% if @site_news.any? %>
+    <div class="news box">
+       <h3><%=l(:label_news_site_latest)%></h3>
+	<%= render :partial => 'news/news', :locals => { :project => @site_project }, :collection => @site_news %>
+	<%= link_to l(:label_news_more), { :controller => 'news', :project_id => @site_project.identifier, :action => 'index' } %>
+    </div>
+  <% end %>
+</div>
+
 <div id="welcomepage">
-
 <%= textilizable Setting.welcome_text %>
-
 </div>
   
 <% content_for :header_tags do %>

--- a/public/stylesheets/application.css	Thu Jun 20 13:10:50 2013 +0100
+++ b/public/stylesheets/application.css	Fri Jun 21 11:19:15 2013 +0100
@@ -5,7 +5,12 @@
 #content h1, h2, h3, h4 {color: #555;}
 h2, .wiki h1 {font-size: 20px;}
 h3, .wiki h2 {font-size: 16px;}
-h4, .wiki h3 {font-size: 13px;}
+h4, .wiki h4, .wiki h5, .wiki h6 {font-size: 14px;}
+.wiki h3 {font-size: 15px;}
+.wiki h5 {font-weight: normal; font-style: italic; }
+.wiki h6 {font-weight: normal; font-style: normal; }
+
+
 h4 {border-bottom: 1px dotted #bbb;}
 
 /***** Layout *****/

--- a/public/themes/soundsoftware/stylesheets/application.css	Thu Jun 20 13:10:50 2013 +0100
+++ b/public/themes/soundsoftware/stylesheets/application.css	Fri Jun 21 11:19:15 2013 +0100
@@ -178,7 +178,7 @@
 
 #welcomepage {
     width: 80%;
-    margin-left: 10%;
+    margin-left: 71px;
     margin-top: 10px;
 }
 #welcomepage blockquote {
@@ -187,15 +187,30 @@
     padding-left: 0;
     margin-left: 0;
 }
+#welcomepage h2 {
+    font-size: 2em;
+    margin-bottom: 0.8em;
+}
 #welcomepage p, #welcomepage li {
-    font-size: 1.2em;
+    font-size: 1.25em;
     color: #3e442c;
 }
 #welcomepage p {
     margin-left: 2em;
-    margin-top: 0.7em;
+    margin-top: 1em;
     margin-bottom: 0.7em;
 }
+#welcomepage a {
+    white-space: nowrap;
+}
+#welcomepagenews {
+    float: right;
+    width: 27%;
+    margin-right: 3%;
+    margin-top: 2.5em;
+    margin-left: 2em;
+    margin-bottom: 2em;
+}
 
 div.flash.newsalert {
   float: right;