Skip to content

Commit

Permalink
new jquery and some other minor updates to keep in line with h5bp pro…
Browse files Browse the repository at this point in the history
…ject
  • Loading branch information
walker committed Jan 18, 2013
1 parent 10848b3 commit 09e27a2
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion functions.php
Expand Up @@ -51,7 +51,7 @@ function h5bp_init(){
if(!is_admin()) {
wp_deregister_script('jquery');
wp_enqueue_script('modernizr', versioned_resource('js/vendor/modernizr-2.6.2.min.js'));
wp_register_script('jquery', '//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js');
wp_register_script('jquery', '//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js');
wp_enqueue_script('jquery');
wp_enqueue_style('style', versioned_resource('style.css'));
}
Expand Down
2 changes: 1 addition & 1 deletion includes/head_bottom.php
Expand Up @@ -9,7 +9,7 @@
<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
<?php wp_head(); ?>
<script>typeof Modernizr == 'object' || document.write("<script src='<?php bloginfo('template_url'); ?>/js/vendor/modernizr-2.6.2.min.js'>\x3C/script>")</script>
<script>window.jQuery || document.write("<script src='<?php bloginfo('template_url'); ?>/js/vendor/jquery-1.8.3.min.js'>\x3C/script>")</script>
<script>window.jQuery || document.write("<script src='<?php bloginfo('template_url'); ?>/js/vendor/jquery-1.9.0.min.js'>\x3C/script>")</script>
</head>
<body <?php body_class(); ?>>
<!--[if lt IE 7]>
Expand Down
2 changes: 0 additions & 2 deletions js/vendor/jquery-1.8.3.min.js

This file was deleted.

4 changes: 4 additions & 0 deletions js/vendor/jquery-1.9.0.min.js

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions style.css
Expand Up @@ -649,7 +649,7 @@ textarea {
content: "";
display: block;
width: 0;
height: 100%;
height: 150%;
}

/*
Expand Down Expand Up @@ -740,9 +740,11 @@ textarea {
/* Style adjustments for viewports that meet the condition */
}

@media only screen and (-webkit-min-device-pixel-ratio: 1.5),
only screen and (min-resolution: 144dpi) {
/* Style adjustments for high resolution devices */
@media print,
(-o-min-device-pixel-ratio: 5/4),
(-webkit-min-device-pixel-ratio: 1.25),
(min-resolution: 120dpi) {
/* Style adjustments for high resolution devices */
}

/* ==========================================================================
Expand Down

0 comments on commit 09e27a2

Please sign in to comment.