about summary refs log tree commit diff
path: root/app/javascript/styles
AgeCommit message (Collapse)Author
2019-02-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-02-27Allow getting-started to scroll on short screens (#10075)trwnh
At 480px height, there is not enough space to fully display the footer.
2019-02-17Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/serializers/rest/instance_serializer.rb - app/views/layouts/error.html.haml - public/oops.png Took our version (same as upstream but without the things that only make sense in an animation). Additional changes: - app/javascript/flavours/vanilla/theme.yml Include upstream's javascript in error pages.
2019-02-15Change error graphic to hover-to-play (#10055)Eugen Rochko
Fix #6060
2019-02-15Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-02-14Improve image description user experience (#10036)Ben Lubar
* Add image descriptions to searchable post content. * Allow multi-line image descriptions. * Request image descriptions in the same query as posts when creating the search index. (see https://github.com/tootsuite/mastodon/pull/10036#discussion_r256551624)
2019-02-13Add list title editing (#9748)ThibG
* Add list title editing Port changes made by ash for glitch-soc * Code style fixes
2019-02-13Fix style regressions on landing page (#10030)Eugen Rochko
2019-02-13Fix hashtags select styling in default and high contrast themes (#10029)Eugen Rochko
2019-02-13Disable box shadows for featured hashtags in light theme (#10034)ThibG
Fixes #9990
2019-02-13Fix color of static page links in high contrast theme (#10028)Eugen Rochko
2019-02-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default.
2019-02-05[UI] Fix whitespace being applied to div instead of p (#9968)trwnh
* fix large line breaks * fix ascii art posts
2019-02-04Add featured hashtags to profiles (#9755)Eugen Rochko
* Add hashtag filter to profiles GET /@:username/tagged/:hashtag GET /api/v1/accounts/:id/statuses?tagged=:hashtag * Display featured hashtags on public profile * Use separate model for featured tags * Update featured hashtag counters on-write * Limit featured tags to 10
2019-02-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - README.md Kept our version - app/javascript/mastodon/features/compose/components/compose_form.js Two changes too close to each other, took both changes
2019-02-01Fix link color in high-contrast theme, add underlines (#9949)Eugen Rochko
Improve sorting of default themes in the dropdown
2019-01-25Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-01-24Fix Firefox scrollbar color regression in #9210 (#9908)trwnh
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210.
2019-01-21Apply style for .landing-page strong (#9892)Jeong Arm
2019-01-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
No conflicts.
2019-01-18Fix new hashtag page's items not being full-width on mobile (#9852)Eugen Rochko
Fix #9845
2019-01-18Add information about how to opt-in to the directory on the directory (#9834)Eugen Rochko
Fix #9833
2019-01-17Fix slightly cropped font on settings page dropdowns when using system font ↵Mélanie Chauvel (ariasuni)
(#9839)
2019-01-17Improve the public hashtag page (#9831)Eugen Rochko
- Fix height not updating when clicking show more on public hashtag page - Add header to the public hashtag page - Change text size and margins on the public hashtag page
2019-01-16Fix public hashtag timeline width on mobile, fix scrollbar width ↵ThibG
compensation (#9824) * Fix hashtag timeline width being potentially larger than window width * Add automatic computation of scrollbar width
2019-01-16Redesign public hashtag page to use a masonry layout (#9822)Eugen Rochko
2019-01-16Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - config/locales/simple_form.pl.yml
2019-01-14Fix hashtag timeline on mobile (#9806)ThibG
Instead of forcing 90vh for the scrollable part of the timeline's height as in #9781 (which may be off), use `display: flex`, exactly like on desktop.
2019-01-13Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-01-11Adjust admin UI right panel size (#9768)Jeong Arm
* Adjust admin UI right panel size * Fix typo
2019-01-11change height on narrow view to take 100% of screen (#9781)Mateusz Bugowski
* change height on narrow view to take 100% of screen * add empty line before @media
2019-01-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.
2019-01-08Fix how flavour screenshots are displayed in the vanilla flavourThibaut Girka
2019-01-08Redesign admin instances area (#9645)Eugen Rochko
2019-01-06Fix embed play icons regression from #9715 (#9731)Eugen Rochko
2019-01-04Fix unreadable text color in report modal for some statuses (#9716)Eugen Rochko
Fix #9697
2019-01-04Display fallback link card thumbnail when none is given (#9715)Eugen Rochko
2019-01-02Fix some image paths in SCSS filesThibaut Girka
2019-01-02Fix syntax errors in win95 SCSS fileThibaut Girka
2019-01-02Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock
2018-12-28Improve admin UI for account view (#9643)Eugen Rochko
2018-12-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it.
2018-12-22Add moderation warnings (#9519)Eugen Rochko
* Add moderation warnings Replace individual routes for disabling, silencing, and suspending a user, as well as the report update route, with a unified account action controller that allows you to select an action (none, disable, silence, suspend) as well as whether it should generate an e-mail notification with optional custom text. That notification, with the optional custom text, is saved as a warning. Additionally, there are warning presets you can configure to save time when performing the above. * Use Account#local_username_and_domain
2018-12-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-12-18improved appearance of notification filter on safari (#9564)Hinaloe
2018-12-18Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.
2018-12-17Make notifications quick-filter use consistent style with profile tabs (#9554)Eugen Rochko
2018-12-17Minor scrollable list fixes (#9551)ThibG
* Make sure loading indicator has enough vertical space * Respect reduce_motion setting for loading indicator
2018-12-17Add new first-time tutorial (#9531)Eugen Rochko
* Prepare to load onboarding as a full page * Update the first-time introduction * Improve responsive design * Replace speech bubble with logo * Increase text size and reword first paragraph
2018-12-17Remove "most popular" tab from profile directory, add responsive design (#9539)Eugen Rochko
* Remove "most popular" tab from profile directory, add responsive design * Remove unused translations
generated by cgit-pink (git 2.37.1) at 2024-12-28 07:26:29 +0000