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

moar updates

Browse source 
fix up layout issues with browse page and add alt text to images so as to take care of the 300+ html errors

updated about.erb to take care of html error

updated About NeoCities footer to say About Us to take care of text overlap issue with sticker.

clean up one error on sign in page.  update length of inputs to a 60% col.

dashboard add alt tag to screen shot.  fix some issues with incorrect indenting in the slim file

settings:
update some font sizes for layout purposes
This commit is contained in:
Scott O'Hara 2013-07-26 22:41:09 -04:00
parent e46ae4580d
commit 10aab778ef
10 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/assets/css/_project-sass/_project-Header.scss
View file

@ -93,12 +93,14 @@
overflow:hidden;
position:absolute;
top:-45px;
width:95%;
@media (max-device-width:480px), screen and (max-width:800px){
height:auto;
margin:0;
overflow:visible;
position:static;
width:auto;
}
h2{

5
public/assets/css/_project-sass/_project-Website-Gallery.scss
View file

@ -4,8 +4,9 @@
.website-Gallery{
list-style:none;
margin:0;
margin:0 auto;
padding:0;
width:90%;
li{
@extend .col-25;
@ -26,8 +27,6 @@
@include box-shadow($bs-4);
display:block;
height:auto!important;
max-height:125px;
max-width:208px;
padding:$spacing*2;
width:100%;
}

13
public/assets/css/neo.css
View file

@ -1043,13 +1043,15 @@ a {
height: 600%;
overflow: hidden;
position: absolute;
top: -45px; }
top: -45px;
width: 95%; }
@media (max-device-width: 480px), screen and (max-width: 800px) {
.signup-Form {
height: auto;
margin: 0;
overflow: visible;
position: static; } }
position: static;
width: auto; } }
.signup-Form h2 {
margin-bottom: 0;
text-shadow: 0 1px 1px rgba(0, 0, 0, 0.5);
@ -1371,8 +1373,9 @@ a {
.website-Gallery {
list-style: none;
margin: 0;
padding: 0; }
margin: 0 auto;
padding: 0;
width: 90%; }
.website-Gallery li {
float: left;
margin-bottom: 8px; }
@ -1390,8 +1393,6 @@ a {
box-shadow: 0 8px 8px -8px rgba(0, 0, 0, 0.2);
display: block;
height: auto !important;
max-height: 125px;
max-width: 208px;
padding: 8px;
width: 100%; }

2
public/assets/css/neo.min.css vendored
View file

File diff suppressed because one or more lines are too long

7
views/about.erb
View file

@ -55,11 +55,11 @@
<a href="https://twitter.com/kyledrake" title="Follow me on Twitter" class="eps">Kyle Drake</a>
</div>
<div class="col col-33">
<a href="http://t.co/e1x1XoD2qi" title="Visit Kyle's Website">
<a href="http://t.co/e1x1XoD2qi" title="Visit Victoria's Website">
<img src="https://si0.twimg.com/profile_images/2279466871/rqsa3yc6xqubsnexq30r.jpeg" alt="Victoria Wang" class="pic-Rounded" />
</a>
<br />
<a href="https://twitter.com/violasong"title="Follow me on Twitter" class="eps">Victoria Wang</a>
<a href="https://twitter.com/violasong" title="Follow me on Twitter" class="eps">Victoria Wang</a>
</div>
<div class="col col-33">
<a href="http://www.scottohara.me/" title="Visit Scott's Website">
@ -85,6 +85,5 @@
-->
</section>
</div> <!-- end .content -->

10
views/browse.erb
View file

@ -4,15 +4,15 @@
}
</script>
<h2 class="content">Websites on NeoCities</h2>
<div class="row content">
<h2 class="col">Websites on NeoCities</h2>
<div class="col col-50">
<form id="search_criteria" action="/browse" method="GET">
<fieldset class="grouping">
<label class="text-Label" for="sort_by">Sort By:</label>
<div class="select-Container">
<select name="sort_by" class="input-Select">
<select name="sort_by" id="sort_by" class="input-Select">
<option value="last_updated" <%= 'selected' if params[:sort_by] == 'last_updated' %>>Last Updated</option>
<option value="hits" <%= 'selected' if params[:sort_by] == 'hits' %>>Most Hits</option>
<option value="newest" <%= 'selected' if params[:sort_by] == 'newest' %>>Newest</option>
@ -44,7 +44,7 @@
<% @sites.each do |site| %>
<li>
<a href="http://<%= site.username %>.neocities.org" target="_blank">
<img src="http://neocities.org/site_screenshots/<%= site.username %>.jpg" class="neo-SS" />
<img src="http://neocities.org/site_screenshots/<%= site.username %>.jpg" class="neo-SS" alt="<%= site.username %>" />
</a>
</li>
<% end %>
@ -52,7 +52,7 @@
<% if params[:sort_by] != 'random' %>
<% if @page_count > 1 %>
<div style="font-size: 30pt">
<div >
<% if @current_page != 1 %>
<a href="#" onclick="getPage(<%= @current_page - 1 %>); return false"><i class="icon-arrow-left" style="text-decoration: none"></i></a>&nbsp;
<% end %>

23
views/dashboard.slim
View file

