zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-08-03 08:11:56 +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-11-03 17:36:28 -08:00
commit 831141a7a9
6 changed files with 36 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -66,10 +66,13 @@
a {
color: #B8D375;
text-decoration: underline;
border-bottom: 1px solid rgba(184, 211, 117, 0.5);
line-height: 97%;
display: inline-block;
}
a:hover {
text-decoration: none;
border-bottom: none;
}
}
h2.section-header {

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

@ -1369,7 +1369,7 @@ a.tag:hover {
.row.editor {
float: left;
width: 100%;
overflow: scroll;
overflow: auto;
position: absolute;
top: 105px;
bottom: 0;

35
views/admin.erb
View file

@ -5,7 +5,7 @@
</div>
</div>
<div class="content misc-page txt-Center">
<div class="content misc-page single-Col txt-Center" style="padding-top: 20px;">
<% if flash.keys.length > 0 %>
<div class="alert alert-error alert-block">
@ -22,32 +22,31 @@
<%== csrf_token_input_html %>
<p>Site Name:</p>
<p><input type="text" name="username" placeholder="edwardsnowden" autocapitalize="off" autocorrect="off"></p>
<p><input class="btn btn-danger" type="submit" value="Ban"></p>
<p><input class="btn btn-Action" type="submit" value="Ban"></p>
</form>
</div>
<div class="col col-50">
<h2>Ban By IP</h2>
<form action="/admin/banip" method="POST">
<%== csrf_token_input_html %>
<p>All sites with this IP address will be removed.</p>
<p>Site Name:</p>
<p><input type="text" name="username" placeholder="edwardsnowden" autocapitalize="off" autocorrect="off"></p>
<p><input class="btn btn-danger" type="submit" value="Ban"></p>
</form>
</div>
</div>
<div class="row">
<div class="col col-50">
<h2>Ban By IP</h2>
<h2>Mark as NSFW</h2>
<form action="/admin/mark_nsfw" method="POST">
<%== csrf_token_input_html %>
<p>Site Name:</p>
<p>
<input type="text" name="username" placeholder="edwardsnowden" autocapitalize="off" autocorrect="off">
</p>
<p><input class="btn btn-danger" type="submit" value="Mark NSFW"></p>
<p><input class="btn btn-Action" type="submit" value="Mark NSFW"></p>
</form>
</div>
</div>
<div class="row">
<div class="col col-50">
<h2>Ban by IP</h2>
<form action="/admin/banip" method="POST">
<%== csrf_token_input_html %>
<p>All sites with this IP address will be removed.</p>
<p>Site Name:</p>
<p><input type="text" name="username" placeholder="edwardsnowden" autocapitalize="off" autocorrect="off"></p>
<p><input class="btn btn-Action" type="submit" value="Ban"></p>
</form>
</div>
</div>

6
views/index.erb
View file

@ -116,16 +116,16 @@
<div class="header-Outro">
<div class="row header-Content content">
<div class="col intro">
<h2 class="section-header">Make your own web site, and discover new ones.</h2>
<h2 class="section-header">Make your own free website and discover new favorites.</h2>
<p class="intro-text">
Neocities is a community of <a href="/browse"><%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> websites</a> that are bringing back creative expression on the web. Anyone can make a site, only your imagination is required. We provide the space, you provide the web site ideas. Join us!
Neocities is a community of <a href="/browse"><%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> websites</a> that are bringing back creative expression on the web. Anyone can make a site—only your imagination is required. We provide the space, you provide the ideas. Join us!
</p>
<ul class="intro-List">
<li class="intro-Social">
<span class="intro-Icon"></span>
<h2 class="delta">Share your web creation with the world</h2>
<p class="base">
Follow your favorite Neocities sites to keep up with all the latest updates. Discover new websites related to your interests, comment on them, and share them. Unlimited creativity—and zero ads.
Follow your favorite Neocities sites to keep up with all their latest updates. Discover new websites related to your interests, comment on them, and share them. Unlimited creativity, zero ads.
</p>
</li>
<li class="intro-Tools">

13
views/site_files/text_editor.erb
View file

@ -1,10 +1,13 @@
<style>
html {
overflow-y: hidden;
}
#editor {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
}
.theme-Code{
float:right;

7
views/templates/index.erb
View file

@ -5,9 +5,8 @@
<title>The web site of <%= username %></title>
<style type="text/css">
/* This is a CSS comment. CSS is how you can add style to your website, such as colors, fonts,
and positioning of your HTML content.
See http:// for more info. */
and positioning of your HTML content. */
body {
background-color: white;
color: black;
@ -18,7 +17,7 @@
<body>
<h1>Welcome to my Website!</h1>
<p>This is a paragraph! Here's how you make a link: <a href="http://neocities.org">NeoCities</a>.</p>
<p>This is a paragraph! Here's how you make a link: <a href="http://neocities.org">Neocities</a>.</p>
<p>Here's how you can make <strong>bold</strong> and <em>italic</em> text.</p>