0aa69487a2
Conflicts: - `app/models/concerns/user/has_settings.rb`: Not a real conflict, upstream added a setting textually close to a glitch-soc one. Added upstream's new setting. - `app/views/settings/preferences/appearance/show.html.haml`: Not a real conflict, upstream added a setting textually close to a glitch-soc one. Added upstream's new setting. - `config/routes.rb`: Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had an extra route. Moved the extra route to `config/routes/web_app.rb`. - `spec/controllers/settings/preferences/appearance_controller_spec.rb`: This spec got converted to a system spec upstream. However, the theme setting works differently in glitch-soc, so the spec had been changed. Changed the corresponding system spec as well. |
||
|---|---|---|
| .. | ||
| _mixins.scss | ||
| about.scss | ||
| accessibility.scss | ||
| accounts.scss | ||
| admin.scss | ||
| annual_reports.scss | ||
| basics.scss | ||
| branding.scss | ||
| components.scss | ||
| containers.scss | ||
| dashboard.scss | ||
| emoji_picker.scss | ||
| forms.scss | ||
| lists.scss | ||
| modal.scss | ||
| polls.scss | ||
| reset.scss | ||
| rich_text.scss | ||
| rtl.scss | ||
| tables.scss | ||
| variables.scss | ||
| widgets.scss | ||