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:30:55 -04:00
commit 2e1a83c770
4 changed files with 37 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -180,8 +180,11 @@
.status-Nav{ .status-Nav{
float:right; float:right;
li{float:left}
@media (max-device-width:480px), screen and (max-width:800px){ @media (max-device-width:480px), screen and (max-width:800px){
float:none float:none;
} }
} }

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

@ -1083,6 +1083,8 @@ a {
.status-Nav { .status-Nav {
float: right; } float: right; }
.status-Nav li {
float: left; }
@media (max-device-width: 480px), screen and (max-width: 800px) { @media (max-device-width: 480px), screen and (max-width: 800px) {
.status-Nav { .status-Nav {
float: none; } } float: none; } }

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

File diff suppressed because one or more lines are too long

44
views/layout.slim
View file

@ -20,34 +20,34 @@ html
== erb :'_header', layout: false == erb :'_header', layout: false
.page .page
.container .container
- flash.keys.each do |key| - flash.keys.each do |key|
div class="alert alert-#{key}" div class="alert alert-#{key}"
button.close type="button" data-dismiss="alert" × button.close type="button" data-dismiss="alert" ×
== flash[key] == flash[key]
container container
== yield == yield
script src="/js/bootstrap.min.js" script src="/js/bootstrap.min.js"
javascript: javascript:
!function(){ !function(){
var csrf_token = $('meta[name="csrf-token"]').attr('content'); var csrf_token = $('meta[name="csrf-token"]').attr('content');
$(document).ajaxSend(function(ev, jqxhr){ $(document).ajaxSend(function(ev, jqxhr){
jqxhr.setRequestHeader('X-CSRF-Token', csrf_token); jqxhr.setRequestHeader('X-CSRF-Token', csrf_token);
}); });
}(); }();
javascript: javascript:
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga'); })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-41925541-1', 'neocities.org'); ga('create', 'UA-41925541-1', 'neocities.org');
ga('send', 'pageview'); ga('send', 'pageview');