mirror of
https://github.com/neocities/neocities.git
synced 2025-04-24 17:22:35 +02:00
fix merge
This commit is contained in:
Kyle Drake
commit
2b004fca1a
13 changed files with 283 additions and 19 deletions
1
Gemfile
1
Gemfile
|
|
@ -39,6 +39,7 @@ platform :jruby do
|
|||
|
||||
group :development do
|
||||
gem 'ruby-debug', require: nil
|
||||
gem 'sass', require: nil
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -125,6 +125,7 @@ GEM
|
|||
rmagick (2.13.2)
|
||||
rubyzip (1.1.2)
|
||||
safe_yaml (1.0.1)
|
||||
sass (3.3.5)
|
||||
selenium-webdriver (2.40.0)
|
||||
childprocess (>= 0.5.0)
|
||||
multi_json (~> 1.0)
|
||||
|
|
@ -218,6 +219,7 @@ DEPENDENCIES
|
|||
rmagick
|
||||
ruby-debug
|
||||
rubyzip
|
||||
sass
|
||||
selenium-webdriver
|
||||
sequel
|
||||
sequel_pg
|
||||
|
|
|
|||
2
app.rb
2
app.rb
|
|
@ -133,7 +133,7 @@ end
|
|||
|
||||
get '/dashboard' do
|
||||
require_login
|
||||
slim :'dashboard'
|
||||
erb :'dashboard'
|
||||
end
|
||||
|
||||
get '/signin' do
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@
|
|||
// Top nav area
|
||||
.header-Nav{
|
||||
background:#5e95a1;
|
||||
border-bottom:1px solid #a1cad4;
|
||||
border-bottom:1px solid #92B4BD;
|
||||
|
||||
@include vendor(transition, all 0.35s);
|
||||
|
||||
|
|
@ -279,7 +279,10 @@
|
|||
|
||||
// Interior CSS
|
||||
.interior .page{
|
||||
padding-top:46px
|
||||
padding-top: 22px;
|
||||
}
|
||||
.interior .signup-Form {
|
||||
top: 0;
|
||||
}
|
||||
.interior .header-Base{
|
||||
left:0;
|
||||
|
|
|
|||
|
|
@ -6,18 +6,16 @@
|
|||
.content-Base{
|
||||
background:#f6f0e6;
|
||||
min-height:500px;
|
||||
padding-bottom:30px;
|
||||
padding-top:20px;
|
||||
padding-bottom:50px;
|
||||
padding-top: 10px;
|
||||
|
||||
h1, h2, h3, h4, h5, h6{
|
||||
color:#e93250
|
||||
}
|
||||
|
||||
.content{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
.content, .footer-Content {
|
||||
padding: 20px 6%;
|
||||
}
|
||||
.single-Col{
|
||||
max-width:800px;
|
||||
}
|
||||
|
|
@ -26,4 +24,154 @@
|
|||
.twitter-tweet.twitter-tweet-rendered{margin:0 auto 30px!important}
|
||||
|
||||
// Dashboard
|
||||
.dash-SS{border:1px solid #ccc; background:rgba(255,255,255,.7); padding:1em; margin-bottom:20px}
|
||||
.interior .header-Outro .col.col-50.signup-Area {padding-left: 0;}
|
||||
.interior .header-Outro a {color:#E93250}
|
||||
.interior .signup-Area {
|
||||
min-height: 164px;
|
||||
}
|
||||
.interior .signup-Area img {
|
||||
-moz-box-shadow: 1px 2px 5px 2px rgba(0,0,0,0.10);
|
||||
-webkit-box-shadow: 1px 2px 5px 2px rgba(0,0,0,0.10);
|
||||
box-shadow: 1px 2px 5px 2px rgba(0,0,0,0.10);
|
||||
}
|
||||
.interior .header-Outro .screenshot {
|
||||
width:235px;height:141px;
|
||||
}
|
||||
.interior .header-Outro ul {
|
||||
margin:0;padding:0;
|
||||
}
|
||||
.interior .header-Outro ul li {
|
||||
list-style: none;
|
||||
font-size: 80%;
|
||||
margin-bottom: 7px;
|
||||
}
|
||||
.interior .signup-Form fieldset {
|
||||
padding: 20px;
|
||||
}
|
||||
.interior .header-Outro h2 {
|
||||
margin-top: 12px;
|
||||
}
|
||||
.welcome {
|
||||
background: #daeea5 url(../img/heartcat.png) no-repeat 20px 23px;
|
||||
background-size: 77px 81px;
|
||||
padding: 20px 20px 20px 108px;
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
.welcome h4 {
|
||||
font-size: 1.2em;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
.welcome .close {
|
||||
float: right;
|
||||
background: url(../img/welcome-close.png) no-repeat;
|
||||
width: 19px;
|
||||
height: 19px;
|
||||
}
|
||||
.files {
|
||||
float:left;
|
||||
background: #E4D8CB;
|
||||
width: 100%;
|
||||
}
|
||||
.files .header {
|
||||
background: #5E95A1;
|
||||
color: #fff;
|
||||
float:left;
|
||||
width: 100%;
|
||||
padding: 10px 20px;
|
||||
}
|
||||
.files .breadcrumbs {
|
||||
float: left;
|
||||
font-weight:bold;
|
||||
margin-top: 4px;
|
||||
}
|
||||
.files .actions {
|
||||
float: right;
|
||||
}
|
||||
.files .btn-Action {
|
||||
margin-left: 8px;
|
||||
}
|
||||
.btn-Action span {
|
||||
background-repeat: no-repeat;
|
||||
}
|
||||
.btn-Action.new-Page span {
|
||||
background-image: url(../img/new-page.png);
|
||||
background-position-y: 1px;
|
||||
padding-left: 30px;
|
||||
}
|
||||
.btn-Action.new-Folder span {
|
||||
background-image: url(../img/new-folder.png);
|
||||
padding-left: 26px;
|
||||
}
|
||||
.files .list {
|
||||
padding: 20px;
|
||||
}
|
||||
.files .list .upload-Boundary {
|
||||
float: left;
|
||||
border: 3px dashed #F6F0E6;
|
||||
width: 100%;
|
||||
margin: 20px 0;
|
||||
padding: 20px;
|
||||
-webkit-border-radius: 8px;
|
||||
-moz-border-radius: 8px;
|
||||
border-radius: 8px;
|
||||
background: url(../img/drag-drop.png) no-repeat center center;
|
||||
min-height: 300px;
|
||||
}
|
||||
.file {
|
||||
float: left;
|
||||
// width: 115px;
|
||||
padding: 5px;
|
||||
margin-right: 20px;
|
||||
margin-bottom: 30px;
|
||||
text-align: center;
|
||||
display:block;position:relative;
|
||||
}
|
||||
.file .title {
|
||||
font-weight: bold;
|
||||
font-size: 12px;
|
||||
color: #666;
|
||||
text-decoration: none;
|
||||
}
|
||||
.html-thumbnail {
|
||||
-webkit-box-shadow: 0px 1px 4px 0px rgba(0,0,0,0.3);
|
||||
-moz-box-shadow: 0px 1px 4px 0px rgba(0,0,0,0.3);
|
||||
box-shadow: 0px 1px 4px 0px rgba(0,0,0,0.3);
|
||||
font-size: 11px;
|
||||
margin-top: 5px;
|
||||
margin-left: 10px;
|
||||
display:block;position:relative;
|
||||
}
|
||||
.overlay a {
|
||||
color: white;
|
||||
text-decoration: none;
|
||||
}
|
||||
.overlay {
|
||||
position:absolute;
|
||||
top:0;
|
||||
width:0;
|
||||
width:100%;
|
||||
height:100%;
|
||||
background-color:rgba(0, 0, 0, 0.5);
|
||||
display:none;
|
||||
}
|
||||
.file > .overlay {
|
||||
-webkit-border-radius: 8px;
|
||||
-moz-border-radius: 8px;
|
||||
border-radius: 8px;
|
||||
padding-top: 15px;
|
||||
background-color:rgba(0, 0, 0, 0.15);
|
||||
}
|
||||
.overlay i {
|
||||
font-weight: bold;
|
||||
}
|
||||
.filehover:hover .overlay, .fileimagehover:hover .overlay {
|
||||
display:block;
|
||||
}
|
||||
.site-actions {
|
||||
float: left;
|
||||
margin-top: 20px;
|
||||
font-size: 90%;
|
||||
}
|
||||
.site-actions a {
|
||||
color: #666;
|
||||
}
|
||||
6
public/assets/css/neo.min.css
vendored
6
public/assets/css/neo.min.css
vendored
|
|
@ -5,13 +5,13 @@
|
|||
.header-Base{background:#65a0ad;border-bottom:6px solid #e93250;min-height:42px;overflow:hidden}@media (max-device-width: 480px), screen and (max-width: 800px){.header-Content{padding:0}}
|
||||
.blurb{background:#fff}.header-Intro{background:url(../img/neocity.jpg) 95% bottom no-repeat;min-height:214px}@media (max-device-width: 480px), screen and (max-width: 800px){.header-Intro{-moz-background-size:cover;-ms-background-size:cover;-o-background-size:cover;-webkit-background-size:cover;background-size:cover;min-height:2px}}
|
||||
.header-Outro{background:#30424b -moz-linear-gradient(top, #2b3c43 0%, #354751 100%);background:#30424b -webkit-gradient(linear, left top, left bottom, color-stop(0%, #2b3c43), color-stop(100%, #354751));background:#30424b -webkit-linear-gradient(top, #2b3c43 0%, #354751 100%);background:#30424b -o-linear-gradient(top, #2b3c43 0%, #354751 100%);background:#30424b -ms-linear-gradient(top, #2b3c43 0%, #354751 100%);background:#30424b linear-gradient(to bottom, #2b3c43 0%, #354751 100%);-moz-box-shadow:inset 0 7px 10px 0 rgba(0,0,0,0.1);-webkit-box-shadow:inset 0 7px 10px 0 rgba(0,0,0,0.1);box-shadow:inset 0 7px 10px 0 rgba(0,0,0,0.1);color:#fafafa}@media (max-device-width: 480px), screen and (max-width: 800px){.intro-List{margin-bottom:20px;padding:20px !important}}.intro-List li{padding-left:36px;padding-right:12px;margin-bottom:18px}.intro-List h2{margin-bottom:2px}.intro-List p{color:#B2BCC1}.intro-Icon{background:url(../img/icons.png) no-repeat;display:block;height:37px;left:-10px;position:absolute;top:2px;width:37px}.intro-Tools{position:relative}.intro-Question{position:relative}.intro-Question .intro-Icon{background-position:0 -40px}.signup-Area{min-height:100px;position:relative}.signup-Form{background:#354751;border-radius:4px 4px 0 0;-moz-box-shadow:1px 2px 12px 2px rgba(0,0,0,0.15);-webkit-box-shadow:1px 2px 12px 2px rgba(0,0,0,0.15);box-shadow:1px 2px 12px 2px rgba(0,0,0,0.15);height:600%;overflow:hidden;position:absolute;top:-45px;width:95%}@media (max-device-width: 480px), screen and (max-width: 800px){.signup-Form{height:auto;margin:0;overflow:visible;padding-bottom:20px;position:static;width:auto}}.signup-Form h2{margin-bottom:0;text-shadow:0 1px 1px rgba(0,0,0,0.5);font-size:1.8em}.signup-Form hr{border-bottom:1px solid #4a6677;border-top:1px solid #1d282d;margin:4px 0 22px}.signup-Form fieldset{background:url(../img/sign-up-bg.png) repeat-x center top;padding:20px 33px}.signup-Form label{color:#81b8c6}@media (max-device-width: 480px), screen and (max-width: 800px){.signup-Form label{font-size:70%}}.signup-Form .input-Area{background:#29383f;border:0 solid black;-moz-box-shadow:inset 1px 3px 10px 0px rgba(0,0,0,0.2);-webkit-box-shadow:inset 1px 3px 10px 0px rgba(0,0,0,0.2);box-shadow:inset 1px 3px 10px 0px rgba(0,0,0,0.2);color:#557380;margin-bottom:28px;margin-right:4px;padding:11px 12px 9px 12px;width:62%}.signup-Form .input-Area:focus{color:#eee}.signup-Form .btn-Action{padding:10px 25px}.small-Nav{background:#30424B;display:none;position:fixed;right:0;top:0;width:50px;z-index:9999}@media (max-device-width: 480px), screen and (max-width: 800px){.small-Nav{display:block}}
|
||||
.header-Nav{background:#5e95a1;border-bottom:1px solid #a1cad4;-moz-transition:all 0.35s;-ms-transition:all 0.35s;-o-transition:all 0.35s;-webkit-transition:all 0.35s;transition:all 0.35s}@media (max-device-width: 480px), screen and (max-width: 800px){.header-Nav{position:fixed;top:-900px !important}}.header-Nav.show-Nav{top:0 !important}.header-Nav a,.header-Nav a:visited{color:#fff;padding:8px 12px;text-decoration:none}@media (max-device-width: 480px), screen and (max-width: 800px){.header-Nav a,.header-Nav a:visited{display:block}}.header-Nav a:hover,.header-Nav a:visited:hover{background:#528995;text-decoration:underline}.header-Nav a.selected,.header-Nav a:active,.header-Nav a:visited.selected,.header-Nav a:visited:active{background:#528995;text-decoration:underline}.constant-Nav{float:left;position:relative}@media (max-device-width: 480px), screen and (max-width: 800px){.constant-Nav{float:none}.constant-Nav li{float:none}}
|
||||
.header-Nav{background:#5e95a1;border-bottom:1px solid #92B4BD;-moz-transition:all 0.35s;-ms-transition:all 0.35s;-o-transition:all 0.35s;-webkit-transition:all 0.35s;transition:all 0.35s}@media (max-device-width: 480px), screen and (max-width: 800px){.header-Nav{position:fixed;top:-900px !important}}.header-Nav.show-Nav{top:0 !important}.header-Nav a,.header-Nav a:visited{color:#fff;padding:8px 12px;text-decoration:none}@media (max-device-width: 480px), screen and (max-width: 800px){.header-Nav a,.header-Nav a:visited{display:block}}.header-Nav a:hover,.header-Nav a:visited:hover{background:#528995;text-decoration:underline}.header-Nav a.selected,.header-Nav a:active,.header-Nav a:visited.selected,.header-Nav a:visited:active{background:#528995;text-decoration:underline}.constant-Nav{float:left;position:relative}@media (max-device-width: 480px), screen and (max-width: 800px){.constant-Nav{float:none}.constant-Nav li{float:none}}
|
||||
.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 li{float:none}}
|
||||
.hp .header-Base{padding-top:46px}.hp .header-Nav{left:0;position:fixed;top:0;width:100%;z-index:3}.hp .hp-Logo{left:-90px;position:fixed;-moz-transition:all 0.35s;-ms-transition:all 0.35s;-o-transition:all 0.35s;-webkit-transition:all 0.35s;transition:all 0.35s}.hp .hp-Logo.in-View{left:0 !important;z-index:99}@media (max-device-width: 480px), screen and (max-width: 800px){.hp .hp-Logo.in-View{left:-90px !important}}
|
||||
.hp .logo{padding-top:45px}@media (max-device-width: 480px), screen and (max-width: 800px){.hp .logo{padding-left:20px;padding-right:20px}}
|
||||
.constant-Nav{margin-left:-88px;-moz-transition:all 0.35s;-ms-transition:all 0.35s;-o-transition:all 0.35s;-webkit-transition:all 0.35s;transition:all 0.35s}@media (max-device-width: 480px), screen and (max-width: 800px){.constant-Nav{margin-left:0}}.constant-Nav.in-View{margin-left:0;padding-left:70px}@media (max-device-width: 480px), screen and (max-width: 800px){.constant-Nav.in-View{padding-left:0}}
|
||||
.add-Stripe{border-bottom:6px solid #E93250}@media (max-device-width: 480px), screen and (max-width: 800px){.add-Stripe{border:0}}
|
||||
.interior .page{padding-top:46px}.interior .header-Base{left:0;overflow:visible;position:fixed;top:0;width:100%;z-index:9}.int-Logo{left:0;position:absolute;top:0;width:70px;z-index:9}.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;min-height:500px;padding-bottom:30px;padding-top:20px}.content-Base h1,.content-Base h2,.content-Base h3,.content-Base h4,.content-Base h5,.content-Base h6{color:#e93250}.single-Col{max-width:800px}.twitter-tweet.twitter-tweet-rendered{margin:0 auto 30px !important}.dash-SS{border:1px solid #ccc;background:rgba(255,255,255,0.7);padding:1em;margin-bottom:20px}.footer-Base{color:#5e5b56}.footer-Base h1,.footer-Base h2,.footer-Base h3,.footer-Base h4{color:#8b9a7a}.footer-Intro{background:#daeea5;border-top:1px solid #cedbab;-moz-box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);-webkit-box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);position:relative}.footer-Intro .footer-Content{padding-top:40px;padding-bottom:40px}.f-Col{-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;min-height:125px;padding-bottom:28px;position:relative}@media (max-device-width: 480px), screen and (max-width: 800px){.f-Col{min-height:2px;padding-left:15px !important;padding-right:100px !important}}.f-Col .action-Link{bottom:0;position:absolute;right:12px}@media (max-device-width: 480px), screen and (max-width: 800px){.f-Col .action-Link{position:static}}
|
||||
.interior .page{padding-top:22px}.interior .signup-Form{top:0}.interior .header-Base{left:0;overflow:visible;position:fixed;top:0;width:100%;z-index:9}.int-Logo{left:0;position:absolute;top:0;width:70px;z-index:9}.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;min-height:500px;padding-bottom:50px;padding-top:10px}.content-Base h1,.content-Base h2,.content-Base h3,.content-Base h4,.content-Base h5,.content-Base h6{color:#e93250}.content,.footer-Content,.footer-Content{padding:20px 6%}.single-Col{max-width:800px}.twitter-tweet.twitter-tweet-rendered{margin:0 auto 30px !important}.interior .header-Outro .col.col-50.signup-Area{padding-left:0}.interior .header-Outro a{color:#E93250}.interior .signup-Area{min-height:164px}.interior .signup-Area img{-moz-box-shadow:1px 2px 5px 2px rgba(0,0,0,0.1);-webkit-box-shadow:1px 2px 5px 2px rgba(0,0,0,0.1);box-shadow:1px 2px 5px 2px rgba(0,0,0,0.1)}.interior .header-Outro .screenshot{width:235px;height:141px}.interior .header-Outro ul{margin:0;padding:0}.interior .header-Outro ul li{list-style:none;font-size:80%;margin-bottom:7px}.interior .signup-Form fieldset{padding:20px}.interior .header-Outro h2{margin-top:12px}.welcome{background:#daeea5 url(../img/heartcat.png) no-repeat 20px 23px;background-size:77px 81px;padding:20px 20px 20px 108px;margin-bottom:30px}.welcome h4{font-size:1.2em;margin-bottom:4px}.welcome .close{float:right;background:url(../img/welcome-close.png) no-repeat;width:19px;height:19px}.files{float:left;background:#E4D8CB;width:100%}.files .header{background:#5E95A1;color:#fff;float:left;width:100%;padding:10px 20px}.files .breadcrumbs{float:left;font-weight:bold}.files .actions{float:right}.files .btn-Action{margin-left:8px}.btn-Action span{background-repeat:no-repeat}.btn-Action.new-Page span{background-image:url(../img/new-page.png);background-position-y:1px;padding-left:30px}.btn-Action.new-Folder span{background-image:url(../img/new-folder.png);padding-left:26px}.files .list{padding:20px}.files .list .upload-Boundary{float:left;border:3px dashed #F6F0E6;width:100%;margin:20px 0;padding:20px;-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;background:url(../img/drag-drop.png) no-repeat center center;min-height:200px}.file{float:left;width:105px;height:105px;margin-right:20px;margin-bottom:30px}.site-actions{float:left;margin-top:20px;font-size:90%}.site-actions a{color:#666}.footer-Base{color:#5e5b56}.footer-Base h1,.footer-Base h2,.footer-Base h3,.footer-Base h4{color:#8b9a7a}.footer-Intro{background:#daeea5;border-top:1px solid #cedbab;-moz-box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);-webkit-box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);position:relative}.footer-Intro .footer-Content{padding-top:40px;padding-bottom:40px}.f-Col{-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;min-height:125px;padding-bottom:28px;position:relative}@media (max-device-width: 480px), screen and (max-width: 800px){.f-Col{min-height:2px;padding-left:15px !important;padding-right:100px !important}}.f-Col .action-Link{bottom:0;position:absolute;right:12px}@media (max-device-width: 480px), screen and (max-width: 800px){.f-Col .action-Link{position:static}}
|
||||
.footer-icon{background-repeat:no-repeat;position:absolute;right:0;top:-70px}@media (max-device-width: 480px), screen and (max-width: 800px){.footer-icon{-moz-background-size:100%;-ms-background-size:100%;-o-background-size:100%;-webkit-background-size:100%;background-size:100%;height:90px !important;top:0;width:77px !important}}
|
||||
.f-Col-1{padding-right:12px}.f-Col-1 .footer-icon{background-image:url(../img/support-us.png);height:104px;right:5px;width:92px}.f-Col-2{padding-left:15px;padding-right:6px;position:relative}@media (max-device-width: 480px), screen and (max-width: 800px){.f-Col-2{border-bottom:1px solid rgba(0,0,0,0.1);border-top:1px solid rgba(0,0,0,0.1);margin:20px 0;overflow:hidden;padding:20px 0}.f-Col-2 .footer-icon{top:14px}}.f-Col-2:before,.f-Col-2:after{background:url("../img/border.png") no-repeat 0 -20px;content:"";height:200px;opacity:0.2;position:absolute;top:0;width:1px}@media (max-device-width: 480px), screen and (max-width: 800px){.f-Col-2:before,.f-Col-2:after{display:none}}.f-Col-2:before{left:-14px}.f-Col-2:after{right:-14px}.f-Col-2 .footer-icon{background-image:url(../img/about-neocities.png);width:100px;height:106px}.f-Col-3{padding-left:20px}@media (max-device-width: 480px), screen and (max-width: 800px){.f-Col-3{padding-left:0}}.f-Col-3 .footer-icon{background-image:url(../img/latest-news.png);height:103px;width:134px}.footer-Outro{background:#ccdf9b;border-top:1px solid #b3c388;overflow:hidden}.footer-Outro a{color:#5e5b56}.credits{margin-bottom:0}.footer-Nav{text-transform:uppercase}.footer-Nav .h-Nav,.footer-Nav .bread{float:right}@media (max-device-width: 480px), screen and (max-width: 800px){.footer-Nav .h-Nav,.footer-Nav .bread{float:none;margin-top:15px}.footer-Nav .h-Nav li:first-child a,.footer-Nav .bread li:first-child a{padding-left:0}}.footer-Nav .h-Nav a,.footer-Nav .bread a{padding:0 8px}.footer-Nav .h-Nav li:last-child a,.footer-Nav .bread li:last-child a{padding-right:0}.alert{background-color:#F39C12;color:#fff}.website-Gallery{list-style:none;padding:10px 0}.website-Gallery li{float:left;margin-bottom:8px}@media (max-device-width: 480px), screen and (max-width: 800px){.website-Gallery li{width:50%}}.website-Gallery a{padding:0 8px;display:block}.website-Gallery.int-Gall li{border:1px solid #ccc;margin:0 .5% 12px;width:24%}@media (max-device-width: 480px), screen and (max-width: 800px){.website-Gallery.int-Gall li{width:49%}}.website-Gallery.int-Gall li a{padding:8px}.neo-SS,.neo-Screen-Shot{background:#fff;-moz-box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);-webkit-box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);box-shadow:0 8px 8px -8px rgba(0,0,0,0.2);display:block;height:auto !important;padding:8px;position:relative;width:100%}.img-Holder{-moz-background-size:cover !important;-webkit-background-size:cover !important;background-size:cover !important;display:block}.hp-Gallery img,.neo-Screen-Shot img{width:100%}
|
||||
|
|
|
|||
BIN
public/assets/img/drag-drop.png
Normal file
BIN
public/assets/img/drag-drop.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.7 KiB |
BIN
public/assets/img/heartcat.png
Normal file
BIN
public/assets/img/heartcat.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 19 KiB |
BIN
public/assets/img/new-folder.png
Normal file
BIN
public/assets/img/new-folder.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 492 B |
BIN
public/assets/img/new-page.png
Normal file
BIN
public/assets/img/new-page.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 343 B |
BIN
public/assets/img/welcome-close.png
Normal file
BIN
public/assets/img/welcome-close.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
109
views/dashboard.erb
Normal file
109
views/dashboard.erb
Normal file
|
|
@ -0,0 +1,109 @@
|
|||
<script type="text/javascript">
|
||||
function confirmFileDelete(name) {
|
||||
$('#deleteFileName').html(name);
|
||||
$('#deleteConfirmModal').modal();
|
||||
}
|
||||
|
||||
function fileDelete() {
|
||||
$('#deleteFilenameInput').val($('#deleteFileName').html());
|
||||
$('#deleteFilenameForm').submit();
|
||||
}
|
||||
</script>
|
||||
|
||||
<div class="header-Outro" style="overflow: hidden;">
|
||||
<div class="row header-Content content" style="padding-top: 40px;">
|
||||
|
||||
<div class="col col-50 signup-Area" style="width: 289px;">
|
||||
<div class="signup-Form" style="top: 0; text-align: center">
|
||||
<fieldset class="content">
|
||||
<img class="screenshot" src="/site_screenshots/<%= current_site.username %>.jpg">
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col col-40" style="margin-left: 10px">
|
||||
<h2 class="eps">My Website</h2>
|
||||
<p style="font-size:19px; margin-top: -5px; margin-bottom: 8px;"><a href="http://<%= current_site.username %>.neocities.org" target="_blank">http://<%= current_site.username %>.neocities.org</a></p>
|
||||
<ul>
|
||||
<% if current_site.updated_at %>
|
||||
<li>Last updated <%= current_site.updated_at %></li>
|
||||
<% end %>
|
||||
<li>Using <strong><%= ((current_site.total_space.to_f / Site::MAX_SPACE) * 100).round(1) %>% of your <%= (Site::MAX_SPACE.to_f / 2**20).to_i %> MB</strong> of free space</li>
|
||||
<li><strong><%= current_site.hits.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %></strong> visitors</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
</div> <!-- end .row -->
|
||||
</div> <!-- end .header-Outro -->
|
||||
|
||||
<main class="content-Base">
|
||||
|
||||
<div class="content">
|
||||
|
||||
<div class="welcome">
|
||||
<a href=""><div class="close"></div></a>
|
||||
<h4>Hello! Welcome to your new site.</h4>
|
||||
To get started, click on the <strong>index.html</strong> file below to edit it. It's your home page! You can add more files (such as images) from your computer by dragging them into the box below. Need help building web sites? Check out these <a href="/tutorials">tutorials</a>!
|
||||
</div>
|
||||
|
||||
<div class="files">
|
||||
<div class="header">
|
||||
<div class="breadcrumbs">Home</div>
|
||||
<div class="actions">
|
||||
<a href="/site_files/new_page" class="btn-Action new-Page"><span>New Page</span></a>
|
||||
<a href="" class="btn-Action new-Folder"><span>New Folder</span></a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="list">
|
||||
<div class="upload-Boundary">
|
||||
|
||||
<% current_site.file_list.each do |file| %>
|
||||
<div class="file">
|
||||
<% if file.ext.match(/html|htm/) %>
|
||||
<a href="http://<%= current_site.username %>.neocities.org/<%= file.filename %>" title="View <%= file.filename %>" target="_blank"><div style="background:#fff;width:105px;height:63px;"></div></a>
|
||||
<% elsif file.ext.match(/jpg|png|bmp|gif/) %>
|
||||
|
||||
<% end %>
|
||||
|
||||
<a href="http://<%= current_site.username %>.neocities.org/<%= file.filename %>" title="View <%= file.filename %>" target="_blank">
|
||||
<%= file.filename %></a>
|
||||
|
||||
<% if file.ext.match(/txt|js|css|md/) %>
|
||||
<a href="/site_files/text_editor/<%= file.filename %>"><i class="icon-edit" style="margin-right: 10px" title="Edit"></i></a>
|
||||
<% end %>
|
||||
|
||||
<a href="/site_files/download/<%= file.filename %>"><i class="icon-download" style="margin-right: 10px" title="Download"></i></a>
|
||||
<% if file.filename != 'index.html' %>
|
||||
<a href="#" onclick="confirmFileDelete('<%= file.filename %>')"><i class="icon-trash" style="margin-right: 10px" title="Delete"></i></a>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<form method="POST" action="/site_files/delete" id="deleteFilenameForm">
|
||||
<input name="csrf_token" type="hidden" value="<%= csrf_token %>">
|
||||
<input type="hidden" id="deleteFilenameInput" name="filename">
|
||||
</form>
|
||||
|
||||
<div class="modal.hide.fade" id="deleteConfirmModal" tabindex="-1" role="dialog" aria-labelledby="deleteConfirmModalLabel" aria-hidden="true">
|
||||
<div class="modal-header">
|
||||
<button class="close" type="button" data-dismiss="modal" aria-hidden="true">x</button>
|
||||
<h3 id="deleteConfirmModalLabel">Confirm deletion</h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<p>You are about to delete the file <span id="deleteFileName"></span>. Are you sure?</p?>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
|
||||
<button class=".btn.btn-danger" onclick="fileDelete()">Delete</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="site-actions">
|
||||
<a href="/site_files/<%= current_site.username %>.zip">Allowed file types</a> | <a href="/site_files/<%= current_site.username %>.zip">Download entire site</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</main>
|
||||
|
|
@ -39,14 +39,15 @@
|
|||
|
||||
<body class="interior">
|
||||
<div class="page">
|
||||
<%== erb :'_header', layout: false %>
|
||||
<main class="content-Base"><%== yield %></main>
|
||||
<footer class="footer-Base"><%== erb :'_footer', layout: false %></footer>
|
||||
<%= erb :'_header', layout: false %>
|
||||
<%= yield %>
|
||||
</div>
|
||||
|
||||
<footer class="footer-Base">
|
||||
<%= erb :'_footer', layout: false %>
|
||||
</footer>
|
||||
|
||||
<script src="assets/scripts/jquery-1.10.1.min.js"></script>
|
||||
<script src="assets/scripts/nav.min.js"></script>
|
||||
<script src="/js/bootstrap.min.js"></script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue