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

Browse source
This commit is contained in:
Kyle Drake 2014-11-20 04:45:27 -08:00
commit a0421dd34e
6 changed files with 138 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -219,21 +219,6 @@
} }
} }
.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){
display:block
}
}
// Top nav area // Top nav area
.header-Nav{ .header-Nav{
background:#5e95a1; background:#5e95a1;
@ -248,6 +233,7 @@
&.show-Nav{ &.show-Nav{
top:0!important; top:0!important;
padding-bottom: 2px;
} }
a, a:visited{ a, a:visited{
@ -288,6 +274,21 @@
&.selected, &:active{background:#528995; text-decoration:underline} &.selected, &:active{background:#528995; text-decoration:underline}
} }
a.small-Nav{
display:none;
position:fixed;
right:0;
top:0;
width:50px;
height:36px;
z-index:9999;
padding: 5px 12px 0px 12px;
@media (max-device-width:480px), screen and (max-width:800px){
display:block;
}
}
.notification-value { .notification-value {
background: $c-Brand-1; background: $c-Brand-1;
padding: 2px 5px; padding: 2px 5px;

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

@ -35,6 +35,18 @@
font-size: 2.5em; font-size: 2.5em;
margin-top: 15px; margin-top: 15px;
} }
.news-site-info {
@media (max-device-width:480px), screen and (max-width:800px) {
float: right;
width: 35%;
.col-50 {
width:100%;
margin-bottom: 1em!important;
}
}
}
.site-url { .site-url {
font-size:18px; font-size:18px;
margin-bottom: 8px; margin-bottom: 8px;
@ -88,7 +100,13 @@
} }
// Dashboard // Dashboard
.interior .header-Outro .col.col-50.signup-Area {padding-left: 0;} .interior .header-Outro .col.col-50.signup-Area {
padding-left: 0;
}
.interior .header-Outro.dashboard .col.col-50.signup-Area {
width: 293px!important;
float: left;
}
.interior .header-Outro a {color:#E93250} .interior .header-Outro a {color:#E93250}
.interior .header-Outro .btn-Action {color:#fff} .interior .header-Outro .btn-Action {color:#fff}
.interior .signup-Area { .interior .signup-Area {
@ -140,6 +158,19 @@
margin-top: 12px; margin-top: 12px;
font-size: 1.8em; font-size: 1.8em;
} }
.interior .header-Outro.dashboard h2 {
@media (max-device-width: 480px), screen and (max-width: 800px) {
margin-top: 0;
}
}
.interior .header-Outro.dashboard .col-50:nth-of-type(2) {
float: left;
@media (max-device-width: 480px), screen and (max-width: 800px) {
width: 42%!important;
margin-left: 22px;
}
}
.welcome { .welcome {
background: #daeea5 url(/img/heartcat.png) no-repeat 20px center; background: #daeea5 url(/img/heartcat.png) no-repeat 20px center;
background-size: 77px 81px; background-size: 77px 81px;
@ -449,6 +480,10 @@
} }
.news-feed .content.misc-page.columns .col-66 { .news-feed .content.misc-page.columns .col-66 {
min-height: 56em; min-height: 56em;
@media (max-device-width:480px), screen and (max-width:800px) {
min-height: 0;
}
} }
.content.misc-page.columns .col-33 { .content.misc-page.columns .col-33 {
width: 33%; width: 33%;
@ -475,10 +510,27 @@
} }
.interior .header-Outro.with-columns .col-32 { .interior .header-Outro.with-columns .col-32 {
width: 33%; width: 33%;
h3 {
@media (max-device-width:480px), screen and (max-width:800px) {
display: none;
}
}
@media (max-device-width:480px), screen and (max-width:800px) {
width: 10em!important;
float: right;
padding: 0 0 18px 0;
margin-top: -28px;
}
} }
.interior .header-Outro.with-columns .col-66 { .interior .header-Outro.with-columns .col-66 {
width: 67%; width: 67%;
border-right: 1px solid #0B0F11; border-right: 1px solid #0B0F11;
@media (max-device-width:480px), screen and (max-width:800px) {
border-right: 0;
padding: 15px 0 27px 30px;
}
} }
.interior .header-Outro.with-columns .col-32 .edit { .interior .header-Outro.with-columns .col-32 .edit {
margin-top: 4px; margin-top: 4px;
@ -520,6 +572,10 @@
background-size: cover; background-size: cover;
float: left; float: left;
margin-bottom: 20px; margin-bottom: 20px;
@media (max-device-width:480px), screen and (max-width:800px) {
width: 60%;
}
} }
.site-portrait { .site-portrait {
border: 5px solid white; border: 5px solid white;
@ -538,6 +594,15 @@
margin-top: .2em; margin-top: .2em;
margin-bottom: -.2em; margin-bottom: -.2em;
} }
.news-profile-button {
clear: both;
margin: 20px auto 2em auto;
text-align: center;
@media (max-device-width:480px), screen and (max-width:800px) {
text-align: left;
}
}
a.tag, a.tag:visited { a.tag, a.tag:visited {
font-size: .7em; font-size: .7em;
text-transform: uppercase; text-transform: uppercase;
@ -745,17 +810,34 @@ a.tag:hover {
.report, .report a { .report, .report a {
color: #999; color: #999;
} }
.interior .header-Outro .actions a { .interior .header-Outro .profile-info {
margin-right: 6px; @media (max-device-width:480px), screen and (max-width:800px) {
text-align: center;
padding: 10px 0 15px 0;
}
} }
.interior .header-Outro .actions a:first-of-type { .interior .header-Outro .actions {
margin-left: 0; clear: both;
a {
margin-right: 6px;
}
a:first-of-type {
margin-left: 0;
}
} }
.interior .header-Outro .stats { .interior .header-Outro .stats {
margin-bottom: 1.3em; margin-bottom: 1.3em;
float: left; float: left;
width: 100%; width: 100%;
margin-top: 1.9em; margin-top: 1.9em;
@media (max-device-width:480px), screen and (max-width:800px) {
float: none;
width: 270px;
margin: 0.9em auto 5.5em auto;
text-align: center;
}
} }
.interior .header-Outro .stats strong { .interior .header-Outro .stats strong {
font-size: 1.5em; font-size: 1.5em;
@ -773,6 +855,11 @@ a.tag:hover {
text-align: center; text-align: center;
margin-right: 28px; margin-right: 28px;
color: #84997E; color: #84997E;
@media (max-device-width:480px), screen and (max-width:800px) {
margin: 0;
width: 90px;
}
} }
.interior .header-Outro .stats .stat.tips { .interior .header-Outro .stats .stat.tips {
width: 60px; width: 60px;
@ -1393,6 +1480,10 @@ a.tag:hover {
background: #25333c; background: #25333c;
color: #8099A7; color: #8099A7;
} }
@media (max-device-width:480px), screen and (max-width:800px) {
display: none;
}
} }
#saveButton { #saveButton {
margin-top: 0; margin-top: 0;
@ -1406,6 +1497,11 @@ a.tag:hover {
} }
} }
} }
#editorUpdates .tooltip-inner {
padding: 14px 20px;
width: 200px;
white-space: normal;
}
} }
.row.editor { .row.editor {
float: left; float: left;

4
views/dashboard.erb
View file

@ -16,10 +16,10 @@
} }
</style> </style>
<div class="header-Outro with-site-image"> <div class="header-Outro with-site-image dashboard">
<div class="row content wide"> <div class="row content wide">
<div class="col col-50 signup-Area" style="width: 293px;"> <div class="col col-50 signup-Area">
<div class="signup-Form"> <div class="signup-Form">
<fieldset class="content"> <fieldset class="content">
<a href="/surf/<%= current_site.username %>" class="screenshot dashboard" style="background-image:url(<%= current_site.screenshot_url('index.html', '540x405') %>);"></a> <a href="/surf/<%= current_site.username %>" class="screenshot dashboard" style="background-image:url(<%= current_site.screenshot_url('index.html', '540x405') %>);"></a>

