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

adding cbe buttons to rightside menu #136

Closed dominic-demierre closed 9 years ago

dominic-demierre commented 9 years ago

many apologies for amateurish presentation--UI is doing my head in. is it possible to only include the relevant commit and not the school council updates? it isn't letting me cherry pick, as far as i see.

thirstyice commented 9 years ago

Split a new branch off the previous commit, then cherry-pick into that and make a new pull request git checkout HEAD~3 git checkout -b random-branch-name git cherry-pick <commit hash>

Alternatively, instead of cherry-picking, just re-insert the buttons (maybe with a different colour scheme (read: less ugly))

nemeulenbroek commented 9 years ago

I don't believe they're doing this in gitbash, so those commands are probably redundant

thirstyice commented 9 years ago

Well then no wonder they can't cherry pick

dominic-demierre commented 9 years ago

i'd love to change the colour scheme. also i'm trying my hardest to avoid command lines, but if i must use them then i will. is this pull request ultimately of any use to you guys?

nemeulenbroek commented 9 years ago

Mostly for proofreading code and a medium to let you know what needs to be fixed. A check point if you will. Other than that, not really

nemeulenbroek commented 9 years ago

Just gotta ask: downtown has been super picky about the colours we've used in the past, so is this our go-ahead to start using more colours? Cause neither of those buttons are per-regulations