diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-20 16:37:35 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-20 16:37:35 -0600 |
| commit | 24b6e4121f656d24adc5676e8a207ded610a7ea7 (patch) | |
| tree | 1c7b908468e12a40a6433f02f86f2cf47fa53cf9 /app/javascript/styles/application.scss | |
| parent | b8c6656ce9e498f2e99d6301212bcd12e7f839df (diff) | |
| parent | 3cae3622146d80aef8e43e5790d25f5e2fc9931e (diff) | |
Merge pull request #342 from glitch-soc/merge-upstream
Merge upstream
Diffstat (limited to 'app/javascript/styles/application.scss')
| -rw-r--r-- | app/javascript/styles/application.scss | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/styles/application.scss b/app/javascript/styles/application.scss index fd6665f65..300040173 100644 --- a/app/javascript/styles/application.scss +++ b/app/javascript/styles/application.scss @@ -6,7 +6,6 @@ @import 'mastodon/reset'; @import 'mastodon/basics'; -@import 'mastodon/modal'; @import 'mastodon/containers'; @import 'mastodon/lists'; @import 'mastodon/footer'; @@ -15,7 +14,9 @@ @import 'mastodon/forms'; @import 'mastodon/accounts'; @import 'mastodon/stream_entries'; +@import 'mastodon/boost'; @import 'mastodon/components'; +@import 'mastodon/modal'; @import 'mastodon/emoji_picker'; @import 'mastodon/about'; @import 'mastodon/tables'; |