search

socallinuxexpo / scale-network

SCaLE's on-site expo network configurations, wifi, tooling, and scripts
https://www.socallinuxexpo.org/
BSD 3-Clause "New" or "Revised" License
46 stars 19 forks source link

[READY] 21x graphics 01 #667

Closed owendelong closed 7 months ago

owendelong commented 8 months ago

Description of PR

Adding some of the graphics for 21x

Previous Behavior

Pre-21x graphics only

New Behavior

Some graphics for 21x

Tests

It looks sort of OK in Inkscape.

owendelong commented 8 months ago

I'd rather not have binaries, too, but unfortunately, the artist insists on workin in PNG, so these are the actual originals and the SVGs are somewhat lower fidelity replicants I made from the PNGs. As such, I'd rather not lose the originals.

I'll try to hork the history as requested.

sarcasticadmin commented 7 months ago

You were on some intermittent branch from on #661 . Not sure how that all happened but easy enough to fix.

So what I did:

$ git fetch upstream/21x_graphics_01 # get a copy of the remote branch
$ git checkout 21x_graphics_01 # checkout that remote branch
$ git reset --hard master # reset hard to local master since git rebase master failed with lots of old conflicts
$ git cherry-pick c33b898319701a12fa704589fb2d53560cd71d07 # The commit where you added the graphics thats still in the local remote branch upstream/21x_graphics_01
$ git push -f upstream 21x_graphics # Make remote history match our local one