about summary refs log tree commit diff
path: root/app/javascript/styles
AgeCommit message (Collapse)Author
2019-06-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb
2019-06-06Fix sass-lint config (#10982)Yamagishi Kazutoshi
2019-06-06Fix emoji picker being always displayed (#10979)Takeshi Umeda
* Fix emoji picker being always displayed * Remove duplicate content with other pull-requests
2019-06-04Fix margins on profile metadata in single column mode (#10961)Eugen Rochko
2019-06-03Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - Gemfile.lock - config/webpack/rules/css.js - package.json - yarn.lock
2019-06-02Fix profile picture preview (#10931)Jeong Arm
2019-06-02Improvement variable height in single column layout (#10917)Takeshi Umeda
* Improvement variable height of compose and navigation panel in single column layout * Fix wrong quotes and missing commas
2019-06-01Center 2-columns layout without side effect (#10915)Hanage999
2019-05-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-29Fix safari post field display issue in single column layout (#10883)Takeshi Umeda
2019-05-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-27Use `<use />` to render transparent SVG logo instead of inserting it (#10845)Eugen Rochko
2019-05-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.
2019-05-25Avoid cutting bottom of letters of last paragraph of statuses (#10821)Mélanie Chauvel (ariasuni)
2019-05-25Add responsive panels to the single-column layout (#10820)Eugen Rochko
* Add responsive panels to the single-column layout * Fixes * Fix not being able to save the preference * Fix code style issues * Set max-height on the compose textarea and add a link to relationship manager
2019-05-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - streaming/index.js
2019-05-23Various improvements to single column layout (#10809)Eugen Rochko
- Add potential side panels to single column layout - Hide FAB on large screens
2019-05-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`.
2019-05-23Add `forceSingleColumn` prop to `<UI />` (#10807)Eugen Rochko
* Move TabsBar rendering logic from CSS to the ColumnsArea component * Add forceSingleColumn mode * Add unread notifications counter to tabs bar * Add toggle to control `forceSingleColumn` * Increase paddings in mobile layout responsively at large sizes
2019-05-22Fix stacking order of emoji picker (#10801)nzws
2019-05-15Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-15Adds click-able div that expands status (#10733) (#10766)Neil Moore
The clickable div is positioned under the account avatar and covers all empty space below it to the end of the status.
2019-05-12Fix some colors in light theme (#10754)nzws
* Fix typo in light theme * Fix background color of empty column
2019-05-11Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-10Change icon and label depending on whether media is marked as sensitive (#10748)ThibG
* Change icon and label depending on whether media is marked as sensitive * WiP use a checkbox
2019-05-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/statuses_controller.rb minor conflict because of glitch-soc's theming system - app/controllers/stream_entries_controller.rb minor conflict because of glitch-soc's theming system
2019-05-09Add emoji suggestions to CW and poll option fields (#10555)ThibG
* Refactor selectComposeSuggestion so that different paths can be updated * Add suggestions in CW field * Add emoji suggestion to poll options * Attempt to fix CSS * Hide suggestions by default They will be enabled if the input has focus
2019-05-09Improve poll link accessibility (#10720)Maciek Baron
* Add distinction between hover and active/focus states * Resolves #10198
2019-05-08Bring back crossed eye icon on gallery (#10715)Jeong Arm
2019-05-07Fix some colors of high contrast theme (#10711)nzws
* Fix "nothing here" text color of high contrast * Fix counter border color of high contrast
2019-05-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-05Make sure the instance banner is never cropped (#10702)Baptiste Gelez
2019-05-04Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-04Fix transition: all (#10699)ThibG
2019-05-04Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/media_attachment.rb
2019-05-03Change font weight of sensitive button to 500 (#10682)Eugen Rochko
2019-05-03Provide a link to existing domain block when trying to block an ↵ThibG
already-blocked domain (#10663) * When trying to block an already-blocked domain, provide a link to the block * Fix styling for links in flash messages * Allow blocks to be upgraded but not downgraded
2019-05-03Add button to view context to media modal (#10676)Eugen Rochko
* Add "view context" button to media modal when opened from gallery * Add "view context" button to video modal Allow closing the video modal by navigating back in the browser, just like the media modal
2019-05-03Make the "mark media as sensitive" button more obvious in web UI (#10673)Eugen Rochko
* Make the "mark media as sensitive" button more obvious in web UI * Use eye-slash icon instead of eye icon to mean "hide"
2019-05-03Fix alignment of items in the account gallery in web UI and load more per ↵Eugen Rochko
page (#10674)
2019-05-02Change account gallery in web UI (#10667)Eugen Rochko
- 3 items per row instead of 2 - Use blurhash for previews - Animate/hover-to-play GIFs and videos - Open media modal instead of opening status - Allow opening status instead with ctrl+click and open in new tab
2019-04-27Add blurhash (#10630)Eugen Rochko
* Add blurhash * Use fallback color for spoiler when blurhash missing * Federate the blurhash and accept it as long as it's at most 5x5 * Display unknown media attachments as blurhash placeholders * Improve style of embed actions and spoiler button * Change blurhash resolution from 3x3 to 4x4 * Improve dependency definitions * Fix code style issues
2019-04-22Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc
2019-04-22Fix modal items cannot scroll on touch devices (#10605)kedama
2019-04-21Use correct local names for fonts (#10594)ThibG
2019-04-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-04-16Allow modal secondary button to shrink and allow wider confirmation modals ↵ThibG
(#10586) Fixes #10531
2019-04-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.
2019-04-09Add "why do you want to join" field to invite requests (#10524)Eugen Rochko
* Add "why do you want to join" field to invite requests Fix #10512 * Remove unused translations * Fix broken registrations when no invite request text is submitted
2019-04-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.
generated by cgit-pink (git 2.37.1) at 2024-12-15 12:15:15 +0000