6 Commits

Author	SHA1	Message	Date
Baptiste Lemoine	e50cb7160a	🐛 add icons in dropdown menu, fix style for this dropdown ... Merge remote-tracking branch 'origin' Signed-off-by: Baptiste Lemoine <contact@cipherbliss.com> # Conflicts: # .ruby-version # app/javascript/mastodon/components/status.js # app/javascript/mastodon/features/direct_timeline/components/conversation.js # app/javascript/mastodon/features/getting_started/components/announcements.js # app/javascript/mastodon/locales/fr.json # config/locales/kab.yml # config/locales/ta.yml # yarn.lock	2020-04-09 17:33:58 +02:00
Shlee	221eda646b	Migrate Rails ujs as required for Rails 6 Upgrade. (#13280) ... * Update yarn.lock * Update package.json * Update public.js * Update admin.js * Update log_out.js * Update common.js	2020-03-21 03:14:50 +01:00
Eugen Rochko	8b19903559	Improve the public hashtag page (#9831) ... - 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-17 14:06:08 +01:00
Eugen Rochko	3d7f68c273	Revert Font Awesome 5 upgrade (#8810) ... * Revert "Fix some icon names changed by the Font Awesome 5. (#8796)" This reverts commit 3f9ec3de82. * Revert "Migrate to font-awesome 5.0. (#8799)" This reverts commit 8bae14591b. * Revert "Fix some icons names, unavailable in fontawesome5 (free license). (#8792)" This reverts commit b9c727a945. * Revert "Update the icon name changed by the Font Awesome 5. (#8776)" This reverts commit 17af4d27da. * Revert "Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484)" This reverts commit 4b794e134d.	2018-09-28 02:11:14 +02:00
Maciek Baron	4b794e134d	Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484) ... * Migrate to newer version of Font Awesome * Add bot icon to bot avatars	2018-09-25 05:08:55 +02:00
Yamagishi Kazutoshi	e9b322d0a6	Upgrade webpack to version v4.x (#6655)	2018-07-14 03:56:41 +02:00