Merge lp:~caelj/spenglr-com/theme-first-pass into lp:spenglr-com/theme-trunk

Proposed by Cael Kay-Jackson
Status: Merged
Approved by: Martin Fitzpatrick
Approved revision: 2
Merge reported by: Cael Kay-Jackson
Merged at revision: not available
Proposed branch: lp:~caelj/spenglr-com/theme-first-pass
Merge into: lp:spenglr-com/theme-trunk
To merge this branch: bzr merge lp:~caelj/spenglr-com/theme-first-pass
Reviewer Review Type Date Requested Status
Martin Fitzpatrick (community) Approve
Cael Kay-Jackson (community) Approve
Registry Administrators Pending
Review via email: mp+1793@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Cael Kay-Jackson (caelj) wrote :

Basic usable themes in place, ready to be built upon by more better-skilled theme developers at a later date :)

Revision history for this message
Cael Kay-Jackson (caelj) wrote :

Apologies. IE6 is a bit screwy due to some styles in the fix-ie.css; couldn't test this before as I wasn't in Windows. Will fix.

review: Needs Fixing
Revision history for this message
Cael Kay-Jackson (caelj) wrote :

IE6 issues fixed. (Unable to test in IE7+).

Revision history for this message
Cael Kay-Jackson (caelj) :
review: Approve
Revision history for this message
Martin Fitzpatrick (mfitzp) wrote :

Looks good to me!

review: Approve
Revision history for this message
Cael Kay-Jackson (caelj) wrote :

Ah, I messed up :) Didn't branch this one properly from trunk, so can't do the bzr merge. I've hand-merged it, slapped my wrist and told myself to go sit in the corner and think about what I've done.

As luck would have it, not much is lost (just two log entries) and the overall effect is the same (clear out of Garland stuff and addition of spenglr bits and pieces).

https://code.launchpad.net/~spenglr-dev/spenglr-com/theme-trunk is now good to go.

Marking this one merged and pretending I did nothing wrong.

Subscribers

People subscribed via source and target branches