Merge pull request #2280 from awesomerobot/master

initial move of common desktop/mobile styles to common/base
pulling some more styles out of desktop/mobile to common/base