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-12-15 12:28:49 -08:00
commit f69312e42e
5 changed files with 42 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
models/site.rb
View file

@ -30,7 +30,7 @@ class Site < Sequel::Model
audio/midi audio/midi
} }
VALID_EXTENSIONS = %w{ VALID_EXTENSIONS = %w{
html htm txt text css js jpg jpeg png gif svg md markdown eot ttf woff json html htm txt text css js jpg jpeg png gif svg md markdown eot ttf woff woff2 json
geojson csv tsv mf ico pdf asc key pgp xml mid midi geojson csv tsv mf ico pdf asc key pgp xml mid midi
} }

17
sass/_project-sass/_project-Header.scss
View file

@ -145,8 +145,10 @@
border-radius:4px 4px 0 0; border-radius:4px 4px 0 0;
@include box-shadow($signupShadow); @include box-shadow($signupShadow);
height:700%; height:700%;
float: left;
position:absolute; position:absolute;
top: -40px; top: -40px;
margin-bottom: 15px;
@media (max-device-width:480px), screen and (max-width:800px){ @media (max-device-width:480px), screen and (max-width:800px){
height:auto; height:auto;
@ -154,7 +156,7 @@
overflow:visible; overflow:visible;
padding-bottom:20px; padding-bottom:20px;
position:static; position:static;
width:auto; width:100%;
} }
h2{ h2{
@ -166,12 +168,13 @@
hr{ hr{
border-bottom:1px solid #4a6677; border-bottom:1px solid #4a6677;
border-top:1px solid #1d282d; border-top:1px solid #1d282d;
margin:4px 0 26px; margin: 4px 0 21px;
} }
fieldset{ fieldset{
background:url(/img/sign-up-bg.png) repeat-x center top;
padding: 25px 33px; padding: 25px 33px;
background:url(/img/sign-up-bg.png) repeat-x center top;
border-radius: 4px 4px 0 0;
} }
label{ label{
@ -180,7 +183,7 @@
label#domain-name { label#domain-name {
display: inline; display: inline;
vertical-align: 51%; vertical-align: 8px;
color: #C2CFD4; color: #C2CFD4;
} }
@ -189,7 +192,7 @@
border:0 solid black; border:0 solid black;
@include box-shadow($inputAreaShadow); @include box-shadow($inputAreaShadow);
color:#C2CFD4; color:#C2CFD4;
margin-bottom:27px; margin-bottom: 21px;
margin-right:$spacing; margin-right:$spacing;
padding: 10px 10px 7px 10px; padding: 10px 10px 7px 10px;
width:100%; width:100%;
@ -215,10 +218,6 @@
padding:10px 25px; padding:10px 25px;
margin-top: 2em; margin-top: 2em;
font-size: 1em; font-size: 1em;
@media (max-device-width:480px), screen and (max-width:800px){
margin-top: 0;
}
} }
} }

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

@ -1101,11 +1101,9 @@ a.tag:hover {
background: #4F7E89; background: #4F7E89;
text-align: center; text-align: center;
.row:first-child { .row:first-of-type {
@media (max-device-width:480px), screen and (max-width:800px){
margin-bottom: 0; margin-bottom: 0;
} }
}
} }
.section.features .col { .section.features .col {
padding-left: 40px; padding-left: 40px;
@ -1116,6 +1114,7 @@ a.tag:hover {
@media (max-device-width:480px), screen and (max-width:800px){ @media (max-device-width:480px), screen and (max-width:800px){
padding-left: 20px; padding-left: 20px;
width: 100%;
} }
} }
@ -1181,6 +1180,9 @@ a.tag:hover {
@media (max-width:1170px) and (min-width:900px){ @media (max-width:1170px) and (min-width:900px){
width: 170px; width: 170px;
} }
@media (max-device-width:480px), screen and (max-width:900px){
margin-right: auto!important;
}
} }
.section .logo.fastco { .section .logo.fastco {
width: 262px; width: 262px;
@ -1221,6 +1223,7 @@ a.tag:hover {
margin: 0 auto .5em auto; margin: 0 auto .5em auto;
h3 { h3 {
margin-top: .5em;
text-align: center; text-align: center;
font-style: italic; font-style: italic;
font-size: 1.4em; font-size: 1.4em;
@ -1397,10 +1400,15 @@ a.tag:hover {
} }
} }
.section.bottom-signup { .section.bottom-signup {
padding-top: 1em; // padding-top: 1em;
padding-bottom: 6.5em; // padding-bottom: 6.5em;
padding-top: 0;
background: #4F7E89;
padding-bottom: 7em;
a { a {
color: white;
text-decoration: underline; text-decoration: underline;
font-weight:bold; font-weight:bold;
&:hover { &:hover {
@ -1408,6 +1416,7 @@ a.tag:hover {
} }
} }
h2 { h2 {
color: white;
max-width: none; max-width: none;
} }
} }

21
views/index.erb
View file

@ -119,21 +119,21 @@
<div class="col intro"> <div class="col intro">
<h2 class="section-header">Create your own free web site, and discover new ones.</h2> <h2 class="section-header">Create your own free web site, and discover new ones.</h2>
<p class="intro-text"> <p class="intro-text">
Neocities is a community of <a href="/browse"><%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> sites</a> that are bringing back the lost individual creativity of the web by giving everyone in the world free web space. Anyone can make a site—only your imagination is required. Join us! Neocities is a community of <a href="/browse"><%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> sites</a> that are bringing back the lost individual creativity of the web. We provide free hosting and tools that allow anyone to make a web site. Only your imagination is required. Join us!
</p> </p>
<ul class="intro-List"> <ul class="intro-List">
<li class="intro-Social"> <li class="intro-Social">
<span class="intro-Icon"></span> <span class="intro-Icon"></span>
<h2 class="delta">Share your web creation with the world</h2> <h2 class="delta">Share your web creation with the world</h2>
<p class="base"> <p class="base">
Follow your favorite Neocities sites to keep up with all their latest updates. Discover new websites related to your interests using Site Tags, comment on them, and share them. Unlimited creativity, zero ads. Follow your favorite Neocities sites to keep up with all their latest updates. Discover new websites related to your interests using tags, comment on them, and share them. Unlimited creativity, zero ads.
</p> </p>
</li> </li>
<li class="intro-Tools"> <li class="intro-Tools">
<span class="intro-Icon"></span> <span class="intro-Icon"></span>
<h2 class="delta">Powerful new features to help you build</h2> <h2 class="delta">Powerful new features to help you build</h2>
<p class="base"> <p class="base">
We’ve made it easier to build your website and explore other sites. Neocities has an in-browser HTML editor, custom domain support, tag browsing (webrings), faster site loading, easy file uploading, RSS, subdirectory support, and much more. We’ve made it easier to build your website and explore other sites. Neocities features an in-browser HTML editor, custom domain support, faster site loading, easy file uploading, RSS feeds, folder support, and much more.
</li> </li>
</ul> </ul>
</div> </div>
@ -278,30 +278,30 @@
--> -->
<section class="section features"> <section class="section features">
<h2 class="delta">Our mission: to make the web fun again, by giving you back control of how you express yourself online.</h2> <h2 class="delta">Our mission: To make the web fun again by giving you back control of how you express yourself online.</h2>
<h2 class="delta"><img src="/img/front-editor-screenshot.png"></h2> <h2 class="delta"><img style="margin-top: .5em;" src="/img/front-editor-screenshot.png"></h2>
<div class="row"> <div class="row">
<div class="col col-50"> <div class="col col-50">
<h3><i class="fa fa-eye-slash"></i>Zero advertising</h3> <h3><i class="fa fa-eye-slash"></i>Zero advertising</h3>
<p>Neocities will never sell your personal data or embed advertising on your site. Instead, we are <a href="/plan">supporter</a> and <a href="/donate">donation</a> driven.</p> <p>Neocities will never sell your personal data or embed advertising on your site. Instead, we are funded directly by our community through <a href="/plan">supporter plans</a> and <a href="/donate">donations</a>. This allows us to base all our decisions on making the best possible web building experience for you, rather than on appeasing ad companies.</p>
</div> </div>
<div class="col col-50"> <div class="col col-50">
<h3><i class="fa fa-tachometer"></i>More space, speed, and security</h3> <h3><i class="fa fa-tachometer"></i>More space, speed, and security</h3>
<p>Neocities now uses distributed, globally-cached web servers in datacenters all over the world to serve your site. Whether it’s your personal home page, or a busy professional site, your site loads fast. And if you need more space, <a href="/plan">we've got you covered</a>. We also provide Snowden-grade SSL cryptography on all sites, preventing snoops from seeing what you browse.</p> <p>Neocities now uses distributed, globally-cached web servers in datacenters all over the world to serve your site. Whether it’s your personal home page or a busy professional site, your site loads fast. And if you need more space, <a href="/plan">we've got you covered</a>. We also provide Snowden-grade SSL cryptography on all sites, preventing snoops from seeing what you browse.</p>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col col-50"> <div class="col col-50">
<h3><i class="fa fa-wrench"></i>Developer tools</h3> <h3><i class="fa fa-wrench"></i>Developer tools</h3>
<p>We have an in-browser HTML editor, file uploading, mounting your site to your computer (just like Dropbox), powerful APIs for building developer applications, and much more!</p> <p>We have an in-browser HTML editor, easy file uploading, WebDAV publishing, support for custom domains, RSS feeds for every site, powerful APIs for building developer applications, and much more!</p>
</div> </div>
<div class="col col-50"> <div class="col col-50">
<h3><i class="fa fa-university"></i>Open Company</h3> <h3><i class="fa fa-university"></i>Open Company</h3>
<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 strive for openness in our company's operations. 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 strive for openness in our company's operations. We want to win your trust—not lock you in.</p>
</div> </div>
@ -341,8 +341,7 @@
<span class="footer-icon"></span> <span class="footer-icon"></span>
<h2 class="delta">Support Us</h2> <h2 class="delta">Support Us</h2>
<p class="tiny"> <p class="tiny">
Neocities is funded exclusively by supporters and donations. If you’d like to contribute, you can help us Neocities is funded by <a href="/plan">supporters</a> and <a href="/donate">donations</a>. If you’d like to contribute, you can help us pay our server costs using credit card, Bitcoin, or PayPal.
pay our server costs using CC, Bitcoin, or PayPal.
</p> </p>
<a href="/donate" title="Donate to Neocities" class="action-Link">Donate Today</a> <a href="/donate" title="Donate to Neocities" class="action-Link">Donate Today</a>
</div> </div>

2
views/site_files/allowed_types.erb
View file

@ -13,7 +13,7 @@
<li>JavaScript (.js, .json, .geojson)</li> <li>JavaScript (.js, .json, .geojson)</li>
<li>CSS (.css)</li> <li>CSS (.css)</li>
<li>Text (.txt, .text, .csv, .tsv)</li> <li>Text (.txt, .text, .csv, .tsv)</li>
<li>Web Fonts (.eot, .ttf, .woff, .svg)</li> <li>Web Fonts (.eot, .ttf, .woff, .woff2, .svg)</li>
<li>MIDI Files (.mid, .midi)</li> <li>MIDI Files (.mid, .midi)</li>
</ul> </ul>