Commit Graph

855 Commits

Author SHA1 Message Date
Rintan
a3b4e29016 update to the latest version of mastodon material 2021-11-20 21:12:31 +09:00
3d906de71e Merge branch 'main' into 3.4.2 2021-11-09 21:27:08 +09:00
Claire
8815e98aa2 Fix pop-in player display when poster has long username or handle (#16468) 2021-11-05 23:46:24 +01:00
Rintan
37f28c9150 bug fixes 2021-08-08 15:42:54 +09:00
Rintan
ef16faf928 update material theme
add y-zu auto theme
2021-08-03 22:52:07 +09:00
Rintan
423fa52bf7 update material theme 2021-08-03 22:51:59 +09:00
d1a003e94a Merge branch 'main' into 3.4.1 2021-06-03 14:14:41 +09:00
Claire
be8079f637 Fix deprecated slash as division in SASS files (#16347)
Fixes #16293
2021-06-01 23:47:27 +02:00
Eugen Rochko
abd7b4636a Add assets from Twemoji 13.1.0 (#16345)
* Add assets from Twemoji 13.1.0

* Update emoji-mart
2021-06-01 14:35:49 +02:00
Rintan
7d25a9e030 fix minor bugs 2021-05-23 02:26:52 +09:00
Rintan
a865832ab0 update material theme 2021-05-22 18:20:55 +02:00
dbfd5d4346 Merge branch 'main' into fix/account-page 2021-05-20 22:34:53 +09:00
58b9bcb15a Merge branch 'fix/account-page' into quote-main 2021-05-20 21:58:41 +09:00
noellabo
89eca938b4 Fix quote on public stream 2021-05-20 07:21:56 +09:00
noellabo
86de2ccfa4 Fix to hide mute and blocked quotes 2021-05-20 07:21:56 +09:00
noellabo
9149fc0b18 Fix an avatar icon size of the status quoted on the public page 2021-05-20 07:21:56 +09:00
wakin
199a09a8e6 remake quote feature 2021-05-20 07:21:56 +09:00
Genbu Hase
7529fbfa55 [New] Implement a feature of quote 2021-05-20 07:21:56 +09:00
Zero King
028ba13eb3 Remove duplicate CSS properties (#16278) 2021-05-19 23:51:52 +02:00
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