@ -22,33 +22,31 @@ javascript:
span
<i class="icon-file-alt icon-3x"></i>&nbsp;&nbsp; <span style="font-size: 20pt">#{file.filename}</span>
- if file.filename == 'index.html'
p.tiny This is your index file! It is the "default file" that loads when you go to
<a href="http://#{current_site.username}.neocities.org">#{current_site.username}.neocities.org</a>.
In effect, it's your front page. If you want to change your front page, you need to edit (or overwrite)
this file. The default file is always named <b>index.html</b>.
p.tiny
This is your index file! It is the "default file" that loads when you go to <a href="http://#{current_site.username}.neocities.org">#{current_site.username}.neocities.org</a>. In effect, it's your front page. If you want to change your front page, you need to edit (or overwrite) this file. The default file is always named <b>index.html</b>.
div style="margin-bottom: 30px"
div style="margin-bottom:30px"
span
i class="icon-globe" &nbsp;&nbsp;
a href="http://#{current_site.username}.neocities.org/#{file.filename}" target="_blank" View <br>
a href="http://#{current_site.username}.neocities.org/#{file.filename}" target="_blank" View <br />
span
i class="icon-edit" &nbsp;&nbsp;
a href="/site_files/text_editor/#{file.filename}" Edit with text editor <br>
a href="/site_files/text_editor/#{file.filename}" Edit with text editor <br />
span
i class="icon-edit" &nbsp;&nbsp;
span Edit with visual editor <small style="margin:0; display:inline">(coming soon)</small><br/>
span
i class="icon-edit" &nbsp;&nbsp;
span: a href="/site_files/download/#{file.filename}" Download <br>
span: a href="/site_files/download/#{file.filename}" Download <br />
span
i class="icon-trash" &nbsp;&nbsp;
a href="#" onclick="confirmFileDelete('#{file.filename}')" Delete
- else
<i class="icon-picture icon-3x"></i>&nbsp;&nbsp; <font style="font-size: 20pt">#{file.filename}</font>
<i class="icon-picture icon-3x"></i>&nbsp;&nbsp; <span style="font-size: 20pt">#{file.filename}</span>
div style="margin-top: 3px; margin-bottom:10px"
| To use in an HTML file, paste this text: <code class="tiny" style="margin:0">&lt;img src="/#{file.filename}"&gt;</code>
a href="http://#{current_site.username}.neocities.org/#{file.filename}" target="_blank" View <br>
a href="http://#{current_site.username}.neocities.org/#{file.filename}" target="_blank" View <br />
a href="#" onclick="confirmFileDelete('#{file.filename}')" Delete
.col.col-40
@ -56,7 +54,7 @@ javascript:
.row
.span5
a href="http://#{current_site.username}.neocities.org" target="_blank": img src="/site_screenshots/#{current_site.username}.jpg"
a href="http://#{current_site.username}.neocities.org" target="_blank": img src="/site_screenshots/#{current_site.username}.jpg" alt="screen shot"
h3 class="eps": a href="http://#{current_site.username}.neocities.org" target="_blank" http://#{current_site.username}.neocities.org
br
@ -64,7 +62,8 @@ javascript:
.progress.progress-info.progress-striped
.bar style="width: #{(current_site.total_space / Site::MAX_SPACE.to_f) * 100}%"
h4 class="base": You are currently using #{((current_site.total_space.to_f / Site::MAX_SPACE) * 100).round(1)}% (#{current_site.total_space_in_megabytes}MB) of your #{(Site::MAX_SPACE.to_f / 2**20).to_i}MB of free space.
h4.base
You are currently using #{((current_site.total_space.to_f / Site::MAX_SPACE) * 100).round(1)}% (#{current_site.total_space_in_megabytes}MB) of your #{(Site::MAX_SPACE.to_f / 2**20).to_i}MB of free space.
.row style="margin-top: 20px"
.span5

2
views/index.erb
View file

@ -299,7 +299,7 @@
<div class="col col-33">
<div class="f-Col f-Col-2 clearfix">
<span class="footer-icon"></span>
<h2 class="delta">About NeoCities</h2>
<h2 class="delta">About Us</h2>
<p class="tiny">
NeoCities is here to bring back the creativity and
free expression to the world wide web that made it great.

10
views/settings.slim
View file

@ -12,7 +12,7 @@
.row
.col.col-33
.content
h2.eps.txt-Center Change Password
h2.zeta Change Password
form method="POST" action="/change_password"
input name="csrf_token" type="hidden" value="#{csrf_token}"
@ -32,12 +32,12 @@
.col.col-33
.content
h2.eps.txt-Center Change Site (User) Name
h2.zeta Change Site (User) Name
form method="POST" action="/change_name"
input name="csrf_token" type="hidden" value="#{csrf_token}"
p It cannot contain spaces, and can only use the following characters: a-z A-Z 0-9 _ -
p.tiny It cannot contain spaces, and can only use the following characters: a-z A-Z 0-9 _ -
p Current name: <span style="color: green"><strong>#{current_site.username}</strong></span>
@ -48,8 +48,8 @@
.col.col-33
.content
h2.eps.txt-Center Mark Adult Content
p If your site contains objectionable (adult) content, check this box. Your site will not be removed, but it will be listed on a special browse page. We don't have an official policy on what defines "adult" content yet, we are still working on this. In the interim, best guesses. Thanks for your patience as we try to find a way to balance out the needs of everyone.
h2.zeta Mark Adult Content
p.tiny If your site contains objectionable (adult) content, check this box. Your site will not be removed, but it will be listed on a special browse page. We don't have an official policy on what defines "adult" content yet, we are still working on this. In the interim, best guesses. Thanks for your patience as we try to find a way to balance out the needs of everyone.
form method="POST" action="/change_nsfw"
input name="csrf_token" type="hidden" value="#{csrf_token}"

4
views/signin.slim
View file

@ -5,12 +5,12 @@
form method="POST" action="/signin" class="content"
input name="csrf_token" type="hidden" value="#{csrf_token}"
fieldset
fieldset.col-60 style="margin:0 auto"
input name="username" type="text" placeholder="Your username" class="input-Area" autocapitalize="off" autocorrect="off"
br
input name="password" type="password" class="input-Area" placeholder="Your password"
br
button class="btn-Action" href="#" Sign in
button class="btn-Action" Sign in
hr