catstodon/app/javascript/styles/mastodon
Thibaut Girka 980c004f06 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  No real conflict, glitch-soc-only dependency (redcarpet) too close to an
  upstream one (rdf-normalize)
- `README.md`:
  we have different READMEs, discarded upstream's changes
- `app/views/admin/custom_emojis/index.html.haml`:
  No real conflict, different context because of glitch-soc theming
- `lib/mastodon/statuses_cli.rb`:
  Upstream added code to keep bookmarked statuses, we were already doing so
  with slightly different code. Discarded upstream's changes.
- `package.json`:
  No real conflict, glitch-soc-only dependency (favico.js) too close to
  an upstream one
2020-01-12 15:57:34 +01:00
..
_mixins.scss Avoid using uppercase text-transform (#12684) 2020-01-12 14:16:46 +01:00
about.scss Avoid using uppercase text-transform (#12684) 2020-01-12 14:16:46 +01:00
accessibility.scss Add a few black emojis that are to have a white outline (#8597) 2018-09-10 18:26:47 +02:00
accounts.scss Avoid using uppercase text-transform (#12684) 2020-01-12 14:16:46 +01:00
admin.scss Merge branch 'master' into glitch-soc/merge-upstream 2020-01-12 15:57:34 +01:00
basics.scss Add error description and button to copy stack trace to web UI (#12033) 2019-10-01 20:48:49 +02:00
boost.scss Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
compact_header.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
components.scss Merge branch 'master' into glitch-soc/merge-upstream 2020-01-12 15:57:34 +01:00
containers.scss Fix counter sizing (#12446) 2019-11-29 17:03:38 +01:00
dashboard.scss Fix height of dashboard counters (#11736) 2019-09-02 18:11:34 +02:00
emoji_picker.scss Fix sass-lint config (#10982) 2019-06-06 18:51:46 +02:00
footer.scss Avoid using uppercase text-transform (#12684) 2020-01-12 14:16:46 +01:00
forms.scss Avoid using uppercase text-transform (#12684) 2020-01-12 14:16:46 +01:00
introduction.scss Fix performance of home feed regeneration (#12084) 2019-10-06 22:11:17 +02:00
lists.scss Restore vanilla components 2017-11-17 19:29:16 -08:00
modal.scss Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
polls.scss Highlight border when focusing poll-form footer (#12544) 2019-12-05 00:51:07 +01:00
reset.scss Fix Firefox scrollbar color regression in #9210 (#9908) 2019-01-24 13:32:23 +01:00
rtl.scss Fix issues in RTL layout in web UI (#12060) 2019-10-03 03:17:41 +02:00
statuses.scss Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
tables.scss Fix batch actions being hidden from mobile view (#12183) 2019-10-24 22:46:59 +02:00
variables.scss Add bookmarks (#7107) 2019-11-13 23:02:10 +01:00
widgets.scss Avoid using uppercase text-transform (#12684) 2020-01-12 14:16:46 +01:00