]> cat aescling's git repositories - mastodon.git/commitdiff
Make theme directory and Rename application.scss (#5336)
authorYaQ <i_k_o_m_a_7@yahoo.co.jp>
Tue, 17 Oct 2017 20:20:07 +0000 (05:20 +0900)
committerunarist <m.unarist@gmail.com>
Tue, 17 Oct 2017 20:20:07 +0000 (05:20 +0900)
* Rename application.scss

* Move to 'default' directory

* Follow review

Move directory, and Rename "mastodon".

* Revert rename

* undo removal of newline

20 files changed:
app/javascript/styles/application.scss
app/javascript/styles/mastodon/_mixins.scss [moved from app/javascript/styles/_mixins.scss with 100% similarity]
app/javascript/styles/mastodon/about.scss [moved from app/javascript/styles/about.scss with 100% similarity]
app/javascript/styles/mastodon/accounts.scss [moved from app/javascript/styles/accounts.scss with 100% similarity]
app/javascript/styles/mastodon/admin.scss [moved from app/javascript/styles/admin.scss with 100% similarity]
app/javascript/styles/mastodon/basics.scss [moved from app/javascript/styles/basics.scss with 100% similarity]
app/javascript/styles/mastodon/boost.scss [moved from app/javascript/styles/boost.scss with 100% similarity]
app/javascript/styles/mastodon/compact_header.scss [moved from app/javascript/styles/compact_header.scss with 100% similarity]
app/javascript/styles/mastodon/components.scss [moved from app/javascript/styles/components.scss with 100% similarity]
app/javascript/styles/mastodon/containers.scss [moved from app/javascript/styles/containers.scss with 100% similarity]
app/javascript/styles/mastodon/emoji_picker.scss [moved from app/javascript/styles/emoji_picker.scss with 100% similarity]
app/javascript/styles/mastodon/footer.scss [moved from app/javascript/styles/footer.scss with 100% similarity]
app/javascript/styles/mastodon/forms.scss [moved from app/javascript/styles/forms.scss with 100% similarity]
app/javascript/styles/mastodon/landing_strip.scss [moved from app/javascript/styles/landing_strip.scss with 100% similarity]
app/javascript/styles/mastodon/lists.scss [moved from app/javascript/styles/lists.scss with 100% similarity]
app/javascript/styles/mastodon/reset.scss [moved from app/javascript/styles/reset.scss with 100% similarity]
app/javascript/styles/mastodon/rtl.scss [moved from app/javascript/styles/rtl.scss with 100% similarity]
app/javascript/styles/mastodon/stream_entries.scss [moved from app/javascript/styles/stream_entries.scss with 100% similarity]
app/javascript/styles/mastodon/tables.scss [moved from app/javascript/styles/tables.scss with 100% similarity]
app/javascript/styles/mastodon/variables.scss [moved from app/javascript/styles/variables.scss with 100% similarity]

index 0eb6ac6d853bfa0b3286f13ba4534f65e4af3998..44aa105645a01ca1fead9776442255cfadd14e4e 100644 (file)
@@ -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';