monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/javascript/styles/mastodon
History
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	.travis.yml
 	Gemfile.lock
 	README.md
 	app/controllers/settings/follower_domains_controller.rb
 	app/controllers/statuses_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/lib/feed_manager.rb
 	app/models/media_attachment.rb
 	app/models/mute.rb
 	app/models/status.rb
 	app/services/mute_service.rb
 	app/views/home/index.html.haml
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/ca.yml
 	config/locales/en.yml
 	config/locales/es.yml
 	config/locales/fr.yml
 	config/locales/nl.yml
 	config/locales/pl.yml
 	config/locales/pt-BR.yml
 	config/themes.yml
 		2018-05-03 17:23:44 -05:00
..
_mixins.scss Restore vanilla components 2017-11-17 19:29:16 -08:00
about.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
accounts.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
admin.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
basics.scss Add color variables of texts for better accesibility (#7125) 2018-04-18 16:52:15 +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 remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
containers.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
emoji_picker.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
footer.scss Add color variables of texts for better accesibility (#7125) 2018-04-18 16:52:15 +02:00
forms.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
landing_strip.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
lists.scss Restore vanilla components 2017-11-17 19:29:16 -08:00
modal.scss Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-19 15:22:10 -06:00
reset.scss Fix webkit scrollbars (#7191) 2018-04-19 23:35:47 +02:00
rtl.scss Fix #6757: Adjust RTL styles for landing page (#6768) 2018-03-13 08:14:08 +01:00
stream_entries.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00
tables.scss Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
variables.scss Separate high contrast theme (#7213) 2018-04-21 21:35:55 +02:00