Source code for the custom Mastodon (Glitchsoc) instance on berserker.town. https://berserker.town/

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.

Tag: Branch: Tree: 3ef5f62abf

local

main

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '3ef5f62abf'

${ noResults }

microblog/app/javascript/styles/mastodon

History

Claire 3ef5f62abf Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream switched to pushing to both DockerHub and GitHub Container Repository, while glitch-soc was already pushing to the latter only. Updated our configuration to be slightly more consistent with upstream's naming and styling, but kept our behavior. - `Gemfile.lock`: Updated dependencies textually too close to glitch-soc only hcaptcha dependency. Updated dependencies as upstream did. - `README.md`: Upstream updated its README, but we have a completely different one. Kept our README, though it probably should be reworked at some point. - `app/views/auth/sessions/two_factor.html.haml`: Minor style fix upstream that's on a line glitch-soc removed because of its different theming system. Kept our file as is. - `spec/controllers/health_controller_spec.rb`: This file apparently did not exist upstream, upstream created it with different contents but it is functionally the same. Switched to upstream's version of the file. - `spec/presenters/instance_presenter_spec.rb`: Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc had its own code because it's a fork and does not have the same default source URL. Took upstream's change, but with glitch-soc's repo as the default case. - `yarn.lock`: Upstream dependencies textually too close to a glitch-soc only one. Updated dependencies as upstream did.		1 year ago
..
_mixins.scss	Add logged-out access to the web UI (#18961)	2 years ago
about.scss	Change about page to be mounted in the web UI (#19345)	2 years ago
accessibility.scss	Upgrade to Stylelint 15 with Prettier (#23558)	1 year ago
accounts.scss	Revert "Revert "Change "Allow trends without prior review" setting to include statuses (#17977)""	2 years ago
admin.scss	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
basics.scss	Upgrade to Stylelint 15 with Prettier (#23558)	1 year ago
boost.scss	Fix styling of boost button in media modal not reflecting ability to boost (#16387)	3 years ago
branding.scss	Change brand color and logotypes (#18592)	2 years ago
components.scss	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
containers.scss	Change public accounts pages to mount the web UI (#19319)	2 years ago
dashboard.scss	Change about page to be mounted in the web UI (#19345)	2 years ago
emoji_picker.scss	Upgrade to Stylelint 15 with Prettier (#23558)	1 year ago
forms.scss	Upgrade to Stylelint 15 with Prettier (#23558)	1 year ago
lists.scss	Restore vanilla components	7 years ago
modal.scss	Upgrade to Stylelint 15 with Prettier (#23558)	1 year ago
polls.scss	Upgrade to Stylelint 15 with Prettier (#23558)	1 year ago
reset.scss	Fix Firefox scrollbar color regression in #9210 (#9908)	5 years ago
rich_text.scss	Add support for incoming rich text (#23913)	1 year ago
rtl.scss	Upgrade to Stylelint 15 with Prettier (#23558)	1 year ago
statuses.scss	Upgrade to Stylelint 15 with Prettier (#23558)	1 year ago
tables.scss	Stick batch table toolbar to the top (#20442)	2 years ago
variables.scss	Upgrade to Stylelint 15 with Prettier (#23558)	1 year ago
widgets.scss	Upgrade to Stylelint 15 with Prettier (#23558)	1 year ago