From 6c7ee8f7780ea68d89b2b65cad296cefc3e0ed2b Mon Sep 17 00:00:00 2001 From: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:13:39 +0300 Subject: [PATCH] Merge pull request #20715 from overleaf/ii-bs5-chat-pane [web] BS5 chat pane GitOrigin-RevId: 8587aca1372b4d2087863d492e702f04a31c23e2 --- .../chat/components/chat-fallback-error.jsx | 9 +- .../js/features/chat/components/chat-pane.tsx | 12 +- .../chat/components/message-input.tsx | 6 +- .../js/shared/components/loading-spinner.tsx | 2 +- .../frontend/stylesheets/app/editor/chat.less | 10 -- .../bootstrap-5/abstracts/all.scss | 1 + .../abstracts/themes-common-variables.scss | 7 + .../stylesheets/bootstrap-5/pages/all.scss | 1 + .../bootstrap-5/pages/editor/chat.scss | 165 ++++++++++++++++++ 9 files changed, 195 insertions(+), 18 deletions(-) create mode 100644 services/web/frontend/stylesheets/bootstrap-5/abstracts/themes-common-variables.scss create mode 100644 services/web/frontend/stylesheets/bootstrap-5/pages/editor/chat.scss diff --git a/services/web/frontend/js/features/chat/components/chat-fallback-error.jsx b/services/web/frontend/js/features/chat/components/chat-fallback-error.jsx index 38273505b2..7cf990c787 100644 --- a/services/web/frontend/js/features/chat/components/chat-fallback-error.jsx +++ b/services/web/frontend/js/features/chat/components/chat-fallback-error.jsx @@ -1,6 +1,7 @@ import PropTypes from 'prop-types' import { useTranslation } from 'react-i18next' -import { Button, Alert } from 'react-bootstrap' +import OLNotification from '@/features/ui/components/ol/ol-notification' +import OLButton from '@/features/ui/components/ol/ol-button' function ChatFallbackError({ reconnect }) { const { t } = useTranslation() @@ -8,12 +9,12 @@ function ChatFallbackError({ reconnect }) { return (