Capezio makes dance shorts. I have their straight across and boy short. I think I'm up to 2x Vfront, 3x straight across black, 1x purple, 1xtan/nude https://www.amazon.com/dp/B002KIBLI0/ref=cm_sw_r_cp_apa_i_rQcNCbDAK14VC
I size up 1 size from my regular to avoid panty lines since I'm not wearing them over a leotard.
They are actually yoga shorts! Super freaking comfy and super great for under a skirt!
For shorts, I love the Capezio shorts ($11-13 on Amazon). Sports bras, if you mostly care about function there are these 4 sports bras for only $28, they work great. If you want a more sexy sports bra I really like this one from Amazon, they're $19 now but go on sale sometimes for $13.