Commit Graph

836 Commits

Author SHA1 Message Date
9be032f613 Merge branch 'back-3.3.0' into quote-main 2021-05-19 16:54:23 +09:00
noellabo
d6fff9ba23 Fix quote on public stream 2021-05-19 14:58:51 +09:00
noellabo
17e0ba29e4 Fix to hide mute and blocked quotes 2021-05-19 14:58:51 +09:00
noellabo
9b06011b0a Fix an avatar icon size of the status quoted on the public page 2021-05-19 14:58:51 +09:00
wakin
97ebc10c3c remake quote feature 2021-05-19 14:58:51 +09:00
Genbu Hase
94ba7b284a [New] Implement a feature of quote 2021-05-19 14:58:51 +09:00
Zero King
689974b1ed Remove duplicate CSS property of margin (#16277) 2021-05-18 20:13:44 +02:00
Rintan
15b28354e4 最新版Materialテーマのテスト 2021-05-16 19:38:41 +02:00
dc591911ce Merge pull request #443 from YoheiZuho/quote-main
Quote main
2021-05-17 00:52:43 +09:00
bd61f79698 Revert "[New] Implement a feature of quote"
This reverts commit 37025a8170.
2021-05-16 08:29:45 +02:00
04c1ff5680 Revert "Fix quote on public stream"
This reverts commit 23738ca635.
2021-05-16 08:27:48 +02:00
noellabo
23738ca635 Fix quote on public stream 2021-05-16 08:23:22 +02:00
Genbu Hase
37025a8170 [New] Implement a feature of quote 2021-05-16 14:09:17 +09:00
noellabo
124153f8e0 Add place tab bar at bottom and add short label
modified:   app/controllers/settings/preferences_controller.rb
	modified:   app/javascript/mastodon/features/compose/index.js
	modified:   app/javascript/mastodon/features/ui/components/columns_area.js
	modified:   app/javascript/mastodon/features/ui/components/tabs_bar.js
	modified:   app/javascript/mastodon/initial_state.js
	modified:   app/javascript/mastodon/locales/en.json
	modified:   app/javascript/mastodon/locales/ja.json
	modified:   app/javascript/styles/mastodon/basics.scss
	modified:   app/javascript/styles/mastodon/components.scss
	modified:   app/lib/user_settings_decorator.rb
	modified:   app/models/user.rb
	modified:   app/serializers/initial_state_serializer.rb
	modified:   app/views/layouts/application.html.haml
	modified:   app/views/layouts/error.html.haml
	modified:   app/views/settings/preferences/other/show.html.haml
	modified:   config/locales/simple_form.en.yml
	modified:   config/locales/simple_form.ja.yml
	modified:   config/settings.yml
2021-05-14 10:07:26 +09:00
noellabo
60b22fe1da Fix quote on public stream 2021-05-12 07:24:18 +09:00
noellabo
8402b7063e Fix to hide mute and blocked quotes 2021-05-12 07:24:18 +09:00
noellabo
0a13f77014 Fix an avatar icon size of the status quoted on the public page 2021-05-12 07:24:18 +09:00
wakin
794ad9dbc6 remake quote feature 2021-05-12 07:24:18 +09:00
Genbu Hase
42f8e5801e [New] Implement a feature of quote 2021-05-12 07:24:18 +09:00
Claire
4f747d9f83 Fix follow recommendations UI in advanced layout (#16215) 2021-05-11 21:16:24 +02:00
Mélanie Chauvel
0464240f19 Fix dialog close button (#16219)
* Fix dialog close button being white on almost white

* Make dialog close button slightly bigger
2021-05-11 21:15:57 +02:00
29894a6018 Merge branch 'back-3.3.0' into v3.4.0rc1 2021-05-09 12:32:04 +09:00
Eugen Rochko
2c77d97e0d Add joined date to profiles in web UI (#16169) 2021-05-07 14:33:19 +02:00
Eugen Rochko
8d75bd002d Add empty state message for follow recommendations in web UI (#16161) 2021-05-05 23:57:29 +02:00
Eugen Rochko
bf903dc510 Change onboarding by replacing tutorial with follow recommendations in web UI (#16060) 2021-04-19 14:45:15 +02:00
Eugen Rochko
487e37d6d4 Add system checks to dashboard in admin UI (#15989) 2021-04-03 14:12:30 +02:00
Rintan
6b590d4a4c fix scroll-bar color 2021-03-30 16:13:20 +09:00
Rintan
dd06802786 update Material theme 2021-03-30 14:15:07 +09:00
Rintan
4b8f6985d5 update material theme 2021-03-29 12:38:22 +09:00
Marcin Mikołajczak
f8e50eaea3 Add transition to media modal background (#15843)
* Add transition to media modal background

* use reduceMotion

* Move background color transition into css

Signed-off-by: marcin mikołajczak <me@mkljczk.pl>
2021-03-24 13:51:32 +01:00
Claire
5d48402be1 Fixing the hero widget (#15926)
* Removing last-child padding conflicts with light theme in hero widget

* Add missing background color to widget

* Reset widget.scss to default

* Hope this works

Co-authored-by: koyu <me@koyu.space>
2021-03-19 20:23:32 +01:00
Rintan
1474d573d0 fix y-zu theme 2021-03-18 23:18:45 +09:00
Rintan
98944a915f update material theme to 0.3.0 beta 2021-03-18 23:17:46 +09:00
Eugen Rochko
8331fdf7e0 Add server rules (#15769) 2021-02-21 19:50:12 +01:00
Jeong Arm
d499bb031f Use custom mascot on static share page (#15687)
* Use custom mascot on static share page

* Use full_asset_url
2021-02-11 02:18:56 +01:00
Claire
07b46cb332 Add dropdown for boost privacy in boost confirmation modal (#15704)
* Various dropdown code quality fixes

* Prepare support for privacy selection in boost modal

* Add dropdown for boost privacy in boost confirmation modal
2021-02-11 00:53:12 +01:00
Takeshi Umeda
e38874dcf7 Fix getting-started footer in single column mode not being clickable in Safari (#15496) 2021-01-05 19:57:32 +01:00
Takeshi Umeda
3f4b0dfd47 Fix logo button style more (#15458) 2020-12-30 23:18:39 +01:00
c61f12558e Merge pull request #309 from Rintan/features/material-theme
Y-zu テーマの追加
2020-12-29 17:13:34 +09:00
Rintan
b9fb0bc241 add y-zu theme
fix some bugs
2020-12-29 17:12:00 +09:00
6c163375df Merge pull request #308 from Rintan/features/material-theme
Mastodon v3.3.0向けのマテリアルテーマの修正
2020-12-28 06:17:09 +09:00
Rintan
41499aac47 update for Mastodon v3.3.0 2020-12-27 23:34:09 +09:00
f72c892051 Merge branch 'features/material-theme' into 3.3.0 2020-12-27 18:03:28 +09:00
4fb0b76940 Merge pull request #304 from Rintan/features/material-theme
マテリアルテーマの更新
2020-12-27 17:41:05 +09:00
Takeshi Umeda
ba748a83f2 Fix logo button style (#15428)
* Fix bell button rtl style

* Remove size and style props from button component

* Fix logo button style

* Update jest snapshot
2020-12-26 23:50:34 +01:00
ThibG
b08d2d4f78 Fix media modal buttons not showing up on mobile (#15417)
Fixes #15374

When the pop-out player was introduced, it had tweaks for the mobile
view, but it's now disabled in mobile mode and the styling was reused
for modals, causing the footer to be hidden on mobile without a good
reason.

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2020-12-23 19:55:23 +01:00
Rintan
74217dcb56 update material theme to the latest 2020-12-23 16:34:02 +09:00
ThibG
47c6c54d31 Fix styling issue on /about when server admin has a long username (#15357)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2020-12-18 09:43:33 +01:00
Eugen Rochko
941ff04b03 Fix styles for RTL languages and the light theme (#15356) 2020-12-18 08:47:36 +01:00
ThibG
79efcf8aad Change notification permission handling (#15176)
* Change notification permission handling

- allow changing individual alert settings even if permission is not explicitly
  enabled (asks for permission on toggle)
- persist permission request banner dismissal across sessions through settings

* Add additional, more discrete message to grant permissions

* Change permission granting button design according to reviews

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2020-12-15 18:43:54 +01:00