lp:~daimoneze/osdf/drupal7-theme

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~sillydeveloper/osdf/trunk

Andrew Ettinger: Pending requested 2011-05-06

Diff: 3783 lines (+3605/-0) (has conflicts)

18 files modified

LICENSE.txt (+274/-0)
orange/css/ie-6.css (+45/-0)
orange/css/ie-7.css (+51/-0)
orange/css/style.css (+1266/-0)
orange/js/orange.js (+13/-0)
orange/orange.info (+41/-0)
orange/orange.skinr.inc (+368/-0)
orange/template.php (+207/-0)
orange/templates/block.tpl.php (+53/-0)
orange/templates/comment-wrapper.tpl.php (+53/-0)
orange/templates/comment.tpl.php (+86/-0)
orange/templates/html.tpl.php (+54/-0)
orange/templates/node.tpl.php (+114/-0)
orange/templates/page.tpl.php (+113/-0)
orange/templates/region.tpl.php (+34/-0)
orange_admin/css/style-admin.css (+760/-0)
orange_admin/orange_admin.info (+26/-0)
orange_admin/page.tpl.php (+47/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

9. By Toast McFarland on 2011-05-10

Added hr under header.

8. By Toast McFarland on 2011-05-10

Re-CSSed the header.

7. By Toast McFarland on 2011-05-10

Rearranged header. May need follow-up to adjust for links.

6. By Toast McFarland on 2011-05-09

Reverted block.tpl.php to remove an undefined variable. Block_css module now works correctly.

Merged branch lp:~dust4ngel/osdf/drupal-theme

5. By Toast McFarland on 2011-05-09

Merged with lp:~dust4ngel/osdf/drupal-theme.

4. By Toast McFarland on 2011-05-09

Removed some extra skinr filed. Small change to home.tpl.php.

3. By Toast McFarland on 2011-05-07

Fixed members and issue tracker table width. Cleaned up front page.

2. By Toast McFarland on 2011-05-06

Some CSS changes.

1. By Toast McFarland on 2011-05-01

Init.