Merge violasong changes

This commit is contained in:
Kyle Drake 2014-10-23 17:54:48 -07:00
commit 6e4ad797d5
2 changed files with 10 additions and 2 deletions

View file

@ -583,14 +583,22 @@ a.tag:hover {
}
.news-item .files {
background: #F5F5F5;
padding: 8px 10px 2px 10px;
padding: 0px 10px 6px 0px;
border-top: 1px solid #E7E7E7;
margin-bottom: 4px;
}
.news-item .file {
width: 90px;
overflow: hidden;
margin-bottom: 0;
padding: 0;
margin-left: 17px;
margin-top: 10px;
}
.news-item .file .image-container {
height: 63px;
float: left;
width: 100%;
}
.news-item .file a:hover {
text-decoration: none;

View file

@ -64,7 +64,7 @@
<% if site_change_file_display_class(f) == 'html' %>
<img src="<%= event_site.screenshot_url(f, '210x158') %>">
<% elsif site_change_file_display_class(f) == 'image' %>
<img src="<%= event_site.thumbnail_url(f, '210x158') %>">
<span class="image-container"><img src="<%= event_site.thumbnail_url(f, '210x158') %>"></span>
<% elsif site_change_file_display_class(f) == 'misc' %>
<span class="misc-icon">
<%= File.extname(f).sub('.', '') %>