diff options
author | David Yip <yipdw@member.fsf.org> | 2017-10-18 11:52:04 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-10-18 11:52:04 -0500 |
commit | 42e8c8eb0e9964d157ac160b3f816e58a771f045 (patch) | |
tree | c3f044eacc21ff65d9cb1bf20d111aaff6c86074 /app/javascript/styles/application.scss | |
parent | 4421f6598f5883908fb25743977306f19a0b0f0f (diff) | |
parent | 09d81defcda96eae7ffba36ccf1fb091ce08f17b (diff) |
Merge tag 'v2.0.0' into gs-master
Diffstat (limited to 'app/javascript/styles/application.scss')
-rw-r--r-- | app/javascript/styles/application.scss | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss index e35937be1..efd34393f 100644 --- a/app/javascript/styles/application.scss +++ b/app/javascript/styles/application.scss @@ -1,20 +1,23 @@ -@import 'mixins'; -@import 'variables'; +@import 'mastodon/mixins'; +@import 'mastodon/variables'; @import 'variables-glitch'; +@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'; |