about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYaQ <i_k_o_m_a_7@yahoo.co.jp>2017-10-18 05:20:07 +0900
committerunarist <m.unarist@gmail.com>2017-10-18 05:20:07 +0900
commit6e5471947438fc5883e72b8184663564ffadee28 (patch)
tree9593a5bbd3a3a7e514cea03faabe2320410a57ac
parentf3003417c5e109f41912b3595536c6adae81c97b (diff)
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
-rw-r--r--app/javascript/styles/application.scss36
-rw-r--r--app/javascript/styles/mastodon/_mixins.scss (renamed from app/javascript/styles/_mixins.scss)0
-rw-r--r--app/javascript/styles/mastodon/about.scss (renamed from app/javascript/styles/about.scss)0
-rw-r--r--app/javascript/styles/mastodon/accounts.scss (renamed from app/javascript/styles/accounts.scss)0
-rw-r--r--app/javascript/styles/mastodon/admin.scss (renamed from app/javascript/styles/admin.scss)0
-rw-r--r--app/javascript/styles/mastodon/basics.scss (renamed from app/javascript/styles/basics.scss)0
-rw-r--r--app/javascript/styles/mastodon/boost.scss (renamed from app/javascript/styles/boost.scss)0
-rw-r--r--app/javascript/styles/mastodon/compact_header.scss (renamed from app/javascript/styles/compact_header.scss)0
-rw-r--r--app/javascript/styles/mastodon/components.scss (renamed from app/javascript/styles/components.scss)0
-rw-r--r--app/javascript/styles/mastodon/containers.scss (renamed from app/javascript/styles/containers.scss)0
-rw-r--r--app/javascript/styles/mastodon/emoji_picker.scss (renamed from app/javascript/styles/emoji_picker.scss)0
-rw-r--r--app/javascript/styles/mastodon/footer.scss (renamed from app/javascript/styles/footer.scss)0
-rw-r--r--app/javascript/styles/mastodon/forms.scss (renamed from app/javascript/styles/forms.scss)0
-rw-r--r--app/javascript/styles/mastodon/landing_strip.scss (renamed from app/javascript/styles/landing_strip.scss)0
-rw-r--r--app/javascript/styles/mastodon/lists.scss (renamed from app/javascript/styles/lists.scss)0
-rw-r--r--app/javascript/styles/mastodon/reset.scss (renamed from app/javascript/styles/reset.scss)0
-rw-r--r--app/javascript/styles/mastodon/rtl.scss (renamed from app/javascript/styles/rtl.scss)0
-rw-r--r--app/javascript/styles/mastodon/stream_entries.scss (renamed from app/javascript/styles/stream_entries.scss)0
-rw-r--r--app/javascript/styles/mastodon/tables.scss (renamed from app/javascript/styles/tables.scss)0
-rw-r--r--app/javascript/styles/mastodon/variables.scss (renamed from app/javascript/styles/variables.scss)0
20 files changed, 18 insertions, 18 deletions
diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss
index 0eb6ac6d8..44aa10564 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
index 67d768a6c..67d768a6c 100644
--- a/app/javascript/styles/_mixins.scss
+++ b/app/javascript/styles/mastodon/_mixins.scss
diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/mastodon/about.scss
index 358d86eec..358d86eec 100644
--- a/app/javascript/styles/about.scss
+++ b/app/javascript/styles/mastodon/about.scss
diff --git a/app/javascript/styles/accounts.scss b/app/javascript/styles/mastodon/accounts.scss
index 30adf8cdc..30adf8cdc 100644
--- a/app/javascript/styles/accounts.scss
+++ b/app/javascript/styles/mastodon/accounts.scss
diff --git a/app/javascript/styles/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 87bc710af..87bc710af 100644
--- a/app/javascript/styles/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
diff --git a/app/javascript/styles/basics.scss b/app/javascript/styles/mastodon/basics.scss
index b5d77ff63..b5d77ff63 100644
--- a/app/javascript/styles/basics.scss
+++ b/app/javascript/styles/mastodon/basics.scss
diff --git a/app/javascript/styles/boost.scss b/app/javascript/styles/mastodon/boost.scss
index 31053decc..31053decc 100644
--- a/app/javascript/styles/boost.scss
+++ b/app/javascript/styles/mastodon/boost.scss
diff --git a/app/javascript/styles/compact_header.scss b/app/javascript/styles/mastodon/compact_header.scss
index 90d98cc8c..90d98cc8c 100644
--- a/app/javascript/styles/compact_header.scss
+++ b/app/javascript/styles/mastodon/compact_header.scss
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/mastodon/components.scss
index 5211489f7..5211489f7 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
diff --git a/app/javascript/styles/containers.scss b/app/javascript/styles/mastodon/containers.scss
index af2589e23..af2589e23 100644
--- a/app/javascript/styles/containers.scss
+++ b/app/javascript/styles/mastodon/containers.scss
diff --git a/app/javascript/styles/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss
index 2b46d30fc..2b46d30fc 100644
--- a/app/javascript/styles/emoji_picker.scss
+++ b/app/javascript/styles/mastodon/emoji_picker.scss
diff --git a/app/javascript/styles/footer.scss b/app/javascript/styles/mastodon/footer.scss
index 2d953b34e..2d953b34e 100644
--- a/app/javascript/styles/footer.scss
+++ b/app/javascript/styles/mastodon/footer.scss
diff --git a/app/javascript/styles/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 61fcf286f..61fcf286f 100644
--- a/app/javascript/styles/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
diff --git a/app/javascript/styles/landing_strip.scss b/app/javascript/styles/mastodon/landing_strip.scss
index 15ff84912..15ff84912 100644
--- a/app/javascript/styles/landing_strip.scss
+++ b/app/javascript/styles/mastodon/landing_strip.scss
diff --git a/app/javascript/styles/lists.scss b/app/javascript/styles/mastodon/lists.scss
index 6019cd800..6019cd800 100644
--- a/app/javascript/styles/lists.scss
+++ b/app/javascript/styles/mastodon/lists.scss
diff --git a/app/javascript/styles/reset.scss b/app/javascript/styles/mastodon/reset.scss
index cc5ba9d7c..cc5ba9d7c 100644
--- a/app/javascript/styles/reset.scss
+++ b/app/javascript/styles/mastodon/reset.scss
diff --git a/app/javascript/styles/rtl.scss b/app/javascript/styles/mastodon/rtl.scss
index 67bfa8a38..67bfa8a38 100644
--- a/app/javascript/styles/rtl.scss
+++ b/app/javascript/styles/mastodon/rtl.scss
diff --git a/app/javascript/styles/stream_entries.scss b/app/javascript/styles/mastodon/stream_entries.scss
index 4f323a378..4f323a378 100644
--- a/app/javascript/styles/stream_entries.scss
+++ b/app/javascript/styles/mastodon/stream_entries.scss
diff --git a/app/javascript/styles/tables.scss b/app/javascript/styles/mastodon/tables.scss
index ad46f5f9f..ad46f5f9f 100644
--- a/app/javascript/styles/tables.scss
+++ b/app/javascript/styles/mastodon/tables.scss
diff --git a/app/javascript/styles/variables.scss b/app/javascript/styles/mastodon/variables.scss
index 52c8cd1cf..52c8cd1cf 100644
--- a/app/javascript/styles/variables.scss
+++ b/app/javascript/styles/mastodon/variables.scss