about summary refs log tree commit diff
path: root/app/javascript/styles
AgeCommit message (Collapse)Author
2022-11-28Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes.
2022-11-27Make the 'Trending now' header a link to Explore. (#21759)Connor Shea
This keeps the same design that exists currently, but makes "Trending now" into a link to the Hashtags section of "Explore". Resolves #21758.
2022-11-14Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/views/admin/announcements/edit.html.haml`: Upstream change too close to theming-related glitch-soc change. Ported upstream changes. - `app/views/admin/announcements/new.html.haml` Upstream change too close to theming-related glitch-soc change. Ported upstream changes.
2022-11-14Fix style of username in navigation bar above compose form in web UI (#20628)Eugen Rochko
Regression from #20540
2022-11-14Fix dropdown menu on profiles not being accessible on narrow screens in web ↵Eugen Rochko
UI (#20620)
2022-11-14Fix wrong cut-off point for "Read more" in web UI (#20599)Eugen Rochko
2022-11-13Stick batch table toolbar to the top (#20442)Samuel Kaiser
Fixes #20441
2022-11-12Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.
2022-11-12Revert "Revert "Change "Allow trends without prior review" setting to ↵Claire
include statuses (#17977)"" This reverts commit bfc539cfb4f040fcffac740b36791c26c2a74119.
2022-11-11Fix domain blocks on about page not working well on small screens in web UI ↵Eugen Rochko
(#20391)
2022-11-11Only remove padding when listing applications (#20382)Connor Shea
This prevents styling issues on the Authorization page.
2022-11-10Fix color of the “No description added“ media upload warning on light ↵Claire
theme (#20328)
2022-11-10Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/models/custom_emoji.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific validation. Applied upstream changes. - `app/models/public_feed.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific parameter documentation. Applied upstream changes.
2022-11-10Change larger reblogs/favourites numbers to be shortened in web UI (#20303)Eugen Rochko
2022-11-10Fix profile header being cut off in light theme in web UI (#20298)Eugen Rochko
2022-11-08Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-11-07Fix spoiler buttons css not rendering correct color in light theme (#19960)Zach Flanders
* Updating status__content__spoiler-link css for mastodon-light theme to ensure correct rendering precedence * Adding focus css selector to status__content__spoiler-link mastodon-light theme * reformatting code to match convention of having css selectors on separate lines * fixing code format for scss linting issue
2022-11-07Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-11-07Fix double button to clear emoji search input (#19888)Sunny Ripert
2022-11-06Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.
2022-11-05Change design of new list form in web UI (#19801)Eugen Rochko
2022-11-05Change design of moved account banner in web UI (#19790)Eugen Rochko
2022-11-05Remove word-break:keep-all from Dismissable banner message (#19799)eai04191
2022-11-05Change sign-in banner to reflect disabled or moved account status (#19773)Claire
2022-11-04Make word-break: keep-all for dismissable banner (#19719)Jeong Arm
2022-11-04Fix colors in light theme (#19714)Eugen Rochko
2022-11-04Fix wrong colors in the high-contrast theme (#19708)Eugen Rochko
2022-11-04Fix design of verified links in web UI (#19709)Eugen Rochko
2022-10-31Change design of link footer (#19562)Eugen Rochko
2022-10-30Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/javascript/mastodon/locales/ja.json`: Upstream change too close to a glitch-soc-specific string. The glitch-soc-specific string should not have been in this file, so it has been moved to `app/javascript/flavours/glitch/locales/ja.js`. - `app/javascript/packs/public.js`: Upstream refactored a part, that as usual is split and duplicated in various pack files. Updated those pack files accordingly. - `app/views/layouts/application.html.haml`: Upstream fixed custom.css path in a different way than we did, went with upstream's change.
2022-10-30Fix sidebar and tabs on settings on small screens in admin UI (#19533)Eugen Rochko
2022-10-28Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-10-28Fix assets compilationClaire
Not too sure why the loader behaves differently than it previously did, though.
2022-10-28Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-10-28Fix number of uses being shown again on trending hashtags in web UI (#19484)Eugen Rochko
2022-10-28Change admin announcement edition interface to use datetime-local (#18321)Claire
* Change admin announcement edition interface to use datetime-local * Dynamically set announcement stop date as required if start date is set, set minimum date for stop date * Change `all_day` to not be bound to presence of time-range * Add pattern and placeholder as minimal fallback for browsers not supporting datetime-local * Display datetime-local inputs as local time Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2022-10-28fix(component): adjust style of counter button to fix overflow issue (#19494)Robert Laurenz
2022-10-28Fix avatars not using image tags in web UI (#19488)Eugen Rochko
Fix #19483
2022-10-26Add ability to view previous edits of a status in admin UI (#19462)Eugen Rochko
* Add ability to view previous edits of a status in admin UI * Change moderator access to posts to be controlled by a separate policy
2022-10-25Fix wrong size of avatars in admin UI (#19457)Eugen Rochko
2022-10-25Change layout of posts in web UI (#19423)Eugen Rochko
2022-10-25Change design of translations in web UI (#19453)Eugen Rochko
2022-10-23Fix language dropdown causing zoom on mobile devices in web UI (#19428)Eugen Rochko
2022-10-23Change floating action button to be a button in header in web UI (#19422)Eugen Rochko
- Fix theme color - Fix elephant being too big on error page on small screens - Remove "Follows and Followers" link from navigation panel
2022-10-22Add error boundary around routes in web UI (#19412)Eugen Rochko
* Add error boundary around routes in web UI * Update app/javascript/mastodon/features/ui/util/react_router_helpers.js Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> * Update app/javascript/mastodon/features/ui/util/react_router_helpers.js Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> * Update app/javascript/mastodon/features/ui/components/bundle_column_error.js Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-10-22Fix reply not opening compose page on certain screen sizes in web UI (#19417)Eugen Rochko
Fix ellipsis next to icons on navigation panel on some browsers
2022-10-22Change settings area to be separated into categories in admin UI (#19407)Eugen Rochko
And update all descriptions
2022-10-20Change public accounts pages to mount the web UI (#19319)Eugen Rochko
* Change public accounts pages to mount the web UI * Fix handling of remote usernames in routes - When logged in, serve web app - When logged out, redirect to permalink - Fix `app-body` class not being set sometimes due to name conflict * Fix missing `multiColumn` prop * Fix failing test * Use `discoverable` attribute to control indexing directives * Fix `<ColumnLoading />` not using `multiColumn` * Add `noindex` to accounts in REST API * Change noindex directive to not be rendered by default before a route is mounted * Add loading indicator for detailed status in web UI * Fix missing indicator appearing while account is loading in web UI
2022-10-19Change featured hashtags to be displayed in navigation panel (#19382)Eugen Rochko
2022-10-16Add featured tags selector for WebUI (#19358)Takeshi Umeda
* Add featured tags selector for WebUI * Add title to tag count