From 6e5471947438fc5883e72b8184663564ffadee28 Mon Sep 17 00:00:00 2001
From: YaQ <i_k_o_m_a_7@yahoo.co.jp>
Date: Wed, 18 Oct 2017 05:20:07 +0900
Subject: [PATCH] Make theme directory and Rename application.scss (#5336)

* Rename application.scss

* Move to 'default' directory

* Follow review

Move directory, and Rename "mastodon".

* Revert rename

* undo removal of newline
---
 app/javascript/styles/application.scss        | 36 +++++++++----------
 .../styles/{ => mastodon}/_mixins.scss        |  0
 .../styles/{ => mastodon}/about.scss          |  0
 .../styles/{ => mastodon}/accounts.scss       |  0
 .../styles/{ => mastodon}/admin.scss          |  0
 .../styles/{ => mastodon}/basics.scss         |  0
 .../styles/{ => mastodon}/boost.scss          |  0
 .../styles/{ => mastodon}/compact_header.scss |  0
 .../styles/{ => mastodon}/components.scss     |  0
 .../styles/{ => mastodon}/containers.scss     |  0
 .../styles/{ => mastodon}/emoji_picker.scss   |  0
 .../styles/{ => mastodon}/footer.scss         |  0
 .../styles/{ => mastodon}/forms.scss          |  0
 .../styles/{ => mastodon}/landing_strip.scss  |  0
 .../styles/{ => mastodon}/lists.scss          |  0
 .../styles/{ => mastodon}/reset.scss          |  0
 app/javascript/styles/{ => mastodon}/rtl.scss |  0
 .../styles/{ => mastodon}/stream_entries.scss |  0
 .../styles/{ => mastodon}/tables.scss         |  0
 .../styles/{ => mastodon}/variables.scss      |  0
 20 files changed, 18 insertions(+), 18 deletions(-)
 rename app/javascript/styles/{ => mastodon}/_mixins.scss (100%)
 rename app/javascript/styles/{ => mastodon}/about.scss (100%)
 rename app/javascript/styles/{ => mastodon}/accounts.scss (100%)
 rename app/javascript/styles/{ => mastodon}/admin.scss (100%)
 rename app/javascript/styles/{ => mastodon}/basics.scss (100%)
 rename app/javascript/styles/{ => mastodon}/boost.scss (100%)
 rename app/javascript/styles/{ => mastodon}/compact_header.scss (100%)
 rename app/javascript/styles/{ => mastodon}/components.scss (100%)
 rename app/javascript/styles/{ => mastodon}/containers.scss (100%)
 rename app/javascript/styles/{ => mastodon}/emoji_picker.scss (100%)
 rename app/javascript/styles/{ => mastodon}/footer.scss (100%)
 rename app/javascript/styles/{ => mastodon}/forms.scss (100%)
 rename app/javascript/styles/{ => mastodon}/landing_strip.scss (100%)
 rename app/javascript/styles/{ => mastodon}/lists.scss (100%)
 rename app/javascript/styles/{ => mastodon}/reset.scss (100%)
 rename app/javascript/styles/{ => mastodon}/rtl.scss (100%)
 rename app/javascript/styles/{ => mastodon}/stream_entries.scss (100%)
 rename app/javascript/styles/{ => mastodon}/tables.scss (100%)
 rename app/javascript/styles/{ => mastodon}/variables.scss (100%)

diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss
index 0eb6ac6d85..44aa105645 100644
--- a/app/javascript/styles/application.scss
+++ b/app/javascript/styles/application.scss
@@ -1,22 +1,22 @@
-@import 'mixins';
-@import 'variables';
+@import 'mastodon/mixins';
+@import 'mastodon/variables';
 @import 'fonts/roboto';
 @import 'fonts/roboto-mono';
 @import 'fonts/montserrat';
 
-@import 'reset';
-@import 'basics';
-@import 'containers';
-@import 'lists';
-@import 'footer';
-@import 'compact_header';
-@import 'landing_strip';
-@import 'forms';
-@import 'accounts';
-@import 'stream_entries';
-@import 'components';
-@import 'emoji_picker';
-@import 'about';
-@import 'tables';
-@import 'admin';
-@import 'rtl';
+@import 'mastodon/reset';
+@import 'mastodon/basics';
+@import 'mastodon/containers';
+@import 'mastodon/lists';
+@import 'mastodon/footer';
+@import 'mastodon/compact_header';
+@import 'mastodon/landing_strip';
+@import 'mastodon/forms';
+@import 'mastodon/accounts';
+@import 'mastodon/stream_entries';
+@import 'mastodon/components';
+@import 'mastodon/emoji_picker';
+@import 'mastodon/about';
+@import 'mastodon/tables';
+@import 'mastodon/admin';
+@import 'mastodon/rtl';
diff --git a/app/javascript/styles/_mixins.scss b/app/javascript/styles/mastodon/_mixins.scss
similarity index 100%
rename from app/javascript/styles/_mixins.scss
rename to app/javascript/styles/mastodon/_mixins.scss
diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/mastodon/about.scss
similarity index 100%
rename from app/javascript/styles/about.scss
rename to app/javascript/styles/mastodon/about.scss
diff --git a/app/javascript/styles/accounts.scss b/app/javascript/styles/mastodon/accounts.scss
similarity index 100%
rename from app/javascript/styles/accounts.scss
rename to app/javascript/styles/mastodon/accounts.scss
diff --git a/app/javascript/styles/admin.scss b/app/javascript/styles/mastodon/admin.scss
similarity index 100%
rename from app/javascript/styles/admin.scss
rename to app/javascript/styles/mastodon/admin.scss
diff --git a/app/javascript/styles/basics.scss b/app/javascript/styles/mastodon/basics.scss
similarity index 100%
rename from app/javascript/styles/basics.scss
rename to app/javascript/styles/mastodon/basics.scss
diff --git a/app/javascript/styles/boost.scss b/app/javascript/styles/mastodon/boost.scss
similarity index 100%
rename from app/javascript/styles/boost.scss
rename to app/javascript/styles/mastodon/boost.scss
diff --git a/app/javascript/styles/compact_header.scss b/app/javascript/styles/mastodon/compact_header.scss
similarity index 100%
rename from app/javascript/styles/compact_header.scss
rename to app/javascript/styles/mastodon/compact_header.scss
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/mastodon/components.scss
similarity index 100%
rename from app/javascript/styles/components.scss
rename to app/javascript/styles/mastodon/components.scss
diff --git a/app/javascript/styles/containers.scss b/app/javascript/styles/mastodon/containers.scss
similarity index 100%
rename from app/javascript/styles/containers.scss
rename to app/javascript/styles/mastodon/containers.scss
diff --git a/app/javascript/styles/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss
similarity index 100%
rename from app/javascript/styles/emoji_picker.scss
rename to app/javascript/styles/mastodon/emoji_picker.scss
diff --git a/app/javascript/styles/footer.scss b/app/javascript/styles/mastodon/footer.scss
similarity index 100%
rename from app/javascript/styles/footer.scss
rename to app/javascript/styles/mastodon/footer.scss
diff --git a/app/javascript/styles/forms.scss b/app/javascript/styles/mastodon/forms.scss
similarity index 100%
rename from app/javascript/styles/forms.scss
rename to app/javascript/styles/mastodon/forms.scss
diff --git a/app/javascript/styles/landing_strip.scss b/app/javascript/styles/mastodon/landing_strip.scss
similarity index 100%
rename from app/javascript/styles/landing_strip.scss
rename to app/javascript/styles/mastodon/landing_strip.scss
diff --git a/app/javascript/styles/lists.scss b/app/javascript/styles/mastodon/lists.scss
similarity index 100%
rename from app/javascript/styles/lists.scss
rename to app/javascript/styles/mastodon/lists.scss
diff --git a/app/javascript/styles/reset.scss b/app/javascript/styles/mastodon/reset.scss
similarity index 100%
rename from app/javascript/styles/reset.scss
rename to app/javascript/styles/mastodon/reset.scss
diff --git a/app/javascript/styles/rtl.scss b/app/javascript/styles/mastodon/rtl.scss
similarity index 100%
rename from app/javascript/styles/rtl.scss
rename to app/javascript/styles/mastodon/rtl.scss
diff --git a/app/javascript/styles/stream_entries.scss b/app/javascript/styles/mastodon/stream_entries.scss
similarity index 100%
rename from app/javascript/styles/stream_entries.scss
rename to app/javascript/styles/mastodon/stream_entries.scss
diff --git a/app/javascript/styles/tables.scss b/app/javascript/styles/mastodon/tables.scss
similarity index 100%
rename from app/javascript/styles/tables.scss
rename to app/javascript/styles/mastodon/tables.scss
diff --git a/app/javascript/styles/variables.scss b/app/javascript/styles/mastodon/variables.scss
similarity index 100%
rename from app/javascript/styles/variables.scss
rename to app/javascript/styles/mastodon/variables.scss