namekuji/chuckya
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
chuckya/app/javascript/styles/mastodon
History
Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml
2019-07-19 18:26:49 +02:00
..
_mixins.scss Fix sass-lint config (#10982) 2019-06-06 18:51:46 +02:00
about.scss Change full logo to use primary text color of the given theme (#10994) 2019-06-08 15:30:06 +02: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 Change preferences page into appearance, notifications, and other (#10977) 2019-06-07 03:39:24 +02:00
admin.scss Merge branch 'master' into glitch-soc/merge-upstream 2019-06-07 17:00:36 +02:00
basics.scss Change single-column mode to scroll the whole page (#11359) 2019-07-19 09:25:22 +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 2019-07-19 18:26:49 +02:00
containers.scss Add ActivityPub actor representing the entire server (#11321) 2019-07-19 01:44:42 +02:00
dashboard.scss Redesign admin instances area (#9645) 2019-01-08 13:39:49 +01:00
emoji_picker.scss Fix sass-lint config (#10982) 2019-06-06 18:51:46 +02:00
footer.scss Use <use /> to render transparent SVG logo instead of inserting it (#10845) 2019-05-27 03:33:39 +02:00
forms.scss Change preferences page into appearance, notifications, and other (#10977) 2019-06-07 03:39:24 +02:00
introduction.scss Add new first-time tutorial (#9531) 2018-12-17 11:07:17 +01: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 Fix sass-lint config (#10982) 2019-06-06 18:51:46 +02:00
reset.scss Fix Firefox scrollbar color regression in #9210 (#9908) 2019-01-24 13:32:23 +01:00
rtl.scss Fix RTL layout not being RTL within the columns area (#10990) 2019-06-07 23:35:26 +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 relationship manager on narrow screens (#10293) 2019-03-17 22:36:54 +01:00
variables.scss Separate font-family into variable (#8763) 2018-09-23 20:41:24 +02:00
widgets.scss Make sure the instance banner is never cropped (#10702) 2019-05-05 01:07:15 +02:00