Closed ucamhal closed 10 years ago
Assigning to @bp323 for review.
Btw it's worth using git diff -w
to compare the HTML changes as often they're just indentation.
Can you have a look at the merge conflict @ucamhal
Rebased again to fix the conflict. Because the HTML indentation has changed, most HTML changes in master result in a merge conflict. If you get another please review as is and I'll do a final rebase/merge once we're done with followups. Assigning back to @bp323 for review.
@ucamhal Can you have another look at the merge conflict
@bp323 Did you see my comment above? If you could review it as is it would make things easier.
I saw it I just prefer reviewing on the latest master branch as changes might break stuff.
On 22 May 2014, at 11:33, ucamhal notifications@github.com wrote:
@bp323 Did you see my comment above? If you could review it as is it would make things easier.
— Reply to this email directly or view it on GitHub.
Sure. It's up to date again now. Over to you @bp323
@ucamhal I was out for a bit and it's conflicting again. I'll have a look straight away once the conflicts are fixed.
Assigning to @bp323
Review completed, reassigning to @ucamhal for follow-up
Followed up & commented, assigned @bp323
Reassigning to @ucamhal to tackle the outstanding tasks.
Assigned @timdegroote to review
TODO: Fix bootstrap's use of !important in .hide breaking the upload page
Followed up & fixed boostrap's !important issue. Assigned to @timdegroote to review.
Looks good, one remaining comment. @ucamhal
Fixed, assigned back to @timdegroote
This PR implements the design for https://bugs.caret.cam.ac.uk/browse/PAVO-111. A side navigation is added to each content page which scrolls with the page to stay in view.