Permalink
Browse files

Enable child theming

  • Loading branch information...
1 parent 3bab27b commit cede2aecbec4018f3bfde74ac2877dbe53901165 @mindctrl committed Feb 11, 2012
Showing with 9 additions and 11 deletions.
  1. +4 −7 README.md
  2. +1 −0 changelog.txt
  3. +1 −1 header-hero.php
  4. +1 −1 header.php
  5. +2 −2 inc/bootstrap-css.php
View
@@ -1,5 +1,5 @@
-ALIEN SHIP WORDPRESS FRAMEWORK
-=============================
+ALIEN SHIP WORDPRESS THEME
+--------------------------
Alien Ship is an HTML5 responsive starter theme for WordPress. It uses Twitter's Bootstrap version 2.0. It comes with core HTML, CSS, and Javascript for type, form, grids, navigation, buttons, dropdown menus, and more. It includes a number of shortcodes to enable quick place of buttons, forms, grids, etc. For more information and documentation, access the Wiki.
@@ -9,7 +9,7 @@ NOTE: This theme is currently beta quality software. It is not yet ready for pro
TO DO LIST
-==========
+----------
+ Clean up footer.php jQuery.
+ Finish moving shared elements to inc/ for easier template updates
@@ -37,10 +37,7 @@ TO DO LIST
-BUG TRACKER
-===========
-
-Known issues
+KNOWN ISSUES
------------
+ Alignment issues on the "Images Test" post.
View
@@ -5,6 +5,7 @@ Version 0.3 - February
------------------------------
- Top Menu: Fixed problem with menu not displaying properly and dropdowns not working if WordPress was falling back on the wp_page_menu when a menu wasn't assigned in Admin > Appearance > Menus. Added jQuery code to js/alienship_dropdown-toggle.js to fix.
- Bottom Menu: If no menu is assigned in Admin > Appearance > Menus, the menu is not displayed. This keeps the default wp_page_menu from display and looking like crap. It's generally too big for this area. The Bottom Menu is meant to be small.
+- Allow child themes.
View
@@ -53,7 +53,7 @@
<?php
// <!-- Check for custom.css and if it exists, load it. -->
$customcss = (get_stylesheet_directory()).'/custom/custom.css';
-if(file_exists($customcss)){
+if(file_exists($customcss) && !is_child_theme()){
echo '<link rel="stylesheet" type="text/css" media="all" href="' . get_bloginfo ( 'stylesheet_directory' ) . '/custom/custom.css" />';
} ?>
</head>
View
@@ -53,7 +53,7 @@
<?php
// <!-- Check for custom.css and if it exists, load it. -->
$customcss = (get_stylesheet_directory()).'/custom/custom.css';
-if(file_exists($customcss)){
+if(file_exists($customcss) && !is_child_theme()){
echo '<link rel="stylesheet" type="text/css" media="all" href="' . get_bloginfo ( 'stylesheet_directory' ) . '/custom/custom.css" />';
} ?>
View
@@ -7,6 +7,6 @@
*/
?>
<!-- Load Bootstrap CSS. Javascript is loaded in functions.php -->
-<link rel="stylesheet" type="text/css" href="<?php bloginfo( 'stylesheet_directory');?>/css/bootstrap.min.css">
-<link rel="stylesheet" type="text/css" href="<?php bloginfo( 'stylesheet_directory');?>/css/bootstrap-responsive.min.css">
+<link rel="stylesheet" type="text/css" href="<?php bloginfo( 'template_directory');?>/css/bootstrap.min.css">
+<link rel="stylesheet" type="text/css" href="<?php bloginfo( 'template_directory');?>/css/bootstrap-responsive.min.css">
<!-- End of Bootstrap CSS -->

0 comments on commit cede2ae

Please sign in to comment.