mirror of
https://github.com/funamitech/mastodon
synced 2024-11-23 14:46:52 +09:00
12b935fadf
Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream.
49 lines
1.3 KiB
JavaScript
49 lines
1.3 KiB
JavaScript
module.exports = {
|
|
extends: ['stylelint-config-standard-scss'],
|
|
ignoreFiles: [
|
|
'app/javascript/styles/mastodon/reset.scss',
|
|
'app/javascript/flavours/glitch/styles/reset.scss',
|
|
'app/javascript/styles/win95.scss',
|
|
'coverage/**/*',
|
|
'node_modules/**/*',
|
|
'public/assets/**/*',
|
|
'public/packs/**/*',
|
|
'public/packs-test/**/*',
|
|
'vendor/**/*',
|
|
],
|
|
reportDescriptionlessDisables: true,
|
|
reportInvalidScopeDisables: true,
|
|
reportNeedlessDisables: true,
|
|
rules: {
|
|
'at-rule-empty-line-before': null,
|
|
'color-function-notation': null,
|
|
'color-hex-length': null,
|
|
'declaration-block-no-redundant-longhand-properties': null,
|
|
'no-descending-specificity': null,
|
|
'no-duplicate-selectors': null,
|
|
'number-max-precision': 8,
|
|
'property-no-vendor-prefix': null,
|
|
'selector-class-pattern': null,
|
|
'selector-id-pattern': null,
|
|
'value-keyword-case': null,
|
|
'value-no-vendor-prefix': null,
|
|
|
|
'scss/dollar-variable-empty-line-before': null,
|
|
'scss/no-global-function-names': null,
|
|
},
|
|
overrides: [
|
|
{
|
|
'files': ['app/javascript/styles/mailer.scss'],
|
|
rules: {
|
|
'property-no-unknown': [
|
|
true,
|
|
{
|
|
ignoreProperties: [
|
|
'/^mso-/',
|
|
] },
|
|
],
|
|
},
|
|
},
|
|
],
|
|
};
|