diff options
author | YaQ <i_k_o_m_a_7@yahoo.co.jp> | 2017-10-18 05:20:07 +0900 |
---|---|---|
committer | unarist <m.unarist@gmail.com> | 2017-10-18 05:20:07 +0900 |
commit | 6e5471947438fc5883e72b8184663564ffadee28 (patch) | |
tree | 9593a5bbd3a3a7e514cea03faabe2320410a57ac /app/javascript/styles/application.scss | |
parent | f3003417c5e109f41912b3595536c6adae81c97b (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
Diffstat (limited to 'app/javascript/styles/application.scss')
-rw-r--r-- | app/javascript/styles/application.scss | 36 |
1 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'; |