djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/app/javascript/styles/mastodon
History
Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	Dockerfile
	app/javascript/packs/common.js
	config/webpack/loaders/sass.js
	config/webpack/shared.js
	db/schema.rb
	package.json
	yarn.lock

A lot of the conflicts come from updating webpack.

Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.

Ported glitch changes to webpack 4.x
 		2018-07-16 14:50:42 +02:00
..
_mixins.scss Restore vanilla components 2017-11-17 19:29:16 -08:00
about.scss Fix style of attachment list on /about (#7930) 2018-07-03 01:48:09 +02:00
accessibility.scss Add white outline to black emojis (fix #5083) (#7936) 2018-07-04 17:35:02 +02:00
accounts.scss Add follow button to detailed status, add gradient to mask bio cut-off (#7979) 2018-07-07 22:20:14 +02:00
admin.scss Add federation relay support (#7998) 2018-07-13 02:16:06 +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 branch 'master' into glitch-soc/merge-upstream 2018-07-16 14:50:42 +02:00
containers.scss Combine similar components into one on public UI (#7458) 2018-05-12 15:30:06 +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 Add "Edit profile" link to public profile page, increase bottom padding (#7754) 2018-06-07 22:40:55 +02:00
forms.scss Fix gradient, regression from #7927 (#7963) 2018-07-06 13:16:31 +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 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 Add follow button to detailed status, add gradient to mask bio cut-off (#7979) 2018-07-07 22:20:14 +02:00
tables.scss Add vendor prefix for background-clip (#7727) 2018-06-04 13:24:20 +02:00
variables.scss Fix color mistakes in mastodon-light theme (#7626) 2018-05-26 10:53:44 +02:00