You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		6 years ago
..
_mixins.scss	Restore vanilla components	7 years ago
about.scss	Fix style of attachment list on /about (#7930)	6 years ago
accessibility.scss	Add white outline to black emojis (fix #5083) (#7936)	6 years ago
accounts.scss	Add follow button to detailed status, add gradient to mask bio cut-off (#7979)	6 years ago
admin.scss	Add federation relay support (#7998)	6 years ago
basics.scss	Add color variables of texts for better accesibility (#7125)	7 years ago
boost.scss	Add color variables of texts for better accesibility (#7125)	7 years ago
compact_header.scss	Separate high contrast theme (#7213)	7 years ago
components.scss	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
containers.scss	Combine similar components into one on public UI (#7458)	7 years ago
emoji_picker.scss	Adjust emoji-mart-anchor-bar for environments that use display scaling (#7772)	7 years ago
footer.scss	Add "Edit profile" link to public profile page, increase bottom padding (#7754)	7 years ago
forms.scss	Fix gradient, regression from #7927 (#7963)	6 years ago
landing_strip.scss	Separate high contrast theme (#7213)	7 years ago
lists.scss	Restore vanilla components	7 years ago
modal.scss	Merge branch 'master' into glitch-soc/tentative-merge	6 years ago
reset.scss	Fix webkit scrollbars (#7191)	7 years ago
rtl.scss	Fix gradient, regression from #7927 (#7963)	6 years ago
stream_entries.scss	Add follow button to detailed status, add gradient to mask bio cut-off (#7979)	6 years ago
tables.scss	Add vendor prefix for background-clip (#7727)	7 years ago
variables.scss	Fix color mistakes in mastodon-light theme (#7626)	7 years ago