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 21:23:15 -04:00
commit 096bfbfc3c
7 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,10 +2,11 @@
// Project Specific: Header Area // Project Specific: Header Area
// ---------------------------------------------------------------- // ----------------------------------------------------------------
// Apply to <header> for styling // Apply to header for styling
.header-Base{ .header-Base{
background:#65a0ad; background:#65a0ad;
border-bottom:6px solid #e93250; border-bottom:6px solid #e93250;
min-height:47px;
overflow:hidden; overflow:hidden;
} }

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

@ -934,6 +934,7 @@ a {
.header-Base { .header-Base {
background: #65a0ad; background: #65a0ad;
border-bottom: 6px solid #e93250; border-bottom: 6px solid #e93250;
min-height: 47px;
overflow: hidden; } overflow: hidden; }
@media (max-device-width: 480px), screen and (max-width: 800px) { @media (max-device-width: 480px), screen and (max-width: 800px) {

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

File diff suppressed because one or more lines are too long

6
public/assets/scripts/nav.js Normal file
View file

@ -0,0 +1,6 @@
$(document).ready(function() {
// this open and closes the small screen nav
$('.small-Nav').click(function(){
$('.header-Nav').toggleClass('show-Nav');
})
});

1
public/assets/scripts/nav.min.js vendored Normal file
View file

@ -0,0 +1 @@
$(document).ready(function(){$(".small-Nav").click(function(){$(".header-Nav").toggleClass("show-Nav")})});

4
views/dashboard.slim
View file

@ -67,9 +67,9 @@ javascript:
.row style="margin-top: 20px" .row style="margin-top: 20px"
.span5 .span5
div div
a href="/site_files/new" class="btn btn-large btn-success" style="margin-bottom:20px" Upload New File a href="/site_files/new" class="btn-Action" style="margin-bottom:20px" Upload New File
div div
a href="/site_files/new_page" class="btn btn-large btn-success" style="margin-bottom: 20px" Create New HTML Page a href="/site_files/new_page" class="btn-Action" style="margin-bottom: 20px" Create New HTML Page
h4: a href="/site_files/#{current_site.username}.zip" Download Entire Site h4: a href="/site_files/#{current_site.username}.zip" Download Entire Site

7
views/layout.slim
View file

@ -13,16 +13,13 @@ html
script src="/js/jquery.min.js" script src="/js/jquery.min.js"
link href="/assets/css/neo.min.css" rel="stylesheet" type="text/css" media="all" link href="/assets/css/neo.min.css" rel="stylesheet" type="text/css" media="all"
script src="/assets/scripts/app.min.js" script src="/assets/scripts/app.min.js"
css:
body {
background-color: #f6f0e6;
}
body body
a id="top" a id="top"
== erb :'_header', layout: false == erb :'_header', layout: false
.page
.container .container