zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 09:42:36 +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 2015-03-23 17:55:02 -07:00
commit 43ea7a7ed7
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -662,6 +662,10 @@
margin: 20px auto 2em auto; margin: 20px auto 2em auto;
text-align: center; text-align: center;
.btn:last-child {
margin-left: 10px;
}
@media (max-device-width:480px), screen and (max-width:800px) { @media (max-device-width:480px), screen and (max-width:800px) {
text-align: left; text-align: left;
} }

2
views/_follows.erb
View file

@ -1,7 +1,7 @@
<% site_followings = site.followings %> <% site_followings = site.followings %>
<% if (!is_current_site && !site_followings.empty?) || is_current_site %> <% if (!is_current_site && !site_followings.empty?) || is_current_site %>
<div class="following-list"> <div class="following-list">
<h3><a href="/site/<%= site.username %>/follows"><%= is_current_site ? 'You follow' : 'This site follows' %></h3> <h3><a href="/site/<%= site.username %>/follows"><%= is_current_site ? 'You follow' : 'This site follows' %></a></h3>
<% if site_followings.empty? %> <% if site_followings.empty? %>
<p>You are not following any sites yet. Add some by <a href="/browse">browsing sites</a> or looking at your tags. <p>You are not following any sites yet. Add some by <a href="/browse">browsing sites</a> or looking at your tags.
<% else %> <% else %>

3
views/home.erb
View file

@ -107,7 +107,8 @@
<a href="//<%= site.host %>" class="large-portrait" style="background-image:url(<%= site.screenshot_url('index.html', '540x405') %>);"></a> <a href="//<%= site.host %>" class="large-portrait" style="background-image:url(<%= site.screenshot_url('index.html', '540x405') %>);"></a>
<div class="news-profile-button"> <div class="news-profile-button">
<a href="/site/<%= site.username %>" class="btn-Action">View Site Profile</a> <a href="/site/<%= site.username %>" class="btn btn-Action"><i class="fa fa-user"></i> Profile</a>
<a href="#" id="shareButton" class="btn btn-Action" data-container="body" data-toggle="popover" data-placement="bottom" data-content='<%== erb :'_share', layout: false, locals: {site: current_site} %>'><i class="fa fa-share-alt"></i> Share</a>
</div> </div>
<%== erb :'_follows', layout: false, locals: {site: site, is_current_site: site == current_site} %> <%== erb :'_follows', layout: false, locals: {site: site, is_current_site: site == current_site} %>

2
views/site.erb
View file

@ -30,7 +30,7 @@
</div> </div>
<div class="actions"> <div class="actions">
<% if current_site == site %> <% if current_site == site %>
<a href="/dashboard" class="btn-Action edit"><span><i class="fa fa-pencil"></i> Edit Site</span></a> <a href="/dashboard" class="btn-Action edit"><i class="fa fa-edit" title="Edit"></i> Edit Site</a>
<% end %> <% end %>
<% if current_site && current_site != site %> <% if current_site && current_site != site %>