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

fix merge cflct

Browse source
This commit is contained in:
Kyle Drake 2014-10-22 22:08:09 -07:00
commit 9140f3b929
9 changed files with 58 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -105,6 +105,12 @@
-moz-background-size:cover;
-webkit-background-size:cover;
background-size:cover;
background-position: center top;
}
.interior .header-Outro .screenshot.dashboard {
width: 249px;
background-size: 249px;
height: 143px;
}
.interior .header-Outro ul {
margin:0;padding:0;
@ -507,18 +513,10 @@ a.tag:hover {
.news-item {
width: 100%;
float: left;
margin: 1em 0;
margin: 1.25em 0 1.25em 0;
}
/*
.news-item.update, .news-item.tags, .news-item.comment.for-me, .news-item.tip.for-me {
margin: 1.0em 0;
}
*/
.news-item:nth-of-type(1) {
margin-top: 0;
}
.news-item.first {
margin-top: 0;
margin-top: 0!important;
}
.news-item .user {
font-weight: bold;
@ -534,7 +532,8 @@ a.tag:hover {
font-style: normal;
margin-top: .2em;
font-size: .9em;
margin-bottom: -.4em;
margin-bottom: -.1em;
margin-left: 2.35em;
}
.news-item .icon {
width: 20px;
@ -562,6 +561,9 @@ a.tag:hover {
.news-item.tip .icon {
background: #FFCC00;
}
.news-item.follow {
margin: .3em 0 .3em 0;
}
.news-item.follow .icon {
background: #3399CC;
}
@ -580,9 +582,9 @@ a.tag:hover {
color: #aaa;
}
.news-item .files {
background: #eee;
background: #F5F5F5;
padding: 8px 10px 2px 10px;
border-top: 1px solid #ddd;
border-top: 1px solid #E7E7E7;
margin-bottom: 4px;
}
.news-item .file {
@ -1159,6 +1161,10 @@ a.tag:hover {
.browse-page .tags {
padding: 0 30px 40px 30px;
}
.misc-page .pagination {
width: 100%;
float: left;
}
.pagination .arrow {
vertical-align: 1px;
}
@ -1170,7 +1176,19 @@ a.tag:hover {
padding-top: 0px;
padding-bottom: 4px;
}
.dropdown-submenu .dropdown-menu {
width: 1px;
}
.fa-heart {
font-size: 0.7em;
color: #e93250;
vertical-align: .45em;
margin-left: -.15em;
}
.fa-user {
margin-right: 0.25em;
display: inline;
font-size: 10px;
vertical-align: .1em;
margin-left: .1em;
}

7
sass/_project-sass/_project-Website-Gallery.scss
View file

@ -37,10 +37,6 @@
width: 28%;
text-align: right;
}
.fa-user {
margin-right: .45em;
display: inline;
}
.site-tags {
width: 100%;
height: 1.4em;
@ -50,6 +46,9 @@
.site-tags .fa-tag {
vertical-align: -2px;
}
.fa-user {
margin-right: .45em;
}
}
.title {
margin-top: 8px;

4
views/_follows.erb
View file

@ -6,7 +6,7 @@
<p>You are not following any sites yet. Add some by <a href="/browse">browsing sites</a> or looking at your tags.
<% else %>
<% site.followings_dataset.select(:site_id).all.each do |following| %>
<a href="/site/<%= following.site_dataset.select(:username).first.username %>"><img src="<%= site.screenshot_path 'index.html', '50x50' %>" class="avatar"></a>
<a href="/site/<%= following.site_dataset.select(:username).first.username %>"><img src="<%= following.site.screenshot_url 'index.html', '50x50' %>" class="avatar"></a>
<% end %>
<% end %>
</div>
@ -21,7 +21,7 @@
<% else %>
<% site.follows_dataset.select(:actioning_site_id).all.each do |follow| %>
<% follow_actioning_site = follow.actioning_site_dataset.select(:username).first %>
<a href="/site/<%= follow_actioning_site.username %>"><img src="<%= follow_actioning_site.screenshot_path 'index.html', '50x50' %>" class="avatar"></a>
<a href="/site/<%= follow_actioning_site.username %>"><img src="<%= follow_actioning_site.screenshot_url 'index.html', '50x50' %>" class="avatar"></a>
<% end %>
<% end %>
</div>

18
views/_news.erb
View file

@ -18,13 +18,13 @@
<div class="news-item follow">
<div class="title">
<div class="icon"></div>
<% actioning_site = event.actioning_site_dataset.select(:id, :username, :title, :domain).first %>
<% event_site = event.site_dataset.select(:id, :username, :title, :domain).first %>
<% actioning_site = event.actioning_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 %>
You
<% else %>
<a href="/site/<%= actioning_site.username %>" class="user" title="<%= actioning_site.title %>"><%= actioning_site.username %></a>
<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>
<% end %>
started following
@ -32,7 +32,7 @@
<% if current_site && event_site.id == current_site.id %>
your site!
<% else %>
<a href="/site/<%= event_site.username %>" class="user" title="<%= event_site.title %>"><%= 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 %>
<span class="date">
@ -80,16 +80,18 @@
<% end %>
<% end %>
<%== erb :'_news_actions', layout: false, locals: {event: event} %>
<% if !event.follow_id %>
<%== erb :'_news_actions', layout: false, locals: {event: event} %>
<% end %>
<% if event.comments_dataset.count > 0 %>
<div class="content">
<div class="comments">
<% event.comments.each do |comment| %>
<% comment_actioning_site = comment.actioning_site_dataset.select(:id, :title, :domain, :username).first %>
<% comment_actioning_site = comment.actioning_site_dataset.select(:id, :title, :domain, :username, :stripe_customer_id).first %>
<div class="comment" id="comment_<%= comment.id %>">
<img class="avatar" src="<%= comment_actioning_site.screenshot_url('index.html', '82x62') %>">
<a href="/site/<%= comment_actioning_site.username %>" class="user" title="<%= comment_actioning_site.title %>"><%= comment_actioning_site.username %></a>
<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>
<span class="date">
<a href="?event_id=<%= event.id %>"><%= comment.created_at.ago %></a>
</span>

8
views/_news_profile_comment.erb
View file

@ -1,5 +1,5 @@
<% actioning_site = profile_comment.actioning_site_dataset.select(:id, :username).first %>
<% site = profile_comment.site_dataset.select(:id, :username).first %>
<% actioning_site = profile_comment.actioning_site_dataset.select(:id, :username, :stripe_customer_id).first %>
<% site = profile_comment.site_dataset.select(:id, :username, :stripe_customer_id).first %>
<div class="title">
<div class="icon" style="background-image:url(<%= actioning_site.screenshot_url('index.html', '100x100') %>);"></div>
@ -7,14 +7,14 @@
<% if current_site && current_site.id == actioning_site.id && request.path == '/' %>
You
<% else %>
<a href="/site/<%= actioning_site.username %>" class="user"><%= actioning_site.username %></a>
<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>
<% end %>
<% if request.path == '/' %>
<% if current_site && current_site.id == profile_comment.site_id %>
left a comment on <a href="/site/<%= current_site.username %>">your profile</a>:
<% else %>
left a comment on <a href="/site/<%= profile_comment.site.username %>" class="user"><%= profile_comment.site.username %></a><%= site.username[site.username.length-1] == 's' ? "'" : "'s" %> site profile:
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:
<% end %>
<% end %>
<span class="date">

6
views/browse.erb
View file

@ -63,18 +63,18 @@
<ul class="row website-Gallery content int-Gall">
<% @sites.each_with_index do |site,i| %>
<li>
<a href="" class="neo-Screen-Shot" target="_blank" title="<%= site.title %>" onclick="surf(<%= i+1 %>); return false">
<a href="" class="neo-Screen-Shot" title="<%= site.title %>" onclick="surf(<%= i+1 %>); return false">
<span class="img-Holder" style="background:url(<%= site.screenshot_url('index.html', '540x405') %>) no-repeat;">
<img src="/img/placeholder.png" alt="<%= site.title %>" />
</span>
</a>
<div class="title">
<a href="/surf/<%= site.username %>" title="<%= site.title %>"><%= site.title.shorten(30) %></a>
<a href="" title="<%= site.title %>" onclick="surf(<%= i+1 %>); return false"><%= site.title.shorten(30) %></a>
</div>
<div class="site-info">
<div class="username">
<a href="/site/<%= site.username %>" title="Profile">
<i class="fa fa-user"></i><%= site.username %>
<i class="fa fa-user"><% if site.supporter? && !site.ended_supporter? %><i class="fa fa-heart"></i><% end %></i><%= site.username %>
</a>
</div>
<div class="site-stats">

4
views/dashboard.erb
View file

@ -19,10 +19,10 @@
<div class="header-Outro with-site-image">
<div class="row content wide">
<div class="col col-50 signup-Area" style="width: 289px;">
<div class="col col-50 signup-Area" style="width: 293px;">
<div class="signup-Form">
<fieldset class="content">
<img class="screenshot" src="<%= current_site.screenshot_url('index.html', '540x405') %>">
<a href="/surf/<%= current_site.username %>" class="screenshot dashboard" style="background-image:url(<%= current_site.screenshot_url('index.html', '540x405') %>);"></a>
</fieldset>
</div>
</div>

2
views/index.erb
View file

@ -263,7 +263,7 @@
<div class="col col-33">
<h3><i class="fa fa-university"></i>Open Company</h3>
<p>Neocities is a member of the <a href="https://opencompany.org" target="_blank">Open Company Initative</a>, working to help improve trustability in tech companies. We <a href="https://github.com/neocities" target="_blank">publish</a> the code that powers the site for inspection, and keep open records for everyone to inspect. And if someone sends a bad takedown request, we fight it. We want to win your trust - not lock you in.</p>
<p>Neocities is a member of the <a href="http://www.opencompany.org/" target="_blank">Open Company Initative</a>, working to help improve trustability in tech companies. We <a href="https://github.com/neocities" target="_blank">publish</a> the code that powers the site for inspection, and keep open records for everyone to inspect. And if someone sends a bad takedown request, we fight it. We want to win your trust - not lock you in.</p>
</div>
<div class="col col-33">

2
views/site.erb
View file

@ -90,7 +90,7 @@
</div>
<%== erb :'_news', layout: false, locals: {site: @site, events: @latest_events} %>
<% else %>
<%== erb :'_news', layout: false, locals: {site: @site, events: @latest_events} %>
<div><%== erb :'_news', layout: false, locals: {site: @site, events: @latest_events} %></div>
<% end %>
</div>