32
views/home.erb
View file

@ -13,7 +13,7 @@
</div> </div>
</div> </div>
<div class="col col-32"> <div class="col col-32">
<h3>Your Website</h3> <h3>Your Site</h3>
<a href="/dashboard" class="btn-Action edit"><i class="fa fa-edit" title="Edit"></i>Edit Site</a> <a href="/dashboard" class="btn-Action edit"><i class="fa fa-edit" title="Edit"></i>Edit Site</a>
</div> </div>
</div> </div>
@ -87,25 +87,27 @@
</div> </div>
<div class="col col-33"> <div class="col col-33">
<p class="site-url"><a href="//<%= current_site.host %>" target="_blank"><%= site.title %></a></p> <div class="news-site-info">
<div class="stats"> <p class="site-url"><a href="//<%= current_site.host %>" target="_blank"><%= site.title %></a></p>
<div class="col col-50"> <div class="stats">
<% if site.updated_at %> <div class="col col-50">
Last updated<br><strong><%= site.updated_at.ago %></strong> <% if site.updated_at %>
<% else %> Last updated<br><strong><%= site.updated_at.ago %></strong>
Your new website!<br><strong><a href="/dashboard"><i class="fa fa-edit" title="Edit"></i> Start Building</a></strong> <% else %>
<% end %> Your new website!<br><strong><a href="/dashboard"><i class="fa fa-edit" title="Edit"></i> Start Building</a></strong>
</div> <% end %>
<div class="col col-50"> </div>
<div><strong><%= site.views.format_large_number %></strong> unique views</div> <div class="col col-50">
<div><strong><%= site.hits.format_large_number %></strong> hits</div> <div><strong><%= site.views.format_large_number %></strong> views</div>
<div><strong><%= site.follows_dataset.count.format_large_number %></strong> followers</div> <div><strong><%= site.hits.format_large_number %></strong> hits</div>
<div><strong><%= site.follows_dataset.count.format_large_number %></strong> followers</div>
</div>
</div> </div>
</div> </div>
<a href="//<%= site.host %>" class="large-portrait" style="background-image:url(<%= site.screenshot_url('index.html', '540x405') %>);"></a> <a href="//<%= site.host %>" class="large-portrait" style="background-image:url(<%= site.screenshot_url('index.html', '540x405') %>);"></a>
<div style="margin-top: 20px; margin-bottom: 2em" class="txt-Center"> <div class="news-profile-button">
<a href="/site/<%= site.username %>" class="btn-Action">View Site Profile</a> <a href="/site/<%= site.username %>" class="btn-Action">View Site Profile</a>
</div> </div>

