search

Aberhart-school / abe-site

The website of William Aberhart high school
http://schools.cbe.ab.ca/b829/aberhart/
GNU General Public License v3.0
7 stars 8 forks source link

tech-club #72

Closed nemeulenbroek closed 10 years ago

nemeulenbroek commented 10 years ago

The tech club section along with Google forms

thirstyice commented 10 years ago

Can't merge yet. Tech club links to advocate page

nemeulenbroek commented 10 years ago

Sorry, didn't catch that earlier today when I synced my fork with the original. Should be fixed now

gjwehnes commented 10 years ago

Merged the changes as of 3 October 1500, but placed into seperate branch "tech-club". Changes past that date/time will need to be made within this branch.

thirstyice commented 10 years ago

Still can't merge. You forgot to close a div and broke the ui. Also, we do have standard classes for iframes, it would be better if you used one of those (They are programmed to allow for auto re-sizing content, in case we ever decide to do that)

nemeulenbroek commented 10 years ago

Which file was the div in? And I'm not sure how I broke the ui. I'll check for what I can. Unfortunately can't test on my local server, so I can't replicate

nemeulenbroek commented 10 years ago

Closing since it will soon be pushed through a different account

thirstyice commented 10 years ago

Not fixed yet

nemeulenbroek commented 10 years ago

Done and tested. should be ready to be pulled in