diff --git a/app/styles/soapbox/_mixins.scss b/app/styles/_mixins.scss similarity index 100% rename from app/styles/soapbox/_mixins.scss rename to app/styles/_mixins.scss diff --git a/app/styles/soapbox/about.scss b/app/styles/about.scss similarity index 100% rename from app/styles/soapbox/about.scss rename to app/styles/about.scss diff --git a/app/styles/soapbox/accessibility.scss b/app/styles/accessibility.scss similarity index 100% rename from app/styles/soapbox/accessibility.scss rename to app/styles/accessibility.scss diff --git a/app/styles/soapbox/accounts.scss b/app/styles/accounts.scss similarity index 100% rename from app/styles/soapbox/accounts.scss rename to app/styles/accounts.scss diff --git a/app/styles/application.scss b/app/styles/application.scss index 0fe9ed5d7..0f5cfbe2d 100644 --- a/app/styles/application.scss +++ b/app/styles/application.scss @@ -1,48 +1,48 @@ -@import 'soapbox/mixins'; -@import 'soapbox/variables'; -@import 'soapbox/fonts'; -@import 'soapbox/reset'; -@import 'soapbox/basics'; -@import 'soapbox/containers'; -@import 'soapbox/lists'; -@import 'soapbox/footer'; -@import 'soapbox/compact_header'; -@import 'soapbox/widgets'; -@import 'soapbox/forms'; -@import 'soapbox/accounts'; -@import 'soapbox/stream_entries'; -@import 'soapbox/boost'; +@import 'mixins'; +@import 'variables'; +@import 'fonts'; +@import 'reset'; +@import 'basics'; +@import 'containers'; +@import 'lists'; +@import 'footer'; +@import 'compact_header'; +@import 'widgets'; +@import 'forms'; +@import 'accounts'; +@import 'stream_entries'; +@import 'boost'; // NOTE - In the process of stripping this giant file into individual components (below) -@import 'soapbox/components'; +@import 'components'; // COMPONENTS -@import 'soapbox/components/buttons'; -@import 'soapbox/components/inputs'; -@import 'soapbox/components/tabs-bar'; -@import 'soapbox/components/dropdown-menu'; -@import 'soapbox/components/modal'; -@import 'soapbox/components/account-header'; -@import 'soapbox/components/user-panel'; -@import 'soapbox/components/compose-form'; -@import 'soapbox/components/group-card'; -@import 'soapbox/components/group-detail'; -@import 'soapbox/components/group-form'; -@import 'soapbox/components/group-sidebar-panel'; -@import 'soapbox/components/sidebar-menu'; -@import 'soapbox/components/hotkeys-modal'; -@import 'soapbox/components/emoji-reacts'; -@import 'soapbox/components/detailed-status'; +@import 'components/buttons'; +@import 'components/inputs'; +@import 'components/tabs-bar'; +@import 'components/dropdown-menu'; +@import 'components/modal'; +@import 'components/account-header'; +@import 'components/user-panel'; +@import 'components/compose-form'; +@import 'components/group-card'; +@import 'components/group-detail'; +@import 'components/group-form'; +@import 'components/group-sidebar-panel'; +@import 'components/sidebar-menu'; +@import 'components/hotkeys-modal'; +@import 'components/emoji-reacts'; +@import 'components/detailed-status'; -@import 'soapbox/polls'; -@import 'soapbox/introduction'; -@import 'soapbox/emoji_picker'; -@import 'soapbox/about'; -@import 'soapbox/tables'; -@import 'soapbox/dashboard'; -@import 'soapbox/rtl'; -@import 'soapbox/accessibility'; -@import 'soapbox/donations'; -@import 'soapbox/dyslexic'; -@import 'soapbox/demetricator'; -@import 'soapbox/pro'; +@import 'polls'; +@import 'introduction'; +@import 'emoji_picker'; +@import 'about'; +@import 'tables'; +@import 'dashboard'; +@import 'rtl'; +@import 'accessibility'; +@import 'donations'; +@import 'dyslexic'; +@import 'demetricator'; +@import 'pro'; diff --git a/app/styles/soapbox/basics.scss b/app/styles/basics.scss similarity index 100% rename from app/styles/soapbox/basics.scss rename to app/styles/basics.scss diff --git a/app/styles/soapbox/boost.scss b/app/styles/boost.scss similarity index 100% rename from app/styles/soapbox/boost.scss rename to app/styles/boost.scss diff --git a/app/styles/soapbox/compact_header.scss b/app/styles/compact_header.scss similarity index 100% rename from app/styles/soapbox/compact_header.scss rename to app/styles/compact_header.scss diff --git a/app/styles/soapbox/components.scss b/app/styles/components.scss similarity index 100% rename from app/styles/soapbox/components.scss rename to app/styles/components.scss diff --git a/app/styles/soapbox/components/account-header.scss b/app/styles/components/account-header.scss similarity index 100% rename from app/styles/soapbox/components/account-header.scss rename to app/styles/components/account-header.scss diff --git a/app/styles/soapbox/components/buttons.scss b/app/styles/components/buttons.scss similarity index 100% rename from app/styles/soapbox/components/buttons.scss rename to app/styles/components/buttons.scss diff --git a/app/styles/soapbox/components/compose-form.scss b/app/styles/components/compose-form.scss similarity index 100% rename from app/styles/soapbox/components/compose-form.scss rename to app/styles/components/compose-form.scss diff --git a/app/styles/soapbox/components/detailed-status.scss b/app/styles/components/detailed-status.scss similarity index 100% rename from app/styles/soapbox/components/detailed-status.scss rename to app/styles/components/detailed-status.scss diff --git a/app/styles/soapbox/components/dropdown-menu.scss b/app/styles/components/dropdown-menu.scss similarity index 100% rename from app/styles/soapbox/components/dropdown-menu.scss rename to app/styles/components/dropdown-menu.scss diff --git a/app/styles/soapbox/components/emoji-reacts.scss b/app/styles/components/emoji-reacts.scss similarity index 100% rename from app/styles/soapbox/components/emoji-reacts.scss rename to app/styles/components/emoji-reacts.scss diff --git a/app/styles/soapbox/components/group-card.scss b/app/styles/components/group-card.scss similarity index 100% rename from app/styles/soapbox/components/group-card.scss rename to app/styles/components/group-card.scss diff --git a/app/styles/soapbox/components/group-detail.scss b/app/styles/components/group-detail.scss similarity index 100% rename from app/styles/soapbox/components/group-detail.scss rename to app/styles/components/group-detail.scss diff --git a/app/styles/soapbox/components/group-form.scss b/app/styles/components/group-form.scss similarity index 100% rename from app/styles/soapbox/components/group-form.scss rename to app/styles/components/group-form.scss diff --git a/app/styles/soapbox/components/group-sidebar-panel.scss b/app/styles/components/group-sidebar-panel.scss similarity index 100% rename from app/styles/soapbox/components/group-sidebar-panel.scss rename to app/styles/components/group-sidebar-panel.scss diff --git a/app/styles/soapbox/components/hotkeys-modal.scss b/app/styles/components/hotkeys-modal.scss similarity index 100% rename from app/styles/soapbox/components/hotkeys-modal.scss rename to app/styles/components/hotkeys-modal.scss diff --git a/app/styles/soapbox/components/inputs.scss b/app/styles/components/inputs.scss similarity index 100% rename from app/styles/soapbox/components/inputs.scss rename to app/styles/components/inputs.scss diff --git a/app/styles/soapbox/components/modal.scss b/app/styles/components/modal.scss similarity index 100% rename from app/styles/soapbox/components/modal.scss rename to app/styles/components/modal.scss diff --git a/app/styles/soapbox/components/sidebar-menu.scss b/app/styles/components/sidebar-menu.scss similarity index 100% rename from app/styles/soapbox/components/sidebar-menu.scss rename to app/styles/components/sidebar-menu.scss diff --git a/app/styles/soapbox/components/tabs-bar.scss b/app/styles/components/tabs-bar.scss similarity index 100% rename from app/styles/soapbox/components/tabs-bar.scss rename to app/styles/components/tabs-bar.scss diff --git a/app/styles/soapbox/components/user-panel.scss b/app/styles/components/user-panel.scss similarity index 100% rename from app/styles/soapbox/components/user-panel.scss rename to app/styles/components/user-panel.scss diff --git a/app/styles/soapbox/containers.scss b/app/styles/containers.scss similarity index 100% rename from app/styles/soapbox/containers.scss rename to app/styles/containers.scss diff --git a/app/styles/soapbox/dashboard.scss b/app/styles/dashboard.scss similarity index 100% rename from app/styles/soapbox/dashboard.scss rename to app/styles/dashboard.scss diff --git a/app/styles/soapbox/demetricator.scss b/app/styles/demetricator.scss similarity index 100% rename from app/styles/soapbox/demetricator.scss rename to app/styles/demetricator.scss diff --git a/app/styles/soapbox/donations.scss b/app/styles/donations.scss similarity index 100% rename from app/styles/soapbox/donations.scss rename to app/styles/donations.scss diff --git a/app/styles/soapbox/dyslexic.scss b/app/styles/dyslexic.scss similarity index 100% rename from app/styles/soapbox/dyslexic.scss rename to app/styles/dyslexic.scss diff --git a/app/styles/soapbox/emoji_picker.scss b/app/styles/emoji_picker.scss similarity index 100% rename from app/styles/soapbox/emoji_picker.scss rename to app/styles/emoji_picker.scss diff --git a/app/styles/soapbox/fonts.scss b/app/styles/fonts.scss similarity index 100% rename from app/styles/soapbox/fonts.scss rename to app/styles/fonts.scss diff --git a/app/styles/soapbox/footer.scss b/app/styles/footer.scss similarity index 100% rename from app/styles/soapbox/footer.scss rename to app/styles/footer.scss diff --git a/app/styles/soapbox/forms.scss b/app/styles/forms.scss similarity index 100% rename from app/styles/soapbox/forms.scss rename to app/styles/forms.scss diff --git a/app/styles/soapbox/introduction.scss b/app/styles/introduction.scss similarity index 100% rename from app/styles/soapbox/introduction.scss rename to app/styles/introduction.scss diff --git a/app/styles/soapbox/lists.scss b/app/styles/lists.scss similarity index 100% rename from app/styles/soapbox/lists.scss rename to app/styles/lists.scss diff --git a/app/styles/soapbox/modal.scss b/app/styles/modal.scss similarity index 100% rename from app/styles/soapbox/modal.scss rename to app/styles/modal.scss diff --git a/app/styles/soapbox/polls.scss b/app/styles/polls.scss similarity index 100% rename from app/styles/soapbox/polls.scss rename to app/styles/polls.scss diff --git a/app/styles/soapbox/pro.scss b/app/styles/pro.scss similarity index 100% rename from app/styles/soapbox/pro.scss rename to app/styles/pro.scss diff --git a/app/styles/soapbox/reset.scss b/app/styles/reset.scss similarity index 100% rename from app/styles/soapbox/reset.scss rename to app/styles/reset.scss diff --git a/app/styles/soapbox/rtl.scss b/app/styles/rtl.scss similarity index 100% rename from app/styles/soapbox/rtl.scss rename to app/styles/rtl.scss diff --git a/app/styles/soapbox/stream_entries.scss b/app/styles/stream_entries.scss similarity index 100% rename from app/styles/soapbox/stream_entries.scss rename to app/styles/stream_entries.scss diff --git a/app/styles/soapbox/tables.scss b/app/styles/tables.scss similarity index 100% rename from app/styles/soapbox/tables.scss rename to app/styles/tables.scss diff --git a/app/styles/soapbox/variables.scss b/app/styles/variables.scss similarity index 100% rename from app/styles/soapbox/variables.scss rename to app/styles/variables.scss diff --git a/app/styles/soapbox/widgets.scss b/app/styles/widgets.scss similarity index 100% rename from app/styles/soapbox/widgets.scss rename to app/styles/widgets.scss