mastodon/app/javascript/styles/mastodon
Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.
2018-12-23 11:28:28 +01:00
..
_mixins.scss Allow joining several hashtags in a single column (#8904) 2018-11-05 18:53:25 +01:00
about.scss
accessibility.scss
accounts.scss Add profile directory (#9427) 2018-12-06 17:36:11 +01:00
admin.scss Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
basics.scss
boost.scss
compact_header.scss
components.scss Merge branch 'master' into glitch-soc/merge-upstream 2018-12-19 12:58:49 +01:00
containers.scss Remove "most popular" tab from profile directory, add responsive design (#9539) 2018-12-17 03:14:28 +01:00
dashboard.scss
emoji_picker.scss
footer.scss
forms.scss Fix padding on select elements in preferences (#9517) 2018-12-14 01:44:39 +01:00
introduction.scss Add new first-time tutorial (#9531) 2018-12-17 11:07:17 +01:00
lists.scss
modal.scss
reset.scss fix(reset): Property name for styled scrollbars (#9210) 2018-11-05 18:51:26 +01:00
rtl.scss
stream_entries.scss
tables.scss
variables.scss
widgets.scss Remove "most popular" tab from profile directory, add responsive design (#9539) 2018-12-17 03:14:28 +01:00