summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/views/content/_featured_articles.html.erb16
-rw-r--r--public/images/events.pngbin0 -> 3584 bytes
-rw-r--r--public/stylesheets/ccc.css4
3 files changed, 17 insertions, 3 deletions
diff --git a/app/views/content/_featured_articles.html.erb b/app/views/content/_featured_articles.html.erb
index e4cd512..75e2e1d 100644
--- a/app/views/content/_featured_articles.html.erb
+++ b/app/views/content/_featured_articles.html.erb
@@ -3,19 +3,29 @@
3 <%= link_to( 3 <%= link_to(
4 image_tag( 'chaosradio.png' ), 4 image_tag( 'chaosradio.png' ),
5 "http://chaosradio.ccc.de/", 5 "http://chaosradio.ccc.de/",
6 :id => "chaosradio_icon" 6 :id => "chaosradio_icon",
7 :title => "Chaosradio"
7 )%> 8 )%>
8 9
9 <%= link_to( 10 <%= link_to(
10 image_tag( 'ds.png' ), 11 image_tag( 'ds.png' ),
11 "http://ds.ccc.de/", 12 "http://ds.ccc.de/",
12 :id => "ds_icon" 13 :id => "ds_icon",
14 :title => "Datenschleuder"
15 )%>
16
17 <%= link_to(
18 image_tag( 'events.png' ),
19 "http://events.ccc.de/",
20 :id => "events_icon",
21 :title => "Events Blog"
13 )%> 22 )%>
14 23
15 <%= link_to( 24 <%= link_to(
16 image_tag( 'twitter.png' ), 25 image_tag( 'twitter.png' ),
17 "https://twitter.com/chaosupdates", 26 "https://twitter.com/chaosupdates",
18 :id => "twitter_icon" 27 :id => "twitter_icon",
28 :title => "Twitter"
19 )%> 29 )%>
20</div> 30</div>
21 31
diff --git a/public/images/events.png b/public/images/events.png
new file mode 100644
index 0000000..b7faae3
--- /dev/null
+++ b/public/images/events.png
Binary files differ
diff --git a/public/stylesheets/ccc.css b/public/stylesheets/ccc.css
index 5fefebd..5a5f024 100644
--- a/public/stylesheets/ccc.css
+++ b/public/stylesheets/ccc.css
@@ -139,6 +139,10 @@ div#featured_articles #ds_icon img {
139 padding-top: 10px; 139 padding-top: 10px;
140} 140}
141 141
142div#featured_articles #events_icon img {
143 padding-left: 10px;
144}
145
142div#frontpage_calendar li { 146div#frontpage_calendar li {
143 margin-bottom: 20px; 147 margin-bottom: 20px;
144} 148}