Permalink
Browse files

Merge branch 'release/0.3a1'

  • Loading branch information...
2 parents 57793b8 + f70eb8d commit cc107fdd51b6f7ee6374b4bf2638eee87b4edbc1 @sams committed Mar 20, 2011
Showing with 11 additions and 9 deletions.
  1. +3 −3 functions.php
  2. +1 −1 functions/admin-panel-options.php
  3. +3 −4 library/css/screen.css
  4. +3 −0 library/js/libs/modernizr-2-yepnope.js
  5. +1 −1 style.css
View
@@ -288,7 +288,7 @@ function home_content( $query ) {
add_filter( 'archive_meta', 'convert_chars' );
add_filter( 'archive_meta', 'wpautop' );
-// Remove the WordPress Generator – via http://blog.ftwr.co.uk/archives/2007/10/06/improving-the-wordpress-generator/
+// Remove the WordPress Generator via http://blog.ftwr.co.uk/archives/2007/10/06/improving-the-wordpress-generator/
function thematic_remove_generators() { return ''; }
if (apply_filters('thematic_hide_generators', TRUE)) {
@@ -353,7 +353,7 @@ function thematic_h5bp_setup() {
// This theme uses wp_nav_menu() in one location.
register_nav_menus( array(
- 'oxox' => __( 'Primary Navigation', $my_themename ),
+ 'xoxo' => __( 'Primary Navigation', $my_themename ),
) );
// This theme allows users to set a custom background
@@ -768,4 +768,4 @@ function my_plugin_admin_styles()
function my_plugin_manage_menu()
{
/* Output our admin page * /
-} */
+} */
@@ -10,7 +10,7 @@
'col3b' => '2 sidebars (left)',
'col3c' => '2 sidebars (right)',
);
-//die(get_template_directory() . '/library/js/libs/modernizr-*.js');
+
$modernizrBuildsComplete = glob(get_template_directory() . '/library/js/libs/modernizr-*.js');
$modernizrBuilds = array();
foreach($modernizrBuildsComplete as $build) {
View
@@ -469,10 +469,10 @@ input[required],
/* =Widgets
-------------------------------------------------------------- */
-.oxox {
-
+ul.xoxo
+{
+ list-style-type: none;
}
- .oxox li {}
.widget-area {
background: rgba(212, 234, 235, .25); /* not-pink */
@@ -1173,4 +1173,3 @@ button {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#9e9e9e', endColorstr='#454545'); /* ie7 */
-ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#9e9e9e', endColorstr='#454545'); /* ie8 */
}
-

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -3,7 +3,7 @@ Theme Name: Html5 Boilerplate
Description: A theme based upon Thematic ToolBox using all the goodness of <a href="http://paulirish.com/">Paul Irish</a> &amp; <a href="http://nimbupani.com/">Divya Manian</a>&#039;s <a href="http://html5boilerplate.com/">HTML5 Boilerplate</a>. It is intended to work with some plugins (WP super cache &amp; WP Minify)
Author: S Sherlock
Author URI: http://samsherlock.com/
-Version: 0.03a
+Version: 0.03a1
Tags: translation-ready, microformats, rtl-language-support, optimization
This theme, like WordPress, is licensed under the GPL.

0 comments on commit cc107fd

Please sign in to comment.