Closes #21881 (closed) #30016 (closed)
css changes
cc: @regisF @zj @cperessini @tauriedavis @hazelyang