framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

latest changes from h5bp and blueprint css, jquery 1.6.1

Browse Source
This commit is contained in:
Ben Word
2011-05-17 22:48:13 -06:00
parent 66cb21dda9
commit 18f0ab26d4
7 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
css/blueprint/ie.css
View File

@@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
Blueprint CSS Framework 1.0 Blueprint CSS Framework 1.0.1
http://blueprintcss.org http://blueprintcss.org
* Copyright (c) 2007-Present. See LICENSE for more info. * Copyright (c) 2007-Present. See LICENSE for more info.

2
css/blueprint/print.css
View File

@@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
Blueprint CSS Framework 1.0 Blueprint CSS Framework 1.0.1
http://blueprintcss.org http://blueprintcss.org
* Copyright (c) 2007-Present. See LICENSE for more info. * Copyright (c) 2007-Present. See LICENSE for more info.

2
css/blueprint/screen.css
View File

@@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
Blueprint CSS Framework 1.0 Blueprint CSS Framework 1.0.1
http://blueprintcss.org http://blueprintcss.org
* Copyright (c) 2007-Present. See LICENSE for more info. * Copyright (c) 2007-Present. See LICENSE for more info.

10
header.php
View File

@@ -16,8 +16,8 @@
<script src="<?php echo get_template_directory_uri(); ?>/js/libs/modernizr-1.7.min.js"></script> <script src="<?php echo get_template_directory_uri(); ?>/js/libs/modernizr-1.7.min.js"></script>
<script src="<?php echo get_template_directory_uri(); ?>/js/libs/respond.min.js"></script> <script src="<?php echo get_template_directory_uri(); ?>/js/libs/respond.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.6/jquery.min.js"></script> <script src="//ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
<script>window.jQuery || document.write("<script src='<?php echo get_template_directory_uri(); ?>/js/libs/jquery-1.6.min.js'>\x3C/script>")</script> <script>window.jQuery || document.write('<script src="<?php echo get_template_directory_uri(); ?>/js/libs/jquery-1.6.1.min.js">\x3C/script>')</script>
<?php wp_head(); ?> <?php wp_head(); ?>
<?php if (get_option('roots_css_framework') === '1140') { ?> <?php if (get_option('roots_css_framework') === '1140') { ?>
@@ -26,10 +26,10 @@
<script src="<?php echo get_template_directory_uri(); ?>/js/scripts.js"></script> <script src="<?php echo get_template_directory_uri(); ?>/js/scripts.js"></script>
<?php if (get_option('roots_google_analytics') !== "") { ?> <?php if (get_option('roots_google_analytics') !== "") { ?>
<script> <script>
var _gaq=[["_setAccount","<?php echo get_option('roots_google_analytics') ?>"],["_trackPageview"],["_trackPageLoadTime"]]; var _gaq=[['_setAccount','<?php echo get_option('roots_google_analytics') ?>'],['_trackPageview'],['_trackPageLoadTime']];
(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1; (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
g.src=("https:"==location.protocol?"//ssl":"//www")+".google-analytics.com/ga.js"; g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
s.parentNode.insertBefore(g,s)}(document,"script")); s.parentNode.insertBefore(g,s)}(document,'script'));
</script> </script>
<?php } ?> <?php } ?>
</head> </head>

18
js/libs/jquery-1.6.1.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

16
js/libs/jquery-1.6.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
js/scripts.js
View File

@@ -1,10 +1,10 @@
$(document).ready(function() { $(document).ready(function() {
// $("#cycle").cycle({ // $('#cycle').cycle({
// fx: "fade" // fx: 'fade'
// }); // });
// $("figure.gallery-item a").attr("rel","gallery"); // $('figure.gallery-item a').attr('rel','gallery');
// $("figure.gallery-item a[rel='gallery']").fancybox(); // $('figure.gallery-item a[rel="gallery"]').fancybox();
}); });