From 2f9efb721c8ae7a0cf6075a5b2f475544eac275b Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 16 Dec 2024 08:38:56 +0100 Subject: [PATCH] [Glitch] Change animation on feed generation screen in web UI Port 3cf6681736bae45cf13bf48cb2a72d3ac60bef60 to glitch-soc Signed-off-by: Claire --- .../components/regeneration_indicator.jsx | 18 ------------ .../components/regeneration_indicator.tsx | 26 +++++++++++++++++ .../glitch/components/status_list.jsx | 2 +- .../flavours/glitch/styles/components.scss | 28 +++++++------------ 4 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 app/javascript/flavours/glitch/components/regeneration_indicator.jsx create mode 100644 app/javascript/flavours/glitch/components/regeneration_indicator.tsx diff --git a/app/javascript/flavours/glitch/components/regeneration_indicator.jsx b/app/javascript/flavours/glitch/components/regeneration_indicator.jsx deleted file mode 100644 index d42a7d7c72..0000000000 --- a/app/javascript/flavours/glitch/components/regeneration_indicator.jsx +++ /dev/null @@ -1,18 +0,0 @@ -import { FormattedMessage } from 'react-intl'; - -import illustration from '@/images/elephant_ui_working.svg'; - -const RegenerationIndicator = () => ( -
-
- -
- -
- - -
-
-); - -export default RegenerationIndicator; diff --git a/app/javascript/flavours/glitch/components/regeneration_indicator.tsx b/app/javascript/flavours/glitch/components/regeneration_indicator.tsx new file mode 100644 index 0000000000..e26b93eb4f --- /dev/null +++ b/app/javascript/flavours/glitch/components/regeneration_indicator.tsx @@ -0,0 +1,26 @@ +import { FormattedMessage } from 'react-intl'; + +import { GIF } from './gif'; + +export const RegenerationIndicator: React.FC = () => ( +
+ + +
+ + + + +
+
+); diff --git a/app/javascript/flavours/glitch/components/status_list.jsx b/app/javascript/flavours/glitch/components/status_list.jsx index b0295a504d..09061f9dc0 100644 --- a/app/javascript/flavours/glitch/components/status_list.jsx +++ b/app/javascript/flavours/glitch/components/status_list.jsx @@ -6,7 +6,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component'; import { debounce } from 'lodash'; import { TIMELINE_GAP, TIMELINE_SUGGESTIONS } from 'flavours/glitch/actions/timelines'; -import RegenerationIndicator from 'flavours/glitch/components/regeneration_indicator'; +import { RegenerationIndicator } from 'flavours/glitch/components/regeneration_indicator'; import { InlineFollowSuggestions } from 'flavours/glitch/features/home_timeline/components/inline_follow_suggestions'; import StatusContainer from '../containers/status_container'; diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss index e9df98f83e..03d7a41f66 100644 --- a/app/javascript/flavours/glitch/styles/components.scss +++ b/app/javascript/flavours/glitch/styles/components.scss @@ -4171,10 +4171,7 @@ a.status-card { } .regeneration-indicator { - text-align: center; - font-size: 16px; - font-weight: 500; - color: $dark-text-color; + color: $darker-text-color; border: 1px solid var(--background-border-color); border-top: 0; cursor: default; @@ -4186,31 +4183,26 @@ a.status-card { padding: 20px; &__figure { - &, - img { - display: block; - width: auto; - height: 160px; - margin: 0; - } - } - - &--without-header { - padding-top: 20px + 48px; + display: block; + width: 100%; + height: auto; + max-width: 350px; + margin-top: -50px; } &__label { - margin-top: 30px; + text-align: center; + font-size: 16px; strong { + font-weight: 500; display: block; margin-bottom: 10px; - color: $dark-text-color; + color: $darker-text-color; } span { font-size: 15px; - font-weight: 400; } } }