2
views/site.erb
View file

@ -18,7 +18,7 @@
</fieldset> </fieldset>
</div> </div>
</div> </div>
<div class="col col-50"> <div class="col col-50 profile-info">
<h2 class="eps title-with-badge"><span><%= site.title %></span> <% if site.supporter? %><a href="/plan" class="supporter-badge" title="Neocities Supporter"></a> <% end %></h2> <h2 class="eps title-with-badge"><span><%= site.title %></span> <% if site.supporter? %><a href="/plan" class="supporter-badge" title="Neocities Supporter"></a> <% end %></h2>
<p class="site-url"><a href="/surf/<%= site.username %>"><%= site.host %></a></p> <p class="site-url"><a href="/surf/<%= site.username %>"><%= site.host %></a></p>
<div class="stats"> <div class="stats">

2
views/site_files/text_editor.erb
View file

@ -127,7 +127,7 @@
if(quit === true) { if(quit === true) {
window.location = '/dashboard' window.location = '/dashboard'
} else { } else {
$('#editorUpdates span').html('<i class="fa fa-floppy-o"></i>&nbsp;&nbsp;Your file has been saved.') $('#editorUpdates span').html('<i class="fa fa-check"></i>&nbsp;&nbsp;Your file has been saved.')
$('a#saveButton,a#saveAndExitButton').css('opacity', 0.5) $('a#saveButton,a#saveAndExitButton').css('opacity', 0.5)
setTimeout(function() { setTimeout(function() {
$('#editorUpdates').fadeOut(); //.addClass('hidden'); $('#editorUpdates').fadeOut(); //.addClass('hidden');