Permalink
Browse files

Fixes to how different types of news items display on News index page…

…, small improvements to styling of news items to allow for better readability, and adds link to the RSS feed for news items.
  • Loading branch information...
1 parent 1008a73 commit 7f9ddaf051638b5a24ed495fdf19d146ea5dfecd @heathermiller heathermiller committed Mar 15, 2012
Showing with 76 additions and 137 deletions.
  1. +1 −1 _includes/frontpage.html
  2. +6 −4 _layouts/news.html
  3. +18 −8 news/index.md
  4. +50 −123 resources/stylesheets/base.css
  5. +1 −1 resources/stylesheets/page.css
View
@@ -275,7 +275,7 @@
<div class="span4">
<h2><a href="{{ site.baseurl }}/news">News</a></h2>
{% include news-feed.html %}
- <span class="rss-icon"><a href=""><img src="{{ site.baseurl }}/resources/images/rss.png" height="20px" width="20px" /></a></span>
+ <span class="rss-icon"><a href="https://github.com/akka/akka.github.com/commits/master/news/_posts.atom"><img src="{{ site.baseurl }}/resources/images/rss.png" height="20px" width="20px" /></a></span>
</div>
</div>
View
@@ -4,12 +4,14 @@
<div class="row">
<div class="span8">
- <div class="news-date">{{ page.date | date: "%B %d %Y "}}</div>
- <div class="news-author">{{ page.author }}</div>
- <div class="news-body" style="padding-top: 10px;">{{ content }}</div>
+ <div class="news-story">
+ <div class="news-date" style="font-size: 20px;">{{ page.date | date: "%B %d %Y "}}</div>
+ <div class="news-author" style="font-size: 18px;">{{ page.author }}</div>
+ <div class="news-body" style="padding-top: 10px;">{{ content }}</div>
+ </div>
</div>
<div class="span4">
- <h2 style="margin-bottom: 20px;">Past News Items</h2>
+ <h5 style="margin-bottom: 20px;">Past News Items</h5>
{% for p in site.posts limit: 9 %}
{% if forloop.index <= 1 %}
{% else %}
View
@@ -5,21 +5,31 @@ title: Akka News
<div class="row">
<div class="span8">
- <h2>Most Recent</h2>
- {% assign mostRecent = site.posts.first %}
- <div class="news-title" style="font-size: 22px; padding-top: 14px; padding-bottom: 4px;"><a href="{{ mostRecent.url }}">{{ mostRecent.title }}</a></div>
- <div class="news-date">{{ mostRecent.date | date: "%B %d %Y "}}</div>
- <div class="news-body" style="padding-top: 10px;">{{ mostRecent.content }}</div>
+ <h5>Most Recent</h5>
+ <div class="news-story">
+ {% assign mostRecent = site.posts.first %}
+ <div class="news-title" style="font-size: 28px; padding-top: 14px; padding-bottom: 8px;"><a href="{{ mostRecent.url }}">{{ mostRecent.title }}</a></div>
+ <div class="news-date" style="font-size: 18px">{{ mostRecent.date | date: "%B %d %Y "}}</div>
+ <div class="news-body" style="padding-top: 10px;">{{ mostRecent.content }}</div>
+ </div>
</div>
<div class="span4">
- <h2 style="margin-bottom: 20px;">Past News Items</h2>
+ <h5 style="margin-bottom: 20px;">Past News Items</h5>
{% for p in site.posts limit: 9 %}
{% if forloop.index <= 1 %}
{% else %}
<div class="news-item">
<div class="news-date">{{ p.date | date: "%b %d %Y" }}</div>
- <div class="news-title"><a href="{{ site.baseurl }}{{ p.url }}">{{ p.title }}</a></div>
- <div class="news-body">{{ p.content | strip_html | truncatewords: 30 }}</div>
+ {% if p.link-out %}
+ <div class="news-title"><a href="{{ p.link-out }}">{{ p.title }}</a></div>
+ {% else %}
+ <div class="news-title"><a href="{{ site.baseurl }}{{ p.url }}">{{ p.title }}</a></div>
+ {% endif %}
+ {% if p.short %}
+ <div class="news-body">{{ p.short }}</div>
+ {% else %}
+ <div class="news-body">{{ p.content | strip_html | truncatewords: 30 }}</div>
+ {% endif %}
</div>
{% endif %}
{% endfor %}
Oops, something went wrong.

0 comments on commit 7f9ddaf

Please sign in to comment.