zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-05-14 00:17:26 +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-03 20:38:06 -08:00
commit f3ab1a6f24
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
views/browse.erb
View file

@ -82,8 +82,6 @@
title="<%= site.title %>" title="<%= site.title %>"
<% if @surfmode %> <% if @surfmode %>
onclick="surf(<%= ((@page-1)*Site::BROWSE_PAGINATION_LENGTH)+i+1 %>); return false" onclick="surf(<%= ((@page-1)*Site::BROWSE_PAGINATION_LENGTH)+i+1 %>); return false"
<% else %>
href="<%= site.uri %>"
<% end %> <% end %>
> >
<span class="img-Holder" style="background:url(<%= site.screenshot_url('index.html', '540x405') %>) no-repeat;"> <span class="img-Holder" style="background:url(<%= site.screenshot_url('index.html', '540x405') %>) no-repeat;">
@ -91,7 +89,12 @@
</span> </span>
</a> </a>
<div class="title"> <div class="title">
<a href="<%= site.uri %>" title="<%= site.title %>" onclick="surf(<%= i+1 %>); return false"><%= site.title.shorten(30) %></a> <a href="<%= site.uri %>"
title="<%= site.title %>"
<% if @surfmode %>
onclick="surf(<%= ((@page-1)*Site::BROWSE_PAGINATION_LENGTH)+i+1 %>); return false"
<% end %>
><%= site.title.shorten(30) %></a>
</div> </div>
<div class="site-info"> <div class="site-info">
<div class="username"> <div class="username">

2
views/mockup/welcome.erb
View file

@ -48,7 +48,7 @@ You can support our quest to bring back the creative, independent web by upgradi
<li><span data-original-title="Make as many sites as you want with one account, and easily switch between them.">Unlimited Site Creation</span></li> <li><span data-original-title="Make as many sites as you want with one account, and easily switch between them.">Unlimited Site Creation</span></li>
<li><span data-original-title="Add your domain name (yoursite.com) to your site!">Custom Domain Support</span></li> <li><span data-original-title="Add your domain name (yoursite.com) to your site!">Custom Domain Support</span></li>
<li><span data-original-title="With WebDAV, you can mount your Neocities site to your computer as a hard drive, making it easy to update with your favorite HTML editor.">Remote Filesystem Support</span></li> <li><span data-original-title="With WebDAV, you can mount your Neocities site to your computer as a hard drive, making it easy to update with your favorite HTML editor.">Remote Filesystem Support</span></li>
<li><span data-original-title="Upload your SSL certificate for your custom domain name, preventing snoops from seeing your user’s traffic.">Custom SSL Certs (coming soon)</span></li> <li><span data-original-title="Upload your SSL certificate for your custom domain name, preventing snoops from seeing your users’ traffic.">Custom SSL Certs (coming soon)</span></li>
</ul> </ul>
</div> </div>

2
views/supporter/_compare.erb
View file

@ -116,7 +116,7 @@
</tr> </tr>
<tr> <tr>
<td class="feature-column"> <td class="feature-column">
<span data-original-title="Instant SSL certs, preventing snoops from seeing your user's traffic.">Custom Domain SSL Certs</span> <span data-original-title="Instant SSL certs, preventing snoops from seeing your users' traffic.">Custom Domain SSL Certs</span>
</td> </td>
<td></td> <td></td>
<td><i class="fa fa-check"></i></td> <td><i class="fa fa-check"></i></td>