zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 01:32:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'newdesign' of github.com:kyledrake/neocities-web into newdesign

Browse source
This commit is contained in:
Kyle Drake 2013-07-13 22:09:02 -04:00
commit b2aacfe34d
8 changed files with 248 additions and 227 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@
.header-Base{
background:#65a0ad;
border-bottom:6px solid #e93250;
min-height:47px;
min-height:42px;
overflow:hidden;
}
@ -181,11 +181,16 @@
.status-Nav{
float:right;
li{float:left}
@media (max-device-width:480px), screen and (max-width:800px){
float:none;
}
li{
float:left;
@media (max-device-width:480px), screen and (max-width:800px){
float:none
}
}
}
// hp CSS
@ -261,5 +266,10 @@
}
.interior .header-Nav{
padding-left:70px
padding-left:70px;
@media (max-device-width:480px), screen and (max-width:800px){
width:100%;
}
}
.interior .constant-Nav{margin:0}

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

@ -934,7 +934,7 @@ a {
.header-Base {
background: #65a0ad;
border-bottom: 6px solid #e93250;
min-height: 47px;
min-height: 42px;
overflow: hidden; }
@media (max-device-width: 480px), screen and (max-width: 800px) {
@ -1083,10 +1083,13 @@ a {
.status-Nav {
float: right; }
@media (max-device-width: 480px), screen and (max-width: 800px) {
.status-Nav {
float: none; } }
.status-Nav li {
float: left; }
@media (max-device-width: 480px), screen and (max-width: 800px) {
.status-Nav {
.status-Nav li {
float: none; } }
.hp .header-Base {
@ -1156,6 +1159,12 @@ a {
.interior .header-Nav {
padding-left: 70px; }
@media (max-device-width: 480px), screen and (max-width: 800px) {
.interior .header-Nav {
width: 100%; } }
.interior .constant-Nav {
margin: 0; }
.content-Base {
background: #f6f0e6;

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

File diff suppressed because one or more lines are too long

13
views/dashboard.slim
View file

@ -9,10 +9,11 @@ javascript:
$('#deleteFilenameForm').submit();
}
.row
.span5.offset1
.content-Base
.row.content
.col.col-60
h1 Your home page
h1 Your Website
- current_site.file_list.each do |file|
.row
@ -49,20 +50,20 @@ javascript:
a href="http://#{current_site.username}.neocities.org/#{file.filename}" target="_blank" View <br>
a href="#" onclick="confirmFileDelete('#{file.filename}')" Delete
.span5
.col.col-40
.row
.span5
a href="http://#{current_site.username}.neocities.org" target="_blank": img src="/site_screenshots/#{current_site.username}.jpg"
h3 style="color: green": a href="http://#{current_site.username}.neocities.org" target="_blank" http://#{current_site.username}.neocities.org
h3 class="eps": a href="http://#{current_site.username}.neocities.org" target="_blank" http://#{current_site.username}.neocities.org
br
.progress.progress-info.progress-striped
.bar style="width: #{(current_site.total_space / Site::MAX_SPACE.to_f) * 100}%"
h4 You are currently using #{((current_site.total_space.to_f / Site::MAX_SPACE) * 100).round(1)}% (#{(current_site.total_space.to_f / 2**20).round(2)}MB) of your #{(Site::MAX_SPACE.to_f / 2**20).to_i}MB of free space.
h4 class="base": You are currently using #{((current_site.total_space.to_f / Site::MAX_SPACE) * 100).round(1)}% (#{(current_site.total_space.to_f / 2**20).round(2)}MB) of your #{(Site::MAX_SPACE.to_f / 2**20).to_i}MB of free space.
.row style="margin-top: 20px"
.span5

2
views/layout.slim
View file

@ -14,7 +14,7 @@ html
link href="/assets/css/neo.min.css" rel="stylesheet" type="text/css" media="all"
script src="/assets/scripts/nav.min.js"
body
body.interior
a id="top"
== erb :'_header', layout: false

5
views/new.slim
View file

@ -11,7 +11,8 @@ javascript:
- @site.errors.each do |error|
p = error.last.first
.row
.page
.row.content
.span8.offset3
form method="POST" action="/create"
input name="csrf_token" type="hidden" value="#{csrf_token}"
@ -76,4 +77,4 @@ javascript:
.row style="margin-top: 10px"
.span3.offset1
input.btn.btn-success.btn-large type="submit" value="Create Home Page"
input.btn-Action type="submit" value="Create Home Page"

9
views/settings.slim
View file

@ -1,4 +1,5 @@
.row
.page
.row.content
.span12.text-center
h1 Site Settings
@ -29,7 +30,7 @@
p Confirm New Password:
input name="new_password_confirm" type="password"
input.btn.btn-success type="submit" value="Change Password"
input.btn-Action type="submit" value="Change Password"
.span4
h2 Change Site (User) Name
@ -44,7 +45,7 @@
p New name:
input name="name" type="text" placeholder="newname"
div
input.btn.btn-success type="submit" value="Change Name"
input.btn-Action type="submit" value="Change Name"
.span4
h2 Mark Adult Content
@ -55,4 +56,4 @@
input name="is_nsfw" type="hidden" value="false"
p: strong My page contains objectionable (adult) content:&nbsp;&nbsp;&nbsp;<input name="is_nsfw" type="checkbox" value="true" style="margin-top: 0px" #{"checked" if current_site.is_nsfw}>
input.btn.btn-success type="submit" value="Update"
input.btn-Action type="submit" value="Update"

15
views/signin.slim
View file

@ -1,16 +1,15 @@
.text-center
.row
.span12
.page
.content.single-Col
h1 Welcome back!
.row
.span12
form method="POST" action="/signin"
input name="csrf_token" type="hidden" value="#{csrf_token}"
fieldset
div: input name="username" type="text" placeholder="Your username" autocapitalize="off" autocorrect="off"
div: input name="password" type="password" placeholder="Your password"
div: button class="btn btn-large btn-success" href="#" style="margin-top: 10px" Sign in
div: input name="username" type="text" placeholder="Your username" class="input-Area" autocapitalize="off" autocorrect="off"
div: input name="password" type="password" class="input-Area" placeholder="Your password"
div: button class="btn-Action" href="#" Sign in
.row
.span12
div