zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-24 17:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:neocities/neocities

Browse source
This commit is contained in:
Kyle Drake 2017-03-22 11:50:54 -07:00
commit 68729d1d63
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sass/_project-sass/_project-Main.scss
View file

@ -961,7 +961,6 @@ a.tag:hover {
background: #3399CC;
}
.news-item .title {
margin-bottom: .4em;
position: relative;
width: 100%;
float: left;
@ -1054,6 +1053,11 @@ a.tag:hover {
.news-item .actions, .news-item.comment .content {
margin-left: 61px;
}
.news-item.comment .content {
word-wrap: break-word;
overflow-wrap: break-word;
margin-bottom: 10px;
}
.news-item.comment .comments .actions {
margin-left: 47px;
}

2
views/_news_profile_comment.erb
View file

@ -22,5 +22,5 @@
</span>
</div>
<div class="content">
<div style="margin-bottom: 10px"><%== sanitize_comment profile_comment.message %></div>
<%== sanitize_comment profile_comment.message %>
</div>

4
views/supporter/_compare.erb
View file

@ -25,14 +25,14 @@
</tr>
<tr>
<td class="feature-column">
<span data-original-title="We will never put ads on your site, or give your data to marketers. In fact, we’re prohibited from doing it in our own Terms of Service.">No advertising, ever</span>
<span data-original-title="We will never put ads on your site, or give your data to marketers.">No advertising, ever</span>
</td>
<td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td>
</tr>
<tr>
<td class="feature-column">
<span data-original-title="Our worldwide network of CDN servers cache your web site regionally, making your site load fast—no matter where your users are. 頑張る, 日本!">Global CDN Site Cache</span>
<span data-original-title="Our global Anycast CDN caches your web site all over the world, making your site load fast—no matter where your users are. すごい">Global Anycast CDN</span>
</td>
<td><i class="fa fa-check"></i></td>
<td><i class="fa fa-check"></i></td>

2
workers/thumbnail_worker.rb
View file

@ -31,7 +31,7 @@ class ThumbnailWorker
resimg.write(full_thumbnail_path) {
self.quality = 75
}
$image_optim.optimize_image! full_thumbnail_path
#$image_optim.optimize_image! full_thumbnail_path
end
end
end