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 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/models/status.rb
	db/migrate/20180528141303_fix_accounts_unique_index.rb
	db/schema.rb

Resolved by taking upstream changes (no real conflicts, just glitch-soc
specific code too close to actual changes).
2018-08-17 17:43:54 +02:00
..
_mixins.scss Restore vanilla components 2017-11-17 19:29:16 -08:00
about.scss Adjust responsive design for /about/more and /terms (#8158) 2018-08-10 06:43:02 +02:00
accessibility.scss Add white outline to black emojis (fix #5083) (#7936) 2018-07-04 17:35:02 +02:00
accounts.scss Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
admin.scss Add federation relay support (#7998) 2018-07-13 02:16:06 +02:00
basics.scss Compensate for scrollbar disappearing when media modal visible (#8100) 2018-07-31 01:14:33 +02:00
boost.scss Add color variables of texts for better accesibility (#7125) 2018-04-18 16:52:15 +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-08-17 17:43:54 +02:00
containers.scss Adjust responsive design for /about/more and /terms (#8158) 2018-08-10 06:43:02 +02:00
dashboard.scss Add admin dashboard (#8029) 2018-07-16 01:11:53 +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 gradient, regression from #7927 (#7963) 2018-07-06 13:16:31 +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
reset.scss Fix webkit scrollbars (#7191) 2018-04-19 23:35:47 +02:00
rtl.scss Fix gradient, regression from #7927 (#7963) 2018-07-06 13:16:31 +02:00
stream_entries.scss Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
tables.scss Get rid of the Content Warning rainbows (#8129) 2018-08-15 19:38:56 +02:00
variables.scss Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
widgets.scss Adjust responsive design for /about/more and /terms (#8158) 2018-08-10 06:43:02 +02:00