richardthombs / scunpacked

Star Citizen data browser and API
https://scunpacked.com
GNU General Public License v3.0
62 stars 16 forks source link

Ship page style tweaks #73

Open alistair3149 opened 3 years ago

alistair3149 commented 3 years ago

When this is finalized I will apply the relevant tweaks to other page types.

localhost_4200_ships_aegs_avenger_stalker (1) localhost_4200_ships_aegs_avenger_stalker (2)

richardthombs commented 3 years ago

I am having difficulty applying your PRs because they also include all of the other changes you have made.

alistair3149 commented 3 years ago

Hmm that's weird. I didn't include changes from the other PRs in the branch as you can see from the commit on my repo. Does rebasing work?

EDIT: Oh I see. #67 was reverted and it was in master so all my branches was targeting the master that included it. The PR should be mergable if either #67 is merged or merge any of the current PRs since they all included #67

EDIT: I opened #74 that is identical to #67. Merging that to master will restore the branch back to the previous master or you can do a FF if you prefer

alistair3149 commented 3 years ago

Convert to draft because of rebase