CUL-DigitalServices / avocet-ui

Open Academic Environment (OAE) Front-End
http://www.oaeproject.org
Educational Community License v2.0
1 stars 1 forks source link

Add side floating navigation to the content (about) pages #174

Closed ucamhal closed 10 years ago

ucamhal commented 10 years ago

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.

ucamhal commented 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.

bertpareyn commented 10 years ago

Can you have a look at the merge conflict @ucamhal

ucamhal commented 10 years ago

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.

bertpareyn commented 10 years ago

@ucamhal Can you have another look at the merge conflict

ucamhal commented 10 years ago

@bp323 Did you see my comment above? If you could review it as is it would make things easier.

bertpareyn commented 10 years ago

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.

ucamhal commented 10 years ago

Sure. It's up to date again now. Over to you @bp323

bertpareyn commented 10 years ago

@ucamhal I was out for a bit and it's conflicting again. I'll have a look straight away once the conflicts are fixed.

ucamhal commented 10 years ago

Assigning to @bp323

bertpareyn commented 10 years ago

Review completed, reassigning to @ucamhal for follow-up

ucamhal commented 10 years ago

Followed up & commented, assigned @bp323

bertpareyn commented 10 years ago

Reassigning to @ucamhal to tackle the outstanding tasks.

ucamhal commented 10 years ago

Assigned @timdegroote to review

ucamhal commented 10 years ago

TODO: Fix bootstrap's use of !important in .hide breaking the upload page

ucamhal commented 10 years ago

Followed up & fixed boostrap's !important issue. Assigned to @timdegroote to review.

timdegroote commented 10 years ago

Looks good, one remaining comment. @ucamhal

ucamhal commented 10 years ago

Fixed, assigned back to @timdegroote