Bug3715/patsy #105

Merged
merged 6 commits into from Mar 13, 2013

Projects

None yet

4 participants

@momijizukamori
Collaborator

Theme and layout patch, plus optimized preview image. Probably needs a fair bit of going-over, I had to do some really wild CSS to get this going in multiple configurations.

@momijizukamori
Collaborator

Alright, between Mark and me, I think we managed to snag all the little typos and bugs! Should be good for a re-review now :)

@afuna
Member
afuna commented Mar 13, 2013

Hey, so I'm getting this error when I try to compile:

patsy/layout(1335) is layout, parent = core2(2)
patsy/retro(1336) is theme, parent = patsy/layout(1335)
S2 compilation failed: Compile error: line 18, column 1: Can't set non-existent property 'color_navlinks_link'

Please check! Also if you could fix the conflict in s2layers.dat and S2Theme.pm, that would be awesome.

@momijizukamori
Collaborator

Augh this is what happens when I go 'whoops, I forgot to check if it compiles. Eh, it'll be fine.'

I'll see about fixing the conflict - I probably need to update the main repo and get the newest versions of those files (because they hate auto-merging)

@momijizukamori
Collaborator

Merge conflict should be resolved now, and the property names are cleaned up!

@afuna afuna merged commit 68f1cf5 into dreamwidth:develop Mar 13, 2013
@afuna
Member
afuna commented Mar 13, 2013

Thank you!

@ninetyd
Collaborator
ninetyd commented Mar 13, 2013

Just a note to say this didn't trigger a corresponding changelog entry.

@afuna
Member
afuna commented Mar 13, 2013

Whoa, weirdness. It's definitely in though!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment