logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 6e5471947438fc5883e72b8184663564ffadee28
parent: f3003417c5e109f41912b3595536c6adae81c97b
Author: YaQ <i_k_o_m_a_7@yahoo.co.jp>
Date:   Wed, 18 Oct 2017 05:20:07 +0900

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:

Mapp/javascript/styles/application.scss36++++++++++++++++++------------------
Rapp/javascript/styles/_mixins.scss -> app/javascript/styles/mastodon/_mixins.scss0
Rapp/javascript/styles/about.scss -> app/javascript/styles/mastodon/about.scss0
Rapp/javascript/styles/accounts.scss -> app/javascript/styles/mastodon/accounts.scss0
Rapp/javascript/styles/admin.scss -> app/javascript/styles/mastodon/admin.scss0
Rapp/javascript/styles/basics.scss -> app/javascript/styles/mastodon/basics.scss0
Rapp/javascript/styles/boost.scss -> app/javascript/styles/mastodon/boost.scss0
Rapp/javascript/styles/compact_header.scss -> app/javascript/styles/mastodon/compact_header.scss0
Rapp/javascript/styles/components.scss -> app/javascript/styles/mastodon/components.scss0
Rapp/javascript/styles/containers.scss -> app/javascript/styles/mastodon/containers.scss0
Rapp/javascript/styles/emoji_picker.scss -> app/javascript/styles/mastodon/emoji_picker.scss0
Rapp/javascript/styles/footer.scss -> app/javascript/styles/mastodon/footer.scss0
Rapp/javascript/styles/forms.scss -> app/javascript/styles/mastodon/forms.scss0
Rapp/javascript/styles/landing_strip.scss -> app/javascript/styles/mastodon/landing_strip.scss0
Rapp/javascript/styles/lists.scss -> app/javascript/styles/mastodon/lists.scss0
Rapp/javascript/styles/reset.scss -> app/javascript/styles/mastodon/reset.scss0
Rapp/javascript/styles/rtl.scss -> app/javascript/styles/mastodon/rtl.scss0
Rapp/javascript/styles/stream_entries.scss -> app/javascript/styles/mastodon/stream_entries.scss0
Rapp/javascript/styles/tables.scss -> app/javascript/styles/mastodon/tables.scss0
Rapp/javascript/styles/variables.scss -> app/javascript/styles/mastodon/variables.scss0
20 files changed, 18 insertions(+), 18 deletions(-)

diff --git 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 diff --git 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 diff --git 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 diff --git 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 diff --git 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 diff --git 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 diff --git 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 diff --git 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 diff --git 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 diff --git 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