izaliamae/glitch-soc
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
glitch-soc/app/javascript/styles/mastodon
History
Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	Vagrantfile
	app/javascript/packs/public.js
	app/views/admin/settings/edit.html.haml
	app/views/settings/preferences/show.html.haml
	app/views/settings/profiles/show.html.haml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/webpack/configuration.js
	config/webpack/loaders/babel.js
	package.json
	yarn.lock

Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js
2018-09-19 21:46:01 +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 a few black emojis that are to have a white outline (#8597) 2018-09-10 18:26:47 +02:00
accounts.scss Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
admin.scss Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
basics.scss Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +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-09-19 21:46:01 +02:00
containers.scss Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +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 Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +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 feat(css): Styled scrollbars in Firefox Nightly (#8653) 2018-09-09 02:08:49 +02:00
rtl.scss Fix gradient, regression from #7927 (#7963) 2018-07-06 13:16:31 +02:00
stream_entries.scss Make unfollow button light up red when hovered (#8286) 2018-08-19 03:28:43 +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