Skip to content
This repository has been archived by the owner on Oct 21, 2020. It is now read-only.

Commit

Permalink
Merge branch 'STUDIO-2' into development
Browse files Browse the repository at this point in the history
* STUDIO-2:
  STUDIO-2: Updated the readme to track the version of Infusion.
  STUDIO-2: removes unncessary cut and pasted demo configuration from the page enhancer.
  STUDIO-2: trims down the Infusion bundle, removing unnecessary .js and FSS files and using a minified MyInfusion.js.
  • Loading branch information
michelled committed Dec 5, 2011
2 parents fa27d9d + 0717d78 commit 5a13eea
Show file tree
Hide file tree
Showing 191 changed files with 14 additions and 26,401 deletions.
2 changes: 2 additions & 0 deletions wp-content/themes/fluid-studios/README.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
The Fluid Studios theme is based on FSSFive, by Johnny Taylor. The original code was taken from commit cd0b299e911dbb5362b8a40ea6a8feb8cff27cc9 of his github repo: https://github.com/abledaccess/FSSFive

Infusion is the minified version of 1.4 with only UI Options included.

7 changes: 1 addition & 6 deletions wp-content/themes/fluid-studios/header.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,7 @@
<script type="text/javascript">
// Instantiate the UI Enhancer component, specifying the table of contents' template URL
fluid.pageEnhancer({
tocTemplate: "<?php bloginfo('template_url'); ?>/infusion/components/tableOfContents/html/TableOfContents.html",
classnameMap: {
theme: {
"default": "uio-demo-theme"
}
}
tocTemplate: "<?php bloginfo('template_url'); ?>/infusion/components/tableOfContents/html/TableOfContents.html"
});

// Start up UI Options
Expand Down
Loading

0 comments on commit 5a13eea

Please sign in to comment.