diff --git a/app/assets/stylesheets/admin.css b/app/assets/stylesheets/admin.css index d39d23a863c..0bd2f7e77ed 100644 --- a/app/assets/stylesheets/admin.css +++ b/app/assets/stylesheets/admin.css @@ -1,3 +1,3 @@ // Manifest // -//= require_tree ./admin +//= require_tree ./common/admin diff --git a/app/assets/stylesheets/application.css.erb b/app/assets/stylesheets/application.css.erb index 8e7e930220c..0cd21a762ba 100644 --- a/app/assets/stylesheets/application.css.erb +++ b/app/assets/stylesheets/application.css.erb @@ -1,4 +1,4 @@ // Manifest // //= require common -//= require_tree ./application +//= require_tree ./desktop diff --git a/app/assets/stylesheets/common.css.erb b/app/assets/stylesheets/common.css.erb index 50f5249ee1e..555a23c89c8 100644 --- a/app/assets/stylesheets/common.css.erb +++ b/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 ./foundation/helpers +//= require_tree ./common/components +//= 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 diff --git a/app/assets/stylesheets/application/activation.css.scss b/app/assets/stylesheets/common/activation.css.scss similarity index 77% rename from app/assets/stylesheets/application/activation.css.scss rename to app/assets/stylesheets/common/activation.css.scss index 09fd5a604d9..19fe4c9eedd 100644 --- a/app/assets/stylesheets/application/activation.css.scss +++ b/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 "foundation/mixins"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; #simple-container { @include border-radius-all(10px); diff --git a/app/assets/stylesheets/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss similarity index 99% rename from app/assets/stylesheets/admin/admin_base.scss rename to app/assets/stylesheets/common/admin/admin_base.scss index 4827ecd8658..27db57bfb2c 100644 --- a/app/assets/stylesheets/admin/admin_base.scss +++ b/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 "foundation/mixins"; -@import "foundation/helpers"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; +@import "common/foundation/helpers"; .content-list li a span.count { diff --git a/app/assets/stylesheets/application/bbcode.css.scss b/app/assets/stylesheets/common/bbcode.css.scss similarity index 100% rename from app/assets/stylesheets/application/bbcode.css.scss rename to app/assets/stylesheets/common/bbcode.css.scss diff --git a/app/assets/stylesheets/application/code_highlighting.css.scss b/app/assets/stylesheets/common/code_highlighting.css.scss similarity index 100% rename from app/assets/stylesheets/application/code_highlighting.css.scss rename to app/assets/stylesheets/common/code_highlighting.css.scss diff --git a/app/assets/stylesheets/application/colorpicker.css.scss b/app/assets/stylesheets/common/colorpicker.css.scss similarity index 88% rename from app/assets/stylesheets/application/colorpicker.css.scss rename to app/assets/stylesheets/common/colorpicker.css.scss index ea43917b6c3..a74794fbc24 100644 --- a/app/assets/stylesheets/application/colorpicker.css.scss +++ b/app/assets/stylesheets/common/colorpicker.css.scss @@ -1,7 +1,7 @@ // styles for the category badge color picker -@import "foundation/variables"; -@import "foundation/mixins"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; .category-color-editor { input { diff --git a/app/assets/stylesheets/application/combobox.css.scss b/app/assets/stylesheets/common/combobox.css.scss similarity index 100% rename from app/assets/stylesheets/application/combobox.css.scss rename to app/assets/stylesheets/common/combobox.css.scss diff --git a/app/assets/stylesheets/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss similarity index 95% rename from app/assets/stylesheets/components/badges.css.scss rename to app/assets/stylesheets/common/components/badges.css.scss index 3b5b076477f..afd2d4df3fc 100644 --- a/app/assets/stylesheets/components/badges.css.scss +++ b/app/assets/stylesheets/common/components/badges.css.scss @@ -1,5 +1,5 @@ -@import "foundation/variables"; -@import "foundation/mixins"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; // -------------------------------------------------- // Badges diff --git a/app/assets/stylesheets/components/buttons.css.scss b/app/assets/stylesheets/common/components/buttons.css.scss similarity index 98% rename from app/assets/stylesheets/components/buttons.css.scss rename to app/assets/stylesheets/common/components/buttons.css.scss index 89ecf108908..0ac864dd7b4 100644 --- a/app/assets/stylesheets/components/buttons.css.scss +++ b/app/assets/stylesheets/common/components/buttons.css.scss @@ -1,5 +1,5 @@ -@import "foundation/variables"; -@import "foundation/mixins"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; // -------------------------------------------------- // Buttons diff --git a/app/assets/stylesheets/components/navs.css.scss b/app/assets/stylesheets/common/components/navs.css.scss similarity index 95% rename from app/assets/stylesheets/components/navs.css.scss rename to app/assets/stylesheets/common/components/navs.css.scss index 3f2ae83acb6..bbab224c839 100644 --- a/app/assets/stylesheets/components/navs.css.scss +++ b/app/assets/stylesheets/common/components/navs.css.scss @@ -1,6 +1,6 @@ -@import "foundation/variables"; -@import "foundation/mixins"; -@import "foundation/helpers"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; +@import "common/foundation/helpers"; // -------------------------------------------------- // Navigation menus diff --git a/app/assets/stylesheets/application/compose.css.scss b/app/assets/stylesheets/common/compose.css.scss similarity index 99% rename from app/assets/stylesheets/application/compose.css.scss rename to app/assets/stylesheets/common/compose.css.scss index b2c872951ad..620a2abb792 100644 --- a/app/assets/stylesheets/application/compose.css.scss +++ b/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 "foundation/mixins"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; // hack, this needs to be done cleaner .private-message input.span8 { diff --git a/app/assets/stylesheets/application/discourse.css.scss b/app/assets/stylesheets/common/discourse.css.scss similarity index 97% rename from app/assets/stylesheets/application/discourse.css.scss rename to app/assets/stylesheets/common/discourse.css.scss index c33d1b0edd0..d8a472828d8 100644 --- a/app/assets/stylesheets/application/discourse.css.scss +++ b/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 "foundation/mixins"; -@import "foundation/helpers"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; +@import "common/foundation/helpers"; body { min-width: $large-width; diff --git a/app/assets/stylesheets/application/faqs.css.scss b/app/assets/stylesheets/common/faqs.css.scss similarity index 87% rename from app/assets/stylesheets/application/faqs.css.scss rename to app/assets/stylesheets/common/faqs.css.scss index 90468a3b215..3309f2f60bb 100644 --- a/app/assets/stylesheets/application/faqs.css.scss +++ b/app/assets/stylesheets/common/faqs.css.scss @@ -1,6 +1,6 @@ -@import "foundation/variables"; -@import "foundation/mixins"; -@import "foundation/helpers"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; +@import "common/foundation/helpers"; // -------------------------------------------------- // FAQs diff --git a/app/assets/stylesheets/foundation/base.css.scss b/app/assets/stylesheets/common/foundation/base.css.scss similarity index 100% rename from app/assets/stylesheets/foundation/base.css.scss rename to app/assets/stylesheets/common/foundation/base.css.scss diff --git a/app/assets/stylesheets/foundation/helpers.css.scss b/app/assets/stylesheets/common/foundation/helpers.css.scss similarity index 100% rename from app/assets/stylesheets/foundation/helpers.css.scss rename to app/assets/stylesheets/common/foundation/helpers.css.scss diff --git a/app/assets/stylesheets/foundation/mixins.scss b/app/assets/stylesheets/common/foundation/mixins.scss similarity index 100% rename from app/assets/stylesheets/foundation/mixins.scss rename to app/assets/stylesheets/common/foundation/mixins.scss diff --git a/app/assets/stylesheets/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss similarity index 100% rename from app/assets/stylesheets/foundation/variables.scss rename to app/assets/stylesheets/common/foundation/variables.scss diff --git a/app/assets/stylesheets/application/header.css.scss b/app/assets/stylesheets/common/header.css.scss similarity index 98% rename from app/assets/stylesheets/application/header.css.scss rename to app/assets/stylesheets/common/header.css.scss index a1687f4f817..5727988571d 100644 --- a/app/assets/stylesheets/application/header.css.scss +++ b/app/assets/stylesheets/common/header.css.scss @@ -1,5 +1,5 @@ -@import "foundation/variables"; -@import "foundation/mixins"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; // -------------------------------------------------- // Discourse header diff --git a/app/assets/stylesheets/application/history.css.scss b/app/assets/stylesheets/common/history.css.scss similarity index 89% rename from app/assets/stylesheets/application/history.css.scss rename to app/assets/stylesheets/common/history.css.scss index ca4bc56b5c4..c8d61556bdf 100644 --- a/app/assets/stylesheets/application/history.css.scss +++ b/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 "foundation/mixins"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; .modal.history-modal { .modal-inner-container { diff --git a/app/assets/stylesheets/application/hotness_control.css.scss b/app/assets/stylesheets/common/hotness_control.css.scss similarity index 84% rename from app/assets/stylesheets/application/hotness_control.css.scss rename to app/assets/stylesheets/common/hotness_control.css.scss index c8abeab6ee3..462fedc1749 100644 --- a/app/assets/stylesheets/application/hotness_control.css.scss +++ b/app/assets/stylesheets/common/hotness_control.css.scss @@ -1,7 +1,7 @@ // styles for the 'hotness control' -@import "foundation/variables"; -@import "foundation/mixins"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; .hotness-control { margin-bottom: 5px; diff --git a/app/assets/stylesheets/application/input_tip.css.scss b/app/assets/stylesheets/common/input_tip.css.scss similarity index 86% rename from app/assets/stylesheets/application/input_tip.css.scss rename to app/assets/stylesheets/common/input_tip.css.scss index fabfdaba7ae..e87ff9d49a7 100644 --- a/app/assets/stylesheets/application/input_tip.css.scss +++ b/app/assets/stylesheets/common/input_tip.css.scss @@ -1,5 +1,5 @@ -@import "foundation/variables"; -@import "foundation/mixins"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; .popup-tip { position: absolute; diff --git a/app/assets/stylesheets/application/lightbox.css.scss b/app/assets/stylesheets/common/lightbox.css.scss similarity index 92% rename from app/assets/stylesheets/application/lightbox.css.scss rename to app/assets/stylesheets/common/lightbox.css.scss index 172312771db..06c9443fa7f 100644 --- a/app/assets/stylesheets/application/lightbox.css.scss +++ b/app/assets/stylesheets/common/lightbox.css.scss @@ -1,5 +1,5 @@ -@import "foundation/variables"; -@import "foundation/mixins"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; .lightbox { position: relative; diff --git a/app/assets/stylesheets/application/login.css.scss b/app/assets/stylesheets/common/login.css.scss similarity index 79% rename from app/assets/stylesheets/application/login.css.scss rename to app/assets/stylesheets/common/login.css.scss index 82d4410d691..71923e1030f 100644 --- a/app/assets/stylesheets/application/login.css.scss +++ b/app/assets/stylesheets/common/login.css.scss @@ -1,7 +1,7 @@ // style that apply to the login popup -@import "foundation/variables"; -@import "foundation/mixins"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; #login-buttons { button { diff --git a/app/assets/stylesheets/application/magnific-popup.css.scss b/app/assets/stylesheets/common/magnific-popup.css.scss similarity index 100% rename from app/assets/stylesheets/application/magnific-popup.css.scss rename to app/assets/stylesheets/common/magnific-popup.css.scss diff --git a/app/assets/stylesheets/application/mobile.scss b/app/assets/stylesheets/common/mobile.scss similarity index 100% rename from app/assets/stylesheets/application/mobile.scss rename to app/assets/stylesheets/common/mobile.scss diff --git a/app/assets/stylesheets/application/modal.css.scss b/app/assets/stylesheets/common/modal.css.scss similarity index 98% rename from app/assets/stylesheets/application/modal.css.scss rename to app/assets/stylesheets/common/modal.css.scss index 8cca44b6b17..4589c5b6e63 100644 --- a/app/assets/stylesheets/application/modal.css.scss +++ b/app/assets/stylesheets/common/modal.css.scss @@ -1,7 +1,7 @@ // base styles for every modal popup used in Discourse -@import "foundation/variables"; -@import "foundation/mixins"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; .modal-open { .dropdown-menu { diff --git a/app/assets/stylesheets/application/onebox.scss b/app/assets/stylesheets/common/onebox.scss similarity index 95% rename from app/assets/stylesheets/application/onebox.scss rename to app/assets/stylesheets/common/onebox.scss index 41ac84608de..3ec03708fcb 100644 --- a/app/assets/stylesheets/application/onebox.scss +++ b/app/assets/stylesheets/common/onebox.scss @@ -1,5 +1,5 @@ -@import "foundation/variables"; -@import "foundation/mixins"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; a.loading-onebox { background: { diff --git a/app/assets/stylesheets/application/pagedown.css.scss b/app/assets/stylesheets/common/pagedown.css.scss similarity index 98% rename from app/assets/stylesheets/application/pagedown.css.scss rename to app/assets/stylesheets/common/pagedown.css.scss index 2aa3941e1e6..5922d1ddaee 100644 --- a/app/assets/stylesheets/application/pagedown.css.scss +++ b/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%; diff --git a/app/assets/stylesheets/application/request_access.css.scss b/app/assets/stylesheets/common/request_access.css.scss similarity index 100% rename from app/assets/stylesheets/application/request_access.css.scss rename to app/assets/stylesheets/common/request_access.css.scss diff --git a/app/assets/stylesheets/application/share_link.css.scss b/app/assets/stylesheets/common/share_link.css.scss similarity index 89% rename from app/assets/stylesheets/application/share_link.css.scss rename to app/assets/stylesheets/common/share_link.css.scss index a80ef0c9a73..3ffdc039a30 100644 --- a/app/assets/stylesheets/application/share_link.css.scss +++ b/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 "foundation/mixins"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; #share-link { position: absolute; diff --git a/app/assets/stylesheets/application/topic-admin-menu.css.scss b/app/assets/stylesheets/common/topic-admin-menu.css.scss similarity index 84% rename from app/assets/stylesheets/application/topic-admin-menu.css.scss rename to app/assets/stylesheets/common/topic-admin-menu.css.scss index 78d0f7c93d4..3c92283858f 100644 --- a/app/assets/stylesheets/application/topic-admin-menu.css.scss +++ b/app/assets/stylesheets/common/topic-admin-menu.css.scss @@ -1,7 +1,7 @@ // Styles for the topic admin menu -@import "foundation/variables"; -@import "foundation/mixins"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; #show-topic-admin { position: fixed; diff --git a/app/assets/stylesheets/application/topic-list.css.scss b/app/assets/stylesheets/common/topic-list.css.scss similarity index 98% rename from app/assets/stylesheets/application/topic-list.css.scss rename to app/assets/stylesheets/common/topic-list.css.scss index 2879327af49..c513aa36047 100644 --- a/app/assets/stylesheets/application/topic-list.css.scss +++ b/app/assets/stylesheets/common/topic-list.css.scss @@ -1,5 +1,5 @@ -@import "foundation/variables"; -@import "foundation/mixins"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; // -------------------------------------------------- // Topic lists diff --git a/app/assets/stylesheets/application/topic-post.css.scss b/app/assets/stylesheets/common/topic-post.css.scss similarity index 99% rename from app/assets/stylesheets/application/topic-post.css.scss rename to app/assets/stylesheets/common/topic-post.css.scss index 806e10ae36f..4d7bf7de14b 100644 --- a/app/assets/stylesheets/application/topic-post.css.scss +++ b/app/assets/stylesheets/common/topic-post.css.scss @@ -1,5 +1,5 @@ -@import "foundation/variables"; -@import "foundation/mixins"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; @include small-width { #selected-posts { diff --git a/app/assets/stylesheets/application/topic.css.scss b/app/assets/stylesheets/common/topic.css.scss similarity index 99% rename from app/assets/stylesheets/application/topic.css.scss rename to app/assets/stylesheets/common/topic.css.scss index 4e719d7c550..15a71f77b1a 100644 --- a/app/assets/stylesheets/application/topic.css.scss +++ b/app/assets/stylesheets/common/topic.css.scss @@ -1,7 +1,7 @@ /* styles that apply when viewing a topic/topic */ -@import "foundation/variables"; -@import "foundation/mixins"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; // Topic title // -------------------------------------------------- diff --git a/app/assets/stylesheets/application/upload.css.scss b/app/assets/stylesheets/common/upload.css.scss similarity index 86% rename from app/assets/stylesheets/application/upload.css.scss rename to app/assets/stylesheets/common/upload.css.scss index d68869493b0..43414d17cae 100644 --- a/app/assets/stylesheets/application/upload.css.scss +++ b/app/assets/stylesheets/common/upload.css.scss @@ -1,5 +1,5 @@ -@import "foundation/variables"; -@import "foundation/mixins"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; .add-upload .icon-plus { font-size: 10px; diff --git a/app/assets/stylesheets/application/user.css.scss b/app/assets/stylesheets/common/user.css.scss similarity index 98% rename from app/assets/stylesheets/application/user.css.scss rename to app/assets/stylesheets/common/user.css.scss index 2fadb72b905..1f3c1c88e82 100644 --- a/app/assets/stylesheets/application/user.css.scss +++ b/app/assets/stylesheets/common/user.css.scss @@ -1,6 +1,6 @@ // styles that apply to the user page -@import "foundation/variables"; -@import "foundation/mixins"; +@import "common/foundation/variables"; +@import "common/foundation/mixins"; .user-preferences { textarea { diff --git a/app/assets/stylesheets/application/username_tagsinput.css b/app/assets/stylesheets/common/username_tagsinput.css similarity index 100% rename from app/assets/stylesheets/application/username_tagsinput.css rename to app/assets/stylesheets/common/username_tagsinput.css diff --git a/app/assets/stylesheets/mobile.css.erb b/app/assets/stylesheets/mobile.css.erb index 54d3e8e87c6..1e8d52e20fc 100644 --- a/app/assets/stylesheets/mobile.css.erb +++ b/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 \ No newline at end of file diff --git a/app/assets/stylesheets/vendor/bootstrap.css.scss b/app/assets/stylesheets/vendor/bootstrap.css.scss index 2b3803daddb..d39fb63994e 100644 --- a/app/assets/stylesheets/vendor/bootstrap.css.scss +++ b/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; diff --git a/app/assets/stylesheets/vendor/font_awesome/_core.scss b/app/assets/stylesheets/vendor/font_awesome/_core.scss index 0189c73dfb6..a62d36bec3b 100644 --- a/app/assets/stylesheets/vendor/font_awesome/_core.scss +++ b/app/assets/stylesheets/vendor/font_awesome/_core.scss @@ -1,6 +1,7 @@ /* FONT AWESOME CORE * -------------------------- */ + [class^="icon-"], [class*=" icon-"] { @include icon-FontAwesome();