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

Browse source
This commit is contained in:
Kyle Drake 2014-11-27 17:33:13 -08:00
commit 6dddb5e6c3
14 changed files with 44 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,7 +57,11 @@
font-weight: bold;
}
.interior .header-Outro .row.content {
padding-left: 3%;
padding-right: 3%;
h1, h2, h3 {
padding-left: 2px;
}
}
.interior .header-Outro .subtitle {
font-size: 1em;
@ -72,10 +76,13 @@
-moz-box-shadow: 0px 1px 1px 1px rgba(0,0,0,0.10);
-webkit-box-shadow: 0px 1px 1px 1px rgba(0,0,0,0.10);
box-shadow: 0px 1px 1px 1px rgba(0,0,0,0.10);
padding: 1px 3% 40px 3%;
padding: 25px 3% 40px 3%;
h1, h2, h3, h4, h5, h6 {
margin-top: 1em;
&:first-child {
margin-top: 0;
}
}
}
.content.single-Col.misc-page {
@ -175,7 +182,7 @@
background: #daeea5 url(/img/heartcat.png) no-repeat 20px center;
background-size: 77px 81px;
padding: 20px 20px 20px 111px;
margin-bottom: 20px;
margin-bottom: 13px;
}
.welcome h4 {
font-size: 1.2em;
@ -192,6 +199,7 @@
background: #E4D8CB;
width: 100%;
position: relative;
margin-top: 7px;
}
.files .header {
background: #5E95A1;
@ -876,13 +884,14 @@ a.tag:hover {
}
}
#followLink.is-following {
width: 8.7em;
.follow {
display: none;
}
.following {
display: inline;
display: block;
width: 5.9em;
}
.unfollow {
display: none;
@ -896,7 +905,8 @@ a.tag:hover {
display: none;
}
.unfollow {
display: inline;
display: block;
width: 5.9em;
}
}
.popover {
@ -1145,8 +1155,16 @@ a.tag:hover {
float:left;
background-repeat: no-repeat;
margin-right: 30px;
background-size: 100%;
@media (max-device-width:480px), screen and (max-width:800px){
@media (max-width:1170px) and (min-width:900px){
margin-right: 25px!important;
&:last-child {
margin-right: 0!important;
}
}
@media (max-device-width:480px), screen and (max-width:900px){
margin-top: 25px !important;
display:block;
float:none;
@ -1157,29 +1175,40 @@ a.tag:hover {
width: 211px;
height: 44px;
background-image: url(/img/wired-logo.png);
background-size: 211px;
margin-top: 6px;
margin-right: 38px;
@media (max-width:1170px) and (min-width:900px){
width: 170px;
}
}
.section .logo.fastco {
width: 262px;
height: 39px;
background-image: url(/img/fastcompany-logo.png);
background-size: 262px;
margin-top: 7px;
margin-top: 7px;
@media (max-width:1170px) and (min-width:900px){
width: 220px;
}
}
.section .logo.vice {
width: 160px;
height: 50px;
background-image: url(/img/vice-logo.png);
background-size: 160px;
@media (max-width:1170px) and (min-width:900px){
width: 120px;
margin-top: 4px;
}
}
.section .logo.ars {
width: 187px;
height: 62px;
background-image: url(/img/ars-logo.png);
background-size: 187px;
margin-top: -4px;
@media (max-width:1170px) and (min-width:900px){
width: 130px;
margin-top: 0;
}
}
.section .press .more {
color: #A0BAC0;

1
views/about.erb
View file

@ -6,7 +6,6 @@
</div>
<div class="content single-Col misc-page">
<h3></h3>
<article>
<h1>Neocities is bringing back the fun, creativity and independence that made the web great.</h1>

4
views/index.erb
View file

@ -161,8 +161,8 @@
<hr />
<div class="siteCreateInputs">
<label for="create-Input">Username</label>
<input type="text" name="prevent_autofill_username" id="prevent_autofill_username" value="" class="hidden" />
<input type="password" name="prevent_autofill_password" id="prevent_autofill_password" value="" class="hidden" />
<input type="text" name="prevent_autofill_username" id="prevent_autofill_username" value="" style="position:absolute; top:-1000px;" />
<input type="password" name="prevent_autofill_password" id="prevent_autofill_password" value="" style="position:absolute; top:-1000px;" />
<input type="text" class="input-Area" id="create-Input" name="username" placeholder="my-site-name" data-placement="left" data-trigger="manual" autocapitalize="off" autocorrect="off" autocomplete="off" />
<label for="create-Input" id="domain-name">.neocities.org</label>

1
views/new.erb
View file

@ -11,7 +11,6 @@
</div>
<div class="content single-Col misc-page">
<h3></h3>
<form method="POST" action="/create" id="signupform">
<input name="csrf_token" type="hidden" value="<%= csrf_token %>">

1
views/not_found.erb
View file

@ -6,7 +6,6 @@
</div>
<div class="content single-Col misc-page">
<h3></h3>
<article>
<div class="txt-Center"><img src="/img/cat-larger.png"></div>
<p>

1
views/password_reset.erb
View file

@ -5,7 +5,6 @@
</div>
<div class="content single-Col misc-page">
<h3></h3>
<p>
Note: If you provided your e-mail, you can reset your password. If you didn't, you will not be able to reset your password, and instead should create a new account. We cannot change a password without an entered email for security reasons.

1
views/plan/thanks.erb
View file

@ -6,7 +6,6 @@
</div>
<div class="content single-Col misc-page">
<h3></h3>
<article>
<div class="txt-Center"><img src="/img/heartcat.png"></div>

4
views/privacy.erb
View file

@ -5,9 +5,7 @@
</div>
</div>
<div class="content single-Col misc-page">
<h3></h3>
<div class="content single-Col misc-page">
<p>Our Privacy Policy was last updated and posted on June 3, 2013. It governs the privacy terms of our Website, located at http://neocities.org. Any capitalized terms not defined in our Privacy Policy, have the meaning as specified in our Terms of Service.</p>
<p><strong>Your Privacy</strong><br />Neocities follows all legal requirements to protect your privacy. Our Privacy Policy is a legal statement that explains how we may collect information from you, how we may share your information, and how you can limit our sharing of your information. You will see terms in our Privacy Policy that are capitalized. These terms have meanings as described in the Definitions section below.</p>

2
views/signin.erb
View file

@ -6,8 +6,6 @@
</div>
<div class="content txt-Center single-Col misc-page">
<h3></h3>
<% if flash.keys.length > 0 %>
<div class="alert alert-block">
<p>

1
views/site_files/mount_info.erb
View file

@ -6,7 +6,6 @@
</div>
<div class="content single-Col misc-page">
<h3></h3>
<article>
<h1>About</h1>

1
views/site_files/new_page.erb
View file

@ -7,7 +7,6 @@
<div class="content single-Col misc-page txt-Center">
<article>
<h3></h3>
<section>
<% if @errors %>
<div class="alert alert-error alert-block">

1
views/stats.erb
View file

@ -5,7 +5,6 @@
</div>
<div class="content single-Col misc-page">
<h3></h3>
<article>
<h2>General Stats</h2>

1
views/terms.erb
View file

@ -6,7 +6,6 @@
</div>
<div class="content single-Col misc-page">
<h3></h3>
<p>This web page represents a legal document that serves as our Terms of Service and it governs the legal terms of our website, https://neocities.org, sub-domains, and any associated web-based and mobile applications (collectively, "Website"), as owned and operated by Neocities.</p>
<p>Capitalized terms, unless otherwise defined, have the meaning specified within the Definitions section below. This Terms of Service, along with our Privacy Policy, any mobile license agreement, and other posted guidelines within our Website, collectively "Legal Terms", constitute the entire and only agreement between you and Neocities, and supersede all other agreements, representations, warranties and understandings with respect to our Website and the subject matter contained herein. We may amend our Legal Terms at any time without specific notice to you. The latest copies of our Legal Terms will be posted on our Website, and you should review all Legal Terms prior to using our Website. After any revisions to our Legal Terms are posted, you agree to be bound to any such changes to them. Therefore, it is important for you to periodically review our Legal Terms to make sure you still agree to them.</p>
<p>

2
views/tutorials.erb
View file

@ -1,12 +1,10 @@
<div class="header-Outro">
<div class="row content single-Col">
<h1>Learn How to Make Web Sites!</h1>
<h3 class="subtitle"></h3>
</div>
</div>
<div class="content single-Col misc-page">
<h3></h3>
<p>Learning how to make web sites is one of the most important things you can learn. It allows you to create any content you want, arrange that content in any way you like, and share that content with the world. Be it an <a href="http://sheldonbrown.com" target="_blank">information portal for teaching people how to repair bikes</a>, or an interesting graphics project, or your poetry. These are things you can't do with traditional social networks, but that you can do with HTML.</p>
<p class="delta">