No to either, Warhawk and I never wore bicycle shorts under a mini skirt.
Speaking from experience, you're not living until you wear a mini-skirt, Nomad.

Let me explain.....
During my senior year, we had a warm spell in our hometown. Girls were allowed to wear mini-skirts but boys at our high school were not permitted to wear shorts, despite the fact that the other public high school in our district allowed boys to wear shorts. As I was in student government and had access to certain workings behind the scenes, I convinced several guys (including a few football players) to wear mini-skirts in protest.
Well the morning of the event, our principal came into the student government session and went nuts. I was seated, so my legs were not visible, as were 3 or 4 other guys. The principal then stated....AND I QUOTE "If boys want to wear mini-skirts, have them transfer to the San Francisco school district". Well, that was in 1984 and he was pushing 60 at the time (very "old school"). While all this was going on, I knew someone in the local paper's editorial department who I kept informed of all this. He took pictures of male students at the other school wearing shorts and ran the photo of me and the other guys who were suspended for the day while wearing the mini-skirts. KTVU (our local Fox affiliate, before it was Fox) was all set to run a little piece on the story, but the weenie football players feared reprecussions from the coach and others, so we all declined in solidarity. My newspaper contact also ran my "letter to the editor" the day after we got suspended when I quoted the principal (along with a few choice words of my own). Apparently he got a little flack from the City of SF. Our assistant school principal thought my editorial letter was one of the funniest things he had ever read.
During our graduation ceremony, while on stage, the school superintendent thanked me for being instrumental in welcoming him to the school district and making his first year a memorable one.
Oh, boys at our high school are still permitted to wear shorts (not sure about miniskirts). If I can dig out my high school yearbook, I'll scan that page.