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 branch 'v2' of github.com:neocities/neocities into v2

Browse source
This commit is contained in:
Kyle Drake 2014-09-26 13:31:39 +02:00
commit 8a36f1c6f5
7 changed files with 103 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/img/hpgallery-next.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
public/img/hpgallery-prev.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

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

@ -13,12 +13,15 @@
border-bottom: 0; border-bottom: 0;
} }
.row.header-Content.content {
padding-bottom:27px;
}
.header-Content{ .header-Content{
@media(max-device-width:480px), screen and (max-width:800px){ @media(max-device-width:480px), screen and (max-width:800px){
padding:0; padding:0;
} }
} }
.blurb{background:#fff} .blurb{background:#fff}
.header-Intro{ .header-Intro{

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

@ -757,10 +757,28 @@ a.tag:hover {
.section { .section {
padding: 50px 10%; padding: 50px 10%;
margin: 0 auto; margin: 0 auto;
float: left;
} }
.section.featured-Websites { .section.featured-Websites {
background:#971D31; background:#971D31;
padding: 10px 2% 1px 2%; padding: 30px 0;
width: 100%;
position:relative;
}
.section.featured-Websites .nav {
float:left;
width:4.25%;
height:45px;
background-size: 22px;
background-repeat: no-repeat;
background-position: center center;
margin-top: 3%;
}
.section.featured-Websites .nav.prev {
background-image:url(/img/hpgallery-prev.png);
}
.section.featured-Websites .nav.next {
background-image:url(/img/hpgallery-next.png);
} }
.section.features { .section.features {
background: #4F7E89; background: #4F7E89;
@ -769,13 +787,19 @@ a.tag:hover {
color: #fff; color: #fff;
} }
.section h2 { .section h2 {
font-size: 1.6em; font-size: 1.7em;
text-align:center;
}
.section h3 {
font-size: 1.4em;
margin-top: 1.5em;
margin-bottom: .2em;
} }
.section.last { .section.last {
background: #666666; background: #fff;
} }
.section.last h2, .section.last blockquote { .section.last h2, .section.last blockquote {
color: white; color: black;
} }
.selected { .selected {
font-weight: bold; font-weight: bold;
@ -809,7 +833,7 @@ a.tag:hover {
width: 40%; width: 40%;
} }
.browse-page .input-Area { .browse-page .input-Area {
width: 100%; width: auto;
padding: 4px 5px; padding: 4px 5px;
} }
.header-Outro .twitter-typeahead { .header-Outro .twitter-typeahead {

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

@ -30,16 +30,15 @@
&.int-Gall{ &.int-Gall{
li{ li {
margin:0 .5% 12px; margin:0 .5% 12px;
width:24%; width:24%;
background-color: white; background-color: white;
border: 9px solid white; border: 9px solid white;
-moz-box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.2); -moz-box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.3);
-webkit-box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.2); -webkit-box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.3);
box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.2); box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.3);
@media (max-device-width:480px), screen and (max-width:800px){ @media (max-device-width:480px), screen and (max-width:800px){
width:49% width:49%
@ -48,8 +47,8 @@
} }
} }
.neo-SS, .neo-Screen-Shot{ .neo-SS, .z{
border: 1px solid #eee; border: 4px solid #eee;
display:block; display:block;
height:auto!important; height:auto!important;
position:relative; position:relative;
@ -62,14 +61,19 @@
background-size:cover!important; background-size:cover!important;
display:block; display:block;
} }
.hp-Gallery img, .neo-Screen-Shot img{ .hp-Gallery img, .neo-Screen-Shot img{
width:100% width:100%
} }
.hp-Gallery li { .hp-Gallery {
width: 14%; padding: 0px;
margin-right: 2%; margin-bottom: 0;
}
.hp-Gallery { li {
padding: 24px 24px; width: 14%;
margin-right: 1.5%;
margin-bottom: 0;
}
li:last-child {
margin-right: 0;
}
} }

2
views/browse.erb
View file

@ -45,7 +45,7 @@
<fieldset class="grouping"> <fieldset class="grouping">
<label class="text-Label" for="tag">Search by tag:</label> <label class="text-Label" for="tag">Search by tag:</label>
<input class="input-Area typeahead" name="tag" type="text" placeholder="pokemon" value="" autocapitalize="off" autocorrect="off" autocomplete="off" spellcheck="false" dir="auto"> <input class="input-Area typeahead" name="tag" type="text" placeholder="pokemon" value="" autocapitalize="off" autocorrect="off" autocomplete="off" spellcheck="false" dir="auto">
<input style="vertical-align: -5px;margin-left: 4px;" type="submit" class="btn-Action" value="Search"> <input style="vertical-align: -4px;margin-left: 4px;" type="submit" class="btn-Action" value="Search">
</fieldset> </fieldset>
</form> </form>
</div> </div>

95
views/newindex_mockup.erb
View file

@ -121,7 +121,6 @@
<div class="col col-50"> <div class="col col-50">
<h2 class="section-header">Introducing the New Neocities</h2> <h2 class="section-header">Introducing the New Neocities</h2>
<p class="intro-text">Now’s a great time to join our community of over <%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> websites! <p class="intro-text">Now’s a great time to join our community of over <%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> websites!
<br />
You get <%= Site::FREE_MAXIMUM_IN_MEGABYTES %> MB of free web space to make whatever you’d like. </p> You get <%= Site::FREE_MAXIMUM_IN_MEGABYTES %> MB of free web space to make whatever you’d like. </p>
<ul class="intro-List"> <ul class="intro-List">
<li class="intro-Tools"> <li class="intro-Tools">
@ -196,57 +195,65 @@
<main class="content-Base"> <main class="content-Base">
<div class="section featured-Websites"> <div class="section featured-Websites">
<ul class="row website-Gallery hp-Gallery"> <div class="nav prev"></div>
<li> <ul class="website-Gallery hp-Gallery">
<a href="http://dragonquest.neocities.org/" title="The Quest of Dragons" target="_blank"> <li>
<img src="//neocities.org/site_screenshots/dragonquest.jpg" class="neo-SS" alt="Thumbnail of The Quest of Dragons" /> <a href="http://dragonquest.neocities.org/" title="The Quest of Dragons" target="_blank">
</a> <img src="//neocities.org/site_screenshots/dragonquest/index.html.270x162.jpg" class="neo-SS" alt="Thumbnail of The Quest of Dragons" />
</li> </a>
<li> </li>
<a href="http://codeventurer.neocities.org/" title="codeventurer" target="_blank"> <li>
<img src="//neocities.org/site_screenshots/codeventurer.jpg" class="neo-SS" alt="Thumbnail of codeventurer" /> <a href="http://codeventurer.neocities.org/" title="codeventurer" target="_blank">
</a> <img src="http://neocities.org/site_screenshots/codeventurer/index.html.270x162.jpg" class="neo-SS" alt="Thumbnail of codeventurer" />
</li> </a>
<li> </li>
<a href="http://clouds.neocities.org/" title="Cloud Quotes" target="_blank"> <li>
<img src="//neocities.org/site_screenshots/clouds.jpg" class="neo-SS" alt="Thumbnail of Cloud Quotes" /> <a href="http://clouds.neocities.org/" title="Cloud Quotes" target="_blank">
</a> <img src="//neocities.org/site_screenshots/clouds/index.html.270x162.jpg" class="neo-SS" alt="Thumbnail of Cloud Quotes" />
</li> </a>
<li> </li>
<a href="http://manatee.neocities.org/" title="Title of Website" target="_blank"> <li>
<img src="//neocities.org/site_screenshots/manatee.jpg" class="neo-SS" alt="Thumbnail of TITLE OF WEBSITE" /> <a href="http://manatee.neocities.org/" title="Title of Website" target="_blank">
</a> <img src="//neocities.org/site_screenshots/manatee/index.html.270x162.jpg" class="neo-SS" alt="Thumbnail of TITLE OF WEBSITE" />
</li> </a>
<li> </li>
<a href="http://suppilulemur.neocities.org/" title="Sokoban" target="_blank"> <li>
<img src="//neocities.org/site_screenshots/suppilulemur.jpg" class="neo-SS" alt="Thumbnail of Sokoban" /> <a href="http://suppilulemur.neocities.org/" title="Sokoban" target="_blank">
</a> <img src="//neocities.org/site_screenshots/suppilulemur/index.html.270x162.jpg" class="neo-SS" alt="Thumbnail of Sokoban" />
</li> </a>
<li> </li>
<a href="http://drawinglair.neocities.org/" title="Tomasz Zawadzki" target="_blank"> <li>
<img src="//neocities.org/site_screenshots/drawinglair.jpg" class="neo-SS" alt="Thumbnail of Tomasz Zawadzki" /> <a href="http://drawinglair.neocities.org/" title="Tomasz Zawadzki" target="_blank">
</a> <img src="//neocities.org/site_screenshots/drawinglair/index.html.270x162.jpg" class="neo-SS" alt="Thumbnail of Tomasz Zawadzki" />
</li> </a>
</ul> </li>
</ul>
<div class="nav next"></div>
</div> </div>
<section class="section features"> <section class="section features">
<h2 class="delta">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce dapibus semper magna id euismod. Vivamus rutrum ultricies.</h2> <h2 class="delta">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce dapibus semper magna id euismod. Vivamus rutrum ultricies.</h2>
<h3>You own your own site</h3> <div class="col col-33">
<p>We support custom domains (yoursite.com) for free. This means you always control the content on your site, and you can move it to/from Neocities whenever you want. And of course, all sites still get a subdomain (sitename.neocities.org) for free.</p> <h3>You own your own site</h3>
<p>We support custom domains (yoursite.com) for free. This means you always control the content on your site, and you can move it to/from Neocities whenever you want. And of course, all sites still get a subdomain (sitename.neocities.org) for free.</p>
<h3>Developer tools</h3> <h3>Developer tools</h3>
<p>We now have powerful APIs for developers building applications, and support for remote file uploading via command line tools. Using WebDAV, you can now mount your site to your computer, just like Dropbox.</p> <p>We now have powerful APIs for developers building applications, and support for remote file uploading via command line tools. Using WebDAV, you can now mount your site to your computer, just like Dropbox.</p>
</div>
<div class="col col-33">
<h3>More space, more performance</h3>
<p>Neocities now uses a distributed, globally-cached file system in tier-1 datacenters to serve your sites. It's a system that took us a year to build - and it's ready to serve your site with blazing speed, whether it's your personal home page, or your professional site. Go ahead, put your site on Neocities. We can handle it.</p>
</div>
<div class="col col-33">
<h3>Encrypted everything</h3>
<p>Neocities now secures serving all your content with Snowden-grade cryptography, <em>by default</em>, preventing snoops, whether they are hackers or rogue government agencies, from seeing what you browse. And we're working on letting you use your own SSL (HTTPS) certificates for custom domains.
<h3>More space, more performance</h3> Until January, Neocities will donate 5% of all Supporter plan proceeds to the Courage Foundation, an international organization that supports those who risk life or liberty to disclose privacy abuses online.</p>
<p>Neocities now uses a distributed, globally-cached file system in tier-1 datacenters to serve your sites. It's a system that took us a year to build - and it's ready to serve your site with blazing speed, whether it's your personal home page, or your professional site. Go ahead, put your site on Neocities. We can handle it.</p> </div>
<h3>Encrypted everything</h3>
<p>Neocities now secures serving all your content with Snowden-grade cryptography, <em>by default</em>, preventing snoops, whether they are hackers or rogue government agencies, from seeing what you browse. And we're working on letting you use your own SSL (HTTPS) certificates for custom domains.
Until January, Neocities will donate 5% of all Supporter plan proceeds to the Courage Foundation, an international organization that supports those who risk life or liberty to disclose privacy abuses online.</p>
</section> </section>
<section class="section last"> <section class="section last">