A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(theme): put the Trust button inside the site address field (#3767)
Hampus1e526a891529
diff --git a/fluxer_app/src/features/theme_settings/ThemesTab.module.css b/fluxer_app/src/features/theme_settings/ThemesTab.module.cssindex 955d9bd0c..29d1d872e 100644--- a/fluxer_app/src/features/theme_settings/ThemesTab.module.css+++ b/fluxer_app/src/features/theme_settings/ThemesTab.module.css@@ -210,14 +210,3 @@flex-wrap: wrap;}}--.trustedSiteForm {- display: flex;- align-items: flex-end;- gap: var(--spacing-3);-}--.trustedSiteForm > :first-child {- flex: 1 1 auto;- min-width: 0;-}diff --git a/fluxer_app/src/features/theme_settings/components/TrustedSitesSettings.tsx b/fluxer_app/src/features/theme_settings/components/TrustedSitesSettings.tsxindex b1c0c2aa4..275cfdb95 100644--- a/fluxer_app/src/features/theme_settings/components/TrustedSitesSettings.tsx+++ b/fluxer_app/src/features/theme_settings/components/TrustedSitesSettings.tsx@@ -79,7 +79,6 @@ export const TrustedSitesSettings: React.FC = observer(() => {{i18n._(TRUSTED_SITE_WARNING_DESCRIPTOR)}</p><form- className={styles.trustedSiteForm}onSubmit={(event) => {event.preventDefault();handleTrust();@@ -94,21 +93,23 @@ export const TrustedSitesSettings: React.FC = observer(() => {autoComplete="off"spellCheck={false}error={error ?? undefined}+ rightElement={+ <Button+ type="submit"+ compact+ fitContent+ disabled={value.trim() === ''}+ data-flx="theme-settings.trusted-sites-settings.button.trust"+ >+ {i18n._(TRUST_DESCRIPTOR)}+ </Button>+ }onChange={(event) => {setValue(event.target.value);setError(null);}}data-flx="theme-settings.trusted-sites-settings.input.site-address"/>- <Button- type="submit"- variant="secondary"- fitContent- disabled={value.trim() === ''}- data-flx="theme-settings.trusted-sites-settings.button.trust"- >- {i18n._(TRUST_DESCRIPTOR)}- </Button></form>{sites.length > 0 ? (<div className={styles.list} data-flx="theme-settings.trusted-sites-settings.list">