I got some Baleaf shorts on Amazon
https://www.amazon.com/Baleaf-Padded...477571&sr=8-32
I use those under cargo shorts or when its colder under Adidas sweats/tights. I like the pockets on the cargo pants and the Adidas pants have zippered pockets.
I like this combo so much I am thinking of getting a bib by the same company. I have used it alot and washed them alot and they are still holding up very well.