diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-19 15:22:10 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-19 15:22:10 -0600 |
| commit | 2ca965c704075467226dbf798e13ac8e0e62cc15 (patch) | |
| tree | c437e1f4993a6337759eb09157c78cd8134fd774 /app/javascript/styles/application.scss | |
| parent | 2b2de41bc7ecec15aa73650da153e50f0e16f16b (diff) | |
| parent | 0b888acfd4ffddd29f25c878373e9b9f5ec6c0ab (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss
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'; |