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 dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.		6 years ago
..
_mixins.scss	…
about.scss	Revert Font Awesome 5 upgrade (#8810)	6 years ago
accessibility.scss	Add a few black emojis that are to have a white outline (#8597)	6 years ago
accounts.scss	Revert Font Awesome 5 upgrade (#8810)	6 years ago
admin.scss	Revert Font Awesome 5 upgrade (#8810)	6 years ago
basics.scss	Separate font-family into variable (#8763)	6 years ago
boost.scss	Redesign forms, verify link ownership with rel="me" (#8703)	6 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	Separate font-family into variable (#8763)	6 years ago
dashboard.scss	Separate font-family into variable (#8763)	6 years ago
emoji_picker.scss	Adjust emoji-mart-anchor-bar for environments that use display scaling (#7772)	7 years ago
footer.scss	Redesign public profiles and toots (#8068)	6 years ago
forms.scss	Fix domain label position and color (#9033)	6 years ago
lists.scss	…
modal.scss	Merge branch 'master' into glitch-soc/tentative-merge	7 years ago
reset.scss	feat(css): Styled scrollbars in Firefox Nightly (#8653)	6 years ago
rtl.scss	RTL: fix cardbar margins and alignment (#9044)	6 years ago
stream_entries.scss	undo part of PR 8202 to fix RTL (#8979)	6 years ago
tables.scss	Revert Font Awesome 5 upgrade (#8810)	6 years ago
variables.scss	Separate font-family into variable (#8763)	6 years ago
widgets.scss	Revert Font Awesome 5 upgrade (#8810)	6 years ago