Revision 1344:e5d5cb1bc3be

View differences:

app/views/welcome/index.html.erb
5 5
  </div>
6 6
<% end %>
7 7

  
8
<div id="welcomepagenews">
9
  <% if @site_news.any? %>
10
    <div class="news box">
11
       <h3><%=l(:label_news_site_latest)%></h3>
12
	<%= render :partial => 'news/news', :locals => { :project => @site_project }, :collection => @site_news %>
13
	<%= link_to l(:label_news_more), { :controller => 'news', :project_id => @site_project.identifier, :action => 'index' } %>
14
    </div>
15
  <% end %>
16
</div>
17

  
8 18
<div id="welcomepage">
9

  
10 19
<%= textilizable Setting.welcome_text %>
11

  
12 20
</div>
13 21
  
14 22
<% content_for :header_tags do %>
public/stylesheets/application.css
5 5
#content h1, h2, h3, h4 {color: #555;}
6 6
h2, .wiki h1 {font-size: 20px;}
7 7
h3, .wiki h2 {font-size: 16px;}
8
h4, .wiki h3 {font-size: 13px;}
8
h4, .wiki h4, .wiki h5, .wiki h6 {font-size: 14px;}
9
.wiki h3 {font-size: 15px;}
10
.wiki h5 {font-weight: normal; font-style: italic; }
11
.wiki h6 {font-weight: normal; font-style: normal; }
12

  
13

  
9 14
h4 {border-bottom: 1px dotted #bbb;}
10 15

  
11 16
/***** Layout *****/
public/themes/soundsoftware/stylesheets/application.css
178 178

  
179 179
#welcomepage {
180 180
    width: 80%;
181
    margin-left: 10%;
181
    margin-left: 71px;
182 182
    margin-top: 10px;
183 183
}
184 184
#welcomepage blockquote {
......
187 187
    padding-left: 0;
188 188
    margin-left: 0;
189 189
}
190
#welcomepage h2 {
191
    font-size: 2em;
192
    margin-bottom: 0.8em;
193
}
190 194
#welcomepage p, #welcomepage li {
191
    font-size: 1.2em;
195
    font-size: 1.25em;
192 196
    color: #3e442c;
193 197
}
194 198
#welcomepage p {
195 199
    margin-left: 2em;
196
    margin-top: 0.7em;
200
    margin-top: 1em;
197 201
    margin-bottom: 0.7em;
198 202
}
203
#welcomepage a {
204
    white-space: nowrap;
205
}
206
#welcomepagenews {
207
    float: right;
208
    width: 27%;
209
    margin-right: 3%;
210
    margin-top: 2.5em;
211
    margin-left: 2em;
212
    margin-bottom: 2em;
213
}
199 214

  
200 215
div.flash.newsalert {
201 216
  float: right;

Also available in: Unified diff