about summary refs log tree commit diff
path: root/app/javascript/styles
AgeCommit message (Collapse)Author
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
2018-12-16Add notification quick-filter bar in the frontend app (#9399)Paweł Ngei
* create FilterBar componer and its container, unstyled * introduce basic styling for FilterBar * add selection css * allow FilterBar to display active CSS with js * connect the FilterBar to the Redux state * change getNotifications to use filter * remove temporary comments * add an option to turn the FilterBar off in settings * fix showFilterBar data type to boolean * fix eslint errors * add English and Polish translations * allowed filter bar overflow to accomodate for longer languages * fix mispelled translation key * add unified CSS look * replace text in FilterBar with icons * add tooltips * replace text @ with an icon * introduce simple and advanced filtering view * add ability to toggle the advanced view * add Polish translations * change Advanced View description to be more clear * make each filter flush notifications and load new ones, fixing pagination * simplify getNotifications once frontend filtering is not needed for FilterBar * add a semicolon * Revert "simplify getNotifications once frontend filtering is not needed for FilterBar" This reverts commit 9f4be7857135b0327814bd22a3e8a4e7b546f7cc. * reset filter to 'all' when turning off FilterBar
2018-12-15Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/directories_controller.rb - app/controllers/settings/applications_controller.rb - app/controllers/settings/base_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/imports_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/sessions_controller.rb - app/controllers/settings/two_factor_authentication/confirmations_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/controllers/settings/two_factor_authentications_controller.rb Conflicts were due to some refactoring already made in glitch-soc when introducing flavours.
2018-12-14Fix padding on select elements in preferences (#9517)ThibG
Add right-padding to select elements to take the up/down arrows into account. Thanks Tixie for finding the issue!
2018-12-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.
2018-12-08Make notification time smaller and reduce contrast (#9464)Eugen Rochko
2018-12-07Fix various things in the directory (#9449)Eugen Rochko
* Fix missing variable in directory page title * Order hashtags by number of people instead of alphabetically * Add icon to OpenGraph preview of directory page * Prevent line breaks in hashtags and ensure lowercase in the table
2018-12-06Add profile directory (#9427)Eugen Rochko
Fix #5578
2018-12-06Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-12-05Add visible dates for notifications in Notification column (#9423)Paweł Ngei
* add RelativeTimestamp elements * style the elements properly with CSS
2018-11-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).
2018-11-27Volume sliders for videos #7429 (#9366)Sumit Khanna
* Volume sliders for videos #7429 * Code formatting updates * Code formatting updates
2018-11-25check_boxes label should use display: inline-block (#9348)takayamaki
2018-11-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-11-08Use local instead of global loading indicator for timelines, account ↵Eugen Rochko
timelines (#9224) So that opening a profile feels faster. Also, pinned toots are not shown before other toots have loaded. Also, if no toots are loaded, added empty message
generated by cgit-pink (git 2.37.1) at 2024-07-04 17:18:49 +0000