AkkomaGang/masto-fe
2
2
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity
masto-fe/app/javascript/styles/mastodon
History
Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb

Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.
2018-12-15 10:45:53 +01:00
..
_mixins.scss Allow joining several hashtags in a single column (#8904) 2018-11-05 18:53:25 +01:00
about.scss Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +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 Add profile directory (#9427) 2018-12-06 17:36:11 +01:00
admin.scss Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
basics.scss Separate font-family into variable (#8763) 2018-09-23 20:41:24 +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 2018-12-09 16:08:04 +01:00
containers.scss Separate font-family into variable (#8763) 2018-09-23 20:41:24 +02:00
dashboard.scss Separate font-family into variable (#8763) 2018-09-23 20:41:24 +02:00
emoji_picker.scss Adjust emoji-mart-anchor-bar for environments that use display scaling (#7772) 2018-06-09 22:20:57 +02:00
footer.scss Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
forms.scss Fix padding on select elements in preferences (#9517) 2018-12-14 01:44:39 +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
reset.scss fix(reset): Property name for styled scrollbars (#9210) 2018-11-05 18:51:26 +01:00
rtl.scss RTL: fix toot privacy preferences radio buttonss (#9146) 2018-10-30 00:49:29 +01:00
stream_entries.scss undo part of PR 8202 to fix RTL (#8979) 2018-10-15 04:39:20 +02:00
tables.scss Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
variables.scss Separate font-family into variable (#8763) 2018-09-23 20:41:24 +02:00
widgets.scss Fix various things in the directory (#9449) 2018-12-07 16:37:32 +01:00