? .DS_Store
? INSTALLATION.txt
? blueprint_comment_notices.patch
? blueprint_current.patch
? blueprint_libraries.patch
? blueprint_rtl.patch
? blueprint_rtl_3.patch
? BPSTARTER/favicon.ico
? BPSTARTER/logo.png
? blueprint/.DS_Store
? blueprint/.cvsignore
? blueprint/favicon.ico
? blueprint/logo.png
? blueprint/page.diff
? blueprint/theme-settings-dynamic sidebar sizing.php
? blueprint/css/.DS_Store
? blueprint/images/.DS_Store
? blueprint/scripts/theme-settings.js
Index: blueprint/blueprint.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/blueprint/blueprint/Attic/blueprint.info,v
retrieving revision 1.1.2.7
diff -u -p -r1.1.2.7 blueprint.info
--- blueprint/blueprint.info	24 Feb 2010 18:06:22 -0000	1.1.2.7
+++ blueprint/blueprint.info	21 Jul 2010 17:06:37 -0000
@@ -4,8 +4,7 @@ description = Drupal base theme built wi
 
 core = 6.x
 engine = phptemplate
-stylesheets[screen,projection][] = framework/blueprint/screen.css
-stylesheets[print][] = framework/blueprint/print.css
+
 stylesheets[screen,projection][] = css/blueprint.css
 stylesheets[screen,projection][] = css/style.css
 
Index: blueprint/page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/blueprint/blueprint/Attic/page.tpl.php,v
retrieving revision 1.1.2.7
diff -u -p -r1.1.2.7 page.tpl.php
--- blueprint/page.tpl.php	25 Feb 2010 00:46:06 -0000	1.1.2.7
+++ blueprint/page.tpl.php	21 Jul 2010 17:06:38 -0000
@@ -11,7 +11,7 @@
   <?php print $head; ?>
   <?php print $styles; ?>
   <!--[if lte IE 7]>
-    <link rel="stylesheet" href="<?php print $path_parent; ?>framework/ie.css" type="text/css" media="screen, projection">
+    <link rel="stylesheet" href="<?php print $bp_library_path; ?>blueprint/ie.css" type="text/css" media="screen, projection">
     <link href="<?php print $path_parent; ?>css/ie.css" rel="stylesheet"  type="text/css"  media="screen, projection" />
     <?php $styles_ie_rtl['ie']; ?>
   <![endif]-->
Index: blueprint/template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/blueprint/blueprint/Attic/template.php,v
retrieving revision 1.1.2.26
diff -u -p -r1.1.2.26 template.php
--- blueprint/template.php	20 Jun 2010 18:58:43 -0000	1.1.2.26
+++ blueprint/template.php	21 Jul 2010 17:06:38 -0000
@@ -21,6 +21,23 @@ function blueprint_theme(&$existing, $ty
 }
 
 /**
+ * Intercept template variables 
+ *
+ * @param $vars
+ *   A sequential array of variables passed to the theme function.
+ */
+function blueprint_preprocess(&$variables, $hook) {
+  if (module_exists('libraries')) {
+    $variables['bp_library_path'] = module_invoke('libraries', 'get_path', 'blueprint') .'/';
+  }
+  else {
+    $variables['bp_library_path'] = 'sites/all/libraries/blueprint/';
+  }
+  drupal_add_css($variables['bp_library_path'] .'blueprint/screen.css', 'theme', 'screen,projection');
+  drupal_add_css($variables['bp_library_path'] .'blueprint/print.css', 'theme', 'print');
+}
+
+/**
  * Intercept page template variables
  *
  * @param $vars
@@ -474,43 +491,26 @@ function blueprint_trim_text($text, $len
  * weighted styles.
  */
 function blueprint_css_reorder($css) {
-  global $theme_info, $base_theme_info;
-
-  // Dig into the framework .info data.
-  $framework = !empty($base_theme_info) ? $base_theme_info[0]->info : $theme_info->info;
-
-  // Pull framework styles from the themes .info file and place them above all stylesheets.
-  if (isset($framework['stylesheets'])) {
-    foreach ($framework['stylesheets'] as $media => $styles_from_bp) {
-      // Setup framework group.
-      if (isset($css[$media])) {
-        $css[$media] = array_merge(array('framework' => array()), $css[$media]);
-      }
-      else {
-        $css[$media]['framework'] = array();
-      }
-      foreach ($styles_from_bp as $style_from_bp) {
+  foreach ($css as $media => $styles_from_bp) {
+    // Setup framework group.
+    if (!isset($css[$media]['libraries'])) {
+      $css[$media] = array_merge(array('libraries' => array()), $css[$media]);
+    }
+    else {
+      $libraries = $css[$media]['libraries'];
+      unset($css[$media]['libraries']);
+      $css[$media] = array_merge($libraries, $css[$media]);
+    }
+    foreach ($styles_from_bp as $section => $value) {
+      foreach ($value as $style_from_bp => $bool) {
         // Force framework styles to come first.
-        if (strpos($style_from_bp, 'framework') !== FALSE) {
-          $framework_shift = $style_from_bp;
-          $remove_styles = array($style_from_bp);
-          // Handle styles that may be overridden from sub-themes.
-          foreach ($css[$media]['theme'] as $style_from_var => $preprocess) {
-            if ($style_from_bp != $style_from_var && basename($style_from_bp) == basename($style_from_var)) {
-              $framework_shift = $style_from_var;
-              $remove_styles[] = $style_from_var;
-              break;
-            }
-          }
-          $css[$media]['framework'][$framework_shift] = TRUE;
-          foreach ($remove_styles as $remove_style) {
-            unset($css[$media]['theme'][$remove_style]);
-          }
+        if (strpos($style_from_bp, 'libraries') !== FALSE) {
+          $css[$media]['libraries'][$style_from_bp] = $bool;
+          unset($css[$media][$section][$style_from_bp]);
         }
       }
     }
   }
-
   return $css;
 }