Restructure the app/assets/stylesheets directory

app/assets/stylesheets/admin.css

@@ -1,3 +1,3 @@
 //  Manifest
 //
-//= require_tree ./admin
+//= require_tree ./common/admin

app/assets/stylesheets/application.css.erb

@@ -1,4 +1,4 @@
 //  Manifest
 //
 //= require common
-//= require_tree ./application
+//= require_tree ./desktop

app/assets/stylesheets/common.css.erb

@@ -2,11 +2,12 @@
 //
 //= require ./vendor/normalize
 //= require ./vendor/bootstrap
-//= require ./foundation/base
+//= require ./common/foundation/base
 //= require ./vendor/font_awesome/font-awesome
 //= require ./vendor/chosen
-//= require_tree ./components
+//= require_tree ./common/components
-//= require ./foundation/helpers
+//= require ./common/foundation/helpers
+//= require_tree ./common
 <%
   # TODO this is very tricky, we want to add a dependency here on files that may not yet exist
   #  otherwise in dev we are often stuck nuking the tmp/cache directory

app/assets/stylesheets/common/activation.css.scss

@@ -1,8 +1,8 @@
 // Styles used before the user is logged into discourse. For example, activating their
 // account or changing their email.
 
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
 
 #simple-container {
   @include border-radius-all(10px);

app/assets/stylesheets/common/admin/admin_base.scss

@@ -1,7 +1,7 @@
 // these are the styles associated with the Discourse admin section
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
-@import "foundation/helpers";
+@import "common/foundation/helpers";
 
 
 .content-list li a span.count {

app/assets/stylesheets/common/colorpicker.css.scss

@@ -1,7 +1,7 @@
 // styles for the category badge color picker
 
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
 
 .category-color-editor {
   input {

app/assets/stylesheets/common/components/badges.css.scss

@@ -1,5 +1,5 @@
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
 
 // --------------------------------------------------
 // Badges

app/assets/stylesheets/common/components/buttons.css.scss

@@ -1,5 +1,5 @@
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
 
 // --------------------------------------------------
 // Buttons

app/assets/stylesheets/common/components/navs.css.scss

@@ -1,6 +1,6 @@
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
-@import "foundation/helpers";
+@import "common/foundation/helpers";
 
 // --------------------------------------------------
 // Navigation menus

app/assets/stylesheets/common/compose.css.scss

@@ -1,7 +1,7 @@
 // styles that apply to the reply pane that slides up to compose replies
 
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
 
 // hack, this needs to be done cleaner
 .private-message input.span8 {

app/assets/stylesheets/common/discourse.css.scss

@@ -2,9 +2,9 @@
 // BEWARE: changing these styles implies they take effect anywhere they are seen
 // throughout the Discourse application
 
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
-@import "foundation/helpers";
+@import "common/foundation/helpers";
 
 body {
   min-width: $large-width;

app/assets/stylesheets/common/faqs.css.scss

@@ -1,6 +1,6 @@
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
-@import "foundation/helpers";
+@import "common/foundation/helpers";
 
 // --------------------------------------------------
 // FAQs

app/assets/stylesheets/common/header.css.scss

@@ -1,5 +1,5 @@
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
 
 // --------------------------------------------------
 // Discourse header

app/assets/stylesheets/common/history.css.scss

@@ -1,8 +1,8 @@
 // styles that apply to the popup that appears when you show the edit history
 // of a post
 
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
 
 .modal.history-modal {
   .modal-inner-container {

app/assets/stylesheets/common/hotness_control.css.scss

@@ -1,7 +1,7 @@
 // styles for the 'hotness control'
 
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
 
 .hotness-control {
   margin-bottom: 5px;

app/assets/stylesheets/common/input_tip.css.scss

@@ -1,5 +1,5 @@
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
 
 .popup-tip {
   position: absolute;

app/assets/stylesheets/common/lightbox.css.scss

@@ -1,5 +1,5 @@
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
 
 .lightbox {
   position: relative;

app/assets/stylesheets/common/login.css.scss

@@ -1,7 +1,7 @@
 // style that apply to the login popup
 
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
 
 #login-buttons {
   button {

app/assets/stylesheets/common/modal.css.scss

@@ -1,7 +1,7 @@
 // base styles for every modal popup used in Discourse
 
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
 
 .modal-open {
   .dropdown-menu {

app/assets/stylesheets/common/onebox.scss

@@ -1,5 +1,5 @@
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
 
 a.loading-onebox {
   background: {

app/assets/stylesheets/common/pagedown.css.scss

@@ -1,7 +1,7 @@
 // styles that apply to the PageDown editor
 // http://code.google.com/p/pagedown/
 
-@import "foundation/mixins";
+@import "common/foundation/mixins";
 
 .wmd-panel {
   margin-left: 25%;

app/assets/stylesheets/common/share_link.css.scss

@@ -1,7 +1,7 @@
 // styles that apply to the "share" popup when sharing a link to a post or topic
 
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
 
 #share-link {
   position: absolute;

app/assets/stylesheets/common/topic-admin-menu.css.scss

@@ -1,7 +1,7 @@
 // Styles for the topic admin menu
 
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
 
 #show-topic-admin {
   position: fixed;

app/assets/stylesheets/common/topic-list.css.scss

@@ -1,5 +1,5 @@
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
 
 // --------------------------------------------------
 // Topic lists

app/assets/stylesheets/common/topic-post.css.scss

@@ -1,5 +1,5 @@
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
 
 @include small-width {
   #selected-posts {

app/assets/stylesheets/common/topic.css.scss

@@ -1,7 +1,7 @@
 /* styles that apply when viewing a topic/topic */
 
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
 
 // Topic title
 // --------------------------------------------------

app/assets/stylesheets/common/upload.css.scss

@@ -1,5 +1,5 @@
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
 
 .add-upload .icon-plus {
   font-size: 10px;

app/assets/stylesheets/common/user.css.scss

@@ -1,6 +1,6 @@
 // styles that apply to the user page
-@import "foundation/variables";
+@import "common/foundation/variables";
-@import "foundation/mixins";
+@import "common/foundation/mixins";
 
 .user-preferences {
   textarea {

app/assets/stylesheets/mobile.css.erb

@@ -2,8 +2,3 @@
 //
 //= require common
 //= require_tree ./mobile
-//
-//  For now, include all desktop css. But once we add files in ./mobile that override
-//  files in ./application, we'll need to only include the files we need:
-//
-//= require_tree ./application

app/assets/stylesheets/vendor/bootstrap.css.scss

@@ -12,7 +12,7 @@
  * no longer required.
  */
 
- @import "foundation/mixins";
+ @import "common/foundation/mixins";
 
 a:focus {
   outline: thin dotted #333;

app/assets/stylesheets/vendor/font_awesome/_core.scss

@@ -1,6 +1,7 @@
 /* FONT AWESOME CORE
  * -------------------------- */
 
+
 [class^="icon-"],
 [class*=" icon-"] {
   @include icon-FontAwesome();