mastodon/app/javascript/styles
David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream
Conflicts:
	app/javascript/mastodon/components/status_list.js
	app/javascript/mastodon/features/notifications/index.js
	app/javascript/mastodon/features/ui/components/modal_root.js
	app/javascript/mastodon/features/ui/components/onboarding_modal.js
	app/javascript/mastodon/features/ui/index.js
	app/javascript/styles/about.scss
	app/javascript/styles/accounts.scss
	app/javascript/styles/components.scss
	app/presenters/instance_presenter.rb
	app/services/post_status_service.rb
	app/services/reblog_service.rb
	app/views/about/more.html.haml
	app/views/about/show.html.haml
	app/views/accounts/_header.html.haml
	config/webpack/loaders/babel.js
	spec/controllers/api/v1/accounts/credentials_controller_spec.rb
2017-09-09 14:27:47 -05:00
..
fonts Redesign the landing page, mount public timeline on it (#4122) 2017-07-11 15:27:59 +02:00
_mixins.scss Better style handling at small sizes 2017-06-24 20:36:19 -07:00
about.scss Adjust styles of landing pages. (#4682) 2017-08-25 17:19:35 +02:00
accounts.scss Adjust public profile pages (#4713) 2017-08-27 23:59:51 +02:00
admin.scss Adjust settings pages (#4765) 2017-09-02 15:49:28 +02:00
application.scss Multiple frontend support (#110) 2017-07-30 19:28:21 +02:00
basics.scss Adjust padding on the public profile page (#4757) 2017-09-01 21:01:23 +02:00
boost.scss Merge git://github.com/tootsuite/mastodon into tootsuite-master 2017-07-25 21:36:22 +02:00
common.scss Multiple frontend support (#110) 2017-07-30 19:28:21 +02:00
compact_header.scss Adjust tags and accounts page (#4534) 2017-08-07 20:33:06 +02:00
components.scss Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
containers.scss Adjust "signed in as" pages (#4720) 2017-08-28 00:01:07 +02:00
custom.scss Media display improvements 2017-06-30 02:18:25 -07:00
footer.scss Improve scss color variables (#2912) 2017-05-08 15:57:49 +02:00
forms.scss Adjust settings pages (#4765) 2017-09-02 15:49:28 +02:00
landing_strip.scss Redesign public profiles (#4608) 2017-08-16 17:12:58 +02:00
lists.scss Fix #3910 - Require OTP authentication to disable 2FA (#3935) 2017-06-25 23:51:46 +02:00
reset.scss Improve scss color variables (#2912) 2017-05-08 15:57:49 +02:00
rtl.scss Adjust RTL styles (#4712) 2017-08-27 13:35:18 +02:00
stream_entries.scss Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
tables.scss Adjust settings pages (#4765) 2017-09-02 15:49:28 +02:00
variables-glitch.scss Improved notifications cleaning UI with set operations (#109) 2017-07-30 12:36:28 -04:00
variables.scss Merge git://github.com/tootsuite/mastodon into tootsuite-master 2017-07-25 21:36:22 +02:00