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 violasong changes

Browse source
This commit is contained in:
Kyle Drake 2014-10-24 16:26:40 -07:00
commit 58131f4964
7 changed files with 59 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app.rb
View file

@ -471,7 +471,7 @@ get '/surf/?' do
end end
get '/surf/:username' do |username| get '/surf/:username' do |username|
@site = Site.select(:id, :username, :title, :domain, :views).where(username: username).first @site = Site.select(:id, :username, :title, :domain, :views, :stripe_customer_id).where(username: username).first
@title = @site.title @title = @site.title
not_found if @site.nil? not_found if @site.nil?
erb :'surf', layout: false erb :'surf', layout: false

2
sass/_helper-sass/_buttons.scss
View file

@ -5,7 +5,7 @@
background:$c-Dark; background:$c-Dark;
@include border-radius($radius*6); @include border-radius($radius*6);
@include box-shadow($bs-1); @include box-shadow($bs-1);
color:$c-Lighter; color:$c-Lighter!important;
cursor:pointer; cursor:pointer;
display:inline-block; display:inline-block;
font:{family:$arial; size:$base} font:{family:$arial; size:$base}

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

@ -510,6 +510,9 @@ a.tag:hover {
margin: 0 4px 4px 0; margin: 0 4px 4px 0;
float: left; float: left;
} }
.misc-page.columns a:visited {
color: $c-Brand-1;
}
.news-item { .news-item {
width: 100%; width: 100%;
float: left; float: left;
@ -520,7 +523,10 @@ a.tag:hover {
} }
.news-item .user { .news-item .user {
font-weight: bold; font-weight: bold;
color: #000; color: #000!important;
}
.news-item .you {
color: #000!important;
} }
.news-item .comment { .news-item .comment {
color: #000; color: #000;
@ -533,7 +539,6 @@ a.tag:hover {
margin-top: .2em; margin-top: .2em;
font-size: .9em; font-size: .9em;
margin-bottom: -.1em; margin-bottom: -.1em;
margin-left: 2.35em;
} }
.news-item .icon { .news-item .icon {
width: 20px; width: 20px;
@ -579,7 +584,7 @@ a.tag:hover {
margin-top: .5em; margin-top: .5em;
} }
.news-item .date a { .news-item .date a {
color: #aaa; color: #aaa!important;
} }
.news-item .files { .news-item .files {
background: #F5F5F5; background: #F5F5F5;
@ -616,15 +621,30 @@ a.tag:hover {
float: none; float: none;
margin-left: 4px; margin-left: 4px;
} }
.news-item .comments .actions, .news-item .comments p {
margin-left: 47px;
}
.news-item .comments p {
margin-bottom: .4em;
margin-top: .15em;
font-size: 1em;
}
.news-item .actions { .news-item .actions {
font-size: 11px; font-size: 11px;
margin-left: 2.9em; margin-left: 32px;
} }
.news-item .actions a { .news-item .actions a {
margin-right: 6px; margin-right: 6px;
} }
.news-item .content { .news-item .content {
padding: 0 0 0 32px; padding: 0;
margin-left: 32px;
}
.news-item.comment .actions, .news-item.comment .content {
margin-left: 20px;
}
.news-item.comment .comments .actions {
margin-left: 47px;
} }
.news-item .comments { .news-item .comments {
margin-top: .7em; margin-top: .7em;
@ -632,6 +652,7 @@ a.tag:hover {
.news-item .comments .comment { .news-item .comments .comment {
font-size: .8em; font-size: .8em;
clear: both; clear: both;
margin-top: 1em;
} }
.news-item .comments .comment .user { .news-item .comments .comment .user {
margin-right: 5px; margin-right: 5px;
@ -639,6 +660,10 @@ a.tag:hover {
.news-item .comments .comment .actions { .news-item .comments .comment .actions {
margin-top: .3em; margin-top: .3em;
} }
.news-item .comment-symbol {
font-size: 80%;
margin-left: .2em;
}
.news-item .avatar { .news-item .avatar {
margin-right: 10px; margin-right: 10px;
} }
@ -662,6 +687,9 @@ a.tag:hover {
.interior .header-Outro .actions a { .interior .header-Outro .actions a {
margin-right: 6px; margin-right: 6px;
} }
.interior .header-Outro .actions a:first-of-type {
margin-left: 0;
}
.interior .header-Outro .stats { .interior .header-Outro .stats {
margin-bottom: 1.2em; margin-bottom: 1.2em;
float: left; float: left;

12
views/_news.erb
View file

@ -13,7 +13,7 @@
<% events.each do |event| %> <% events.each do |event| %>
<% if event.profile_comment_id %> <% if event.profile_comment_id %>
<div class="news-item comment for-me" id="event_<%= event.id %>"> <div class="news-item comment for-me" id="event_<%= event.id %>">
<%== erb :'_news_profile_comment', layout: false, locals: {profile_comment: event.profile_comment} %> <%== erb :'_news_profile_comment', layout: false, locals: {profile_comment: event.profile_comment, event: event} %>
<% elsif event.follow_id %> <% elsif event.follow_id %>
<div class="news-item follow"> <div class="news-item follow">
<div class="title"> <div class="title">
@ -22,15 +22,15 @@
<% event_site = event.site_dataset.select(:id, :username, :title, :domain, :stripe_customer_id).first %> <% event_site = event.site_dataset.select(:id, :username, :title, :domain, :stripe_customer_id).first %>
<% if current_site && current_site.id == actioning_site.id %> <% if current_site && current_site.id == actioning_site.id %>
You <a href="/site/<%= current_site.username %>" class="you">You</a>
<% else %> <% else %>
<i class="fa fa-user"><% if actioning_site.supporter? && !actioning_site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><a href="/site/<%= actioning_site.username %>" class="user" title="<%= actioning_site.title %>"><%= actioning_site.username %></a> <a href="/site/<%= actioning_site.username %>" class="user" title="<%= actioning_site.title %>"><i class="fa fa-user"><% if actioning_site.supporter? && !actioning_site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><%= actioning_site.username %></a>
<% end %> <% end %>
started following followed
<% if current_site && event_site.id == current_site.id %> <% if current_site && event_site.id == current_site.id %>
your site. <a href="/site/<%= current_site.username %>" class="you">you</a>
<% else %> <% else %>
<a href="/site/<%= event_site.username %>" class="user" title="<%= event_site.title %>"><i class="fa fa-user"><% if event_site.supporter? && !event_site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><%= event_site.username %></a> <a href="/site/<%= event_site.username %>" class="user" title="<%= event_site.title %>"><i class="fa fa-user"><% if event_site.supporter? && !event_site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><%= event_site.username %></a>
<% end %> <% end %>
@ -91,7 +91,7 @@
<% comment_actioning_site = comment.actioning_site_dataset.select(:id, :title, :domain, :username, :stripe_customer_id).first %> <% comment_actioning_site = comment.actioning_site_dataset.select(:id, :title, :domain, :username, :stripe_customer_id).first %>
<div class="comment" id="comment_<%= comment.id %>"> <div class="comment" id="comment_<%= comment.id %>">
<img class="avatar" src="<%= comment_actioning_site.screenshot_url('index.html', '50x50') %>"> <img class="avatar" src="<%= comment_actioning_site.screenshot_url('index.html', '50x50') %>">
<i class="fa fa-user"><% if comment_actioning_site.supporter? && !comment_actioning_site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><a href="/site/<%= comment_actioning_site.username %>" class="user" title="<%= comment_actioning_site.title %>"><%= comment_actioning_site.username %></a> <a href="/site/<%= comment_actioning_site.username %>" class="user" title="<%= comment_actioning_site.title %>"><i class="fa fa-user"><% if comment_actioning_site.supporter? && !comment_actioning_site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><%= comment_actioning_site.username %></a>
<span class="date"> <span class="date">
<a href="?event_id=<%= event.id %>"><%= comment.created_at.ago %></a> <a href="?event_id=<%= event.id %>"><%= comment.created_at.ago %></a>
</span> </span>

8
views/_news_actions.erb
View file

@ -8,13 +8,7 @@
<% end %> <% end %>
<% end %> <% end %>
<% if current_site && event.site.profile_comments_enabled && current_site.commenting_allowed? %> <% if current_site && event.site.profile_comments_enabled && current_site.commenting_allowed? %>
<a id="reply" href="#" onclick="Template.renderComment(<%= event.id %>); return false"> <a id="reply" href="#" onclick="Template.renderComment(<%= event.id %>); return false"><% if event.profile_comment_id %>Reply<% else %>Comment<% end %></a>
<% if event.profile_comment_id %>
Reply
<% else %>
Comment
<% end %>
</a>
<% if event.profile_comment_id && event.created_by?(current_site) %> <% if event.profile_comment_id && event.created_by?(current_site) %>
<a id="editLink" href="#" onclick="ProfileComment.displayEditor('<%= event.id %>'); return false">Edit</a> <a id="editLink" href="#" onclick="ProfileComment.displayEditor('<%= event.id %>'); return false">Edit</a>
<% end %> <% end %>

10
views/_news_profile_comment.erb
View file

@ -5,15 +5,17 @@
<div class="icon" style="background-image:url(<%= actioning_site.screenshot_url('index.html', '100x100') %>);"></div> <div class="icon" style="background-image:url(<%= actioning_site.screenshot_url('index.html', '100x100') %>);"></div>
<% if current_site && current_site.id == actioning_site.id %> <% if current_site && current_site.id == actioning_site.id %>
You <a href="/site/<%= current_site.username %>" class="you">You</a>
<% else %> <% else %>
<i class="fa fa-user"><% if actioning_site.supporter? && !actioning_site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><a href="/site/<%= actioning_site.username %>" class="user"><%= actioning_site.username %></a> <a href="/site/<%= actioning_site.username %>" class="user"><i class="fa fa-user"><% if actioning_site.supporter? && !actioning_site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><%= actioning_site.username %></a>
<% end %> <% end %>
<i class="fa fa-chevron-right comment-symbol" title="commented on"></i>
<% if current_site && current_site.id == profile_comment.site_id %> <% if current_site && current_site.id == profile_comment.site_id %>
left a comment on <a href="/site/<%= current_site.username %>">your profile</a>: <a href="/site/<%= current_site.username %>" class="you">You</a>
<% else %> <% else %>
left a comment on <i class="fa fa-user"><% if profile_comment.site.supporter? && !profile_comment.site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><a href="/site/<%= profile_comment.site.username %>" class="user"><%= profile_comment.site.username %></a><%= site.username[site.username.length-1] == 's' ? "’" : "'s" %> profile: <a href="/site/<%= profile_comment.site.username %>" class="user"><i class="fa fa-user"><% if profile_comment.site.supporter? && !profile_comment.site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><%= profile_comment.site.username %></a>
<% end %> <% end %>
<span class="date"> <span class="date">
<a href="?event_id=<%= profile_comment.event.id %>"><%= profile_comment.created_at.ago %></a> <a href="?event_id=<%= profile_comment.event.id %>"><%= profile_comment.created_at.ago %></a>

13
views/surf.erb
View file

@ -122,7 +122,16 @@
#top-bar .invisible a { #top-bar .invisible a {
color: #3B3B3B; color: #3B3B3B;
} }
#top-bar .fa-heart {
font-size: 0.7em;
color: #e93250;
vertical-align: .45em;
margin-left: -.15em;
}
#top-bar .fa-user {
display: inline;
font-size: 11px;
}
.hidden { .hidden {
display:none!important; display:none!important;
visibility:hidden visibility:hidden
@ -168,7 +177,7 @@
<% end %> <% end %>
</ul> </ul>
<ul class="site-actions"> <ul class="site-actions">
<li><a href="/site/<%= @site.username %>"><i class="fa fa-user"></i> <strong><%= @site.username %></strong></a></li> <li><a href="/site/<%= @site.username %>"><i class="fa fa-user"><% if @site.supporter? && !@site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i> <strong><%= @site.username %></strong></a></li>
<% if current_site && current_site != @site %> <% if current_site && current_site != @site %>
<li> <li>