about summary refs log tree commit diff
path: root/app/javascript/styles
AgeCommit message (Collapse)Author
2023-02-09Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes.
2023-02-06Add scrolling to Compare history modal (#23396)cadars
* Compare history modal: allow vertical scrolling * Update app/javascript/styles/mastodon/components.scss Co-authored-by: Claire <claire.github-309c@sitedethib.com> --------- Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-01-25Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-01-25Fix styling of featured tags in light theme (#23252)Claire
* Fix styling of featured tags in light theme Fixes #23251 * Remove broken highlighting on /settings/featured_tags
2023-01-24Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-01-23Fix upload area display in single-column mode (#23217)Claire
2023-01-21Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-01-19Fix wrong text color on some buttons in light theme in web UI (#23156)Eugen Rochko
2023-01-19Fix wrong padding in RTL layout in web UI (#23157)Eugen Rochko
2023-01-18Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes.
2023-01-18Change account moderation notes to make links clickable (#22553)Claire
* Change account moderation notes to make links clickable Fixes #22539 * Fix styling of account moderation note links
2023-01-18Add checkmark symbol to checkbox (#22795)Peter Simonsson
2023-01-12Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-01-12Remove hardcoded width from dropdown overlays (#23062)Claire
* Remove hardcoded width from dropdown overlays * Fix emoji picker position
2023-01-12Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/models/status.rb`: Minor upstream refactor moved hook definitions around, and glitch-soc has an extra `before_create`. Moved the `before_create` accordingly. - `app/services/batched_remove_status_service.rb`: Minor upstream refactor changed a block in which glitch-soc had one extra call to handle direct timelines. Adapted changes to keep glitch-soc's extra call.
2023-01-11Fix dropdown menu positions when scrolling (#22916)Peter Simonsson
* Update react-overlays to latest version * Fix breaking changes in dropdown menus * Use react-overlays built-in arrow positioning feature * Re-implemented `.dropdown-menu__arrow` to have a defined width and height to improve positioning * Moved wrapping div (`.dropdown-menu` from `DropdownMenu` to `Dropdown`) * Wrap button in a span to solve issue with ref * Temporarily remove animations * Fix breaking changes in emoji picker * Wrap EmojiPickerMenu in a div where react-overlays’ ref is added * Fix breaking changes in language dropdown * Fix breaking changes in privacy dropdown * Fix breaking changes in search form * Add animations back using `@keyframes` * Fix arrow color in light theme * Fix linting issue * Remove unused `mounted` state * Remove `placement` state from components and redux And remove the placement state from props of the menu components. * Remove abolution position to fix flip issue * Remove z-index to fix modals and overlay positions * Fix lint issues * Set placement in privacy and language components Copy the placement state into the `PrivacyDropdown` and `LanguageDropdown` components, to apply correct styling to the buttons depending on which placement the Overlay has. * Move `placement` state to correct component
2023-01-05Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`
2023-01-05Improve the contrast of the chart in “poll has ended” notifications (#22575)Jed Fox
* Improve the contrast of the chart in “poll has ended” notifications * Further increase the contrast of non-leading poll options
2023-01-04Bump stylelint from 14.14.0 to 14.16.1 (#22910)dependabot[bot]
* Bump stylelint-config-standard-scss from 5.0.0 to 6.1.0 Bumps [stylelint-config-standard-scss](https://github.com/stylelint-scss/stylelint-config-standard-scss) from 5.0.0 to 6.1.0. - [Release notes](https://github.com/stylelint-scss/stylelint-config-standard-scss/releases) - [Changelog](https://github.com/stylelint-scss/stylelint-config-standard-scss/blob/main/CHANGELOG.md) - [Commits](https://github.com/stylelint-scss/stylelint-config-standard-scss/compare/v5.0.0...v6.1.0) --- updated-dependencies: - dependency-name: stylelint-config-standard-scss dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Bump stylelint from 14.14.0 to 14.16.1 Bumps [stylelint](https://github.com/stylelint/stylelint) from 14.14.0 to 14.16.1. - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md) - [Commits](https://github.com/stylelint/stylelint/compare/14.14.0...14.16.1) --- updated-dependencies: - dependency-name: stylelint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Fix Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-01-02Merge branch 'main' into glitch-soc/mergeClaire
2022-12-28Replace flex styling with sensible layout rules (#22803)Darius Kazemi
The old styling would cause multiple admin header buttons in a flex container to overflow the page on mobile. This new styling uses `flex-flow: wrap` along with a gap, which gets rid of the awkward `:not(:first-child)` pseudoselector and makes multiple buttons in a row flow nicely.
2022-12-15Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring
2022-12-15Add left and right margin to emojis (#20464)Douglas Blank
2022-12-15Add follow request banner on account header (#20785)Claire
* Add requested_by to relationship maps * Display whether an account has requested to follow you on their profile
2022-12-15Add transparancy to modal background for accessibility (#18081)Terence Eden
Fixes #18080 This keeps the `ui-base-lighter-color` but adds enough transparency so that text is more easily readable. Tested in Firefox and Chrome.
2022-12-15Fix margin for search field on medium window size (#21606)Mina Her
2022-12-15Fix the top action bar appearing in multi-column layout (#20943)Claire
2022-12-15Increase the width of the unread notification border. (#21692)Connor Shea
The smaller border is difficult to see for some users, especially when the browser window was thinner, and so the unread border is at the very left edge of the window.
2022-12-15Fix profile avatar being slightly offset into left border (fixes #20822) ↵Riedler
(#20994) * hotfix for #20822 I don't know why it was shifted in the first place or why the width is specified twice, but this fixes the problem, so it looks fine to me. * realigned pfp with content below * fixed formatting my bad * added comment to explain the negative margin before I forget - comments are *important* ! Co-authored-by: Riedler <riedler@gelse.eu>
2022-12-15Fix invalid CSS for links in warning and strike cards (#22302)Claire
2022-12-14Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-12-13fix missing style in warning and strike cards (#22177)Rin
2022-12-13Make handle more easily selectable on profile page (#21479)cadars
* Make handle more easily selectable on profile page * Wrap handle in a span * Add `user-select: all` to span * remove whitespace
2022-12-07Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's.
2022-12-07Fix hidden overflow on interaction modal (#21763)Juan Xavier Gomez
* Fix hidden overflow on interaction modal * only update overflow y
2022-12-07Fix UI header overflow on mobile (#21783)Claire
2022-12-06Fix the top border of verified account fields (#22006)Jed Fox
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.
generated by cgit-pink (git 2.37.1) at 2024-07-08 09:41:55 +0000