diff --git a/app/soapbox/features/federation_restrictions/components/instance_restrictions.js b/app/soapbox/features/federation_restrictions/components/instance_restrictions.js index fc873da87..27c5756e2 100644 --- a/app/soapbox/features/federation_restrictions/components/instance_restrictions.js +++ b/app/soapbox/features/federation_restrictions/components/instance_restrictions.js @@ -50,8 +50,8 @@ class InstanceRestrictions extends ImmutablePureComponent { if (followers_only) { items.push(( - - + + - + + - + + - + + - + + - + + + - + + {this.renderContent()}; + return ( +
+ {this.renderContent()} +
+ ); } } diff --git a/app/soapbox/features/federation_restrictions/components/restricted_instance.tsx b/app/soapbox/features/federation_restrictions/components/restricted_instance.tsx index 4949bf0cb..7b2547d2b 100644 --- a/app/soapbox/features/federation_restrictions/components/restricted_instance.tsx +++ b/app/soapbox/features/federation_restrictions/components/restricted_instance.tsx @@ -24,20 +24,19 @@ const RestrictedInstance: React.FC = ({ host }) => { }; return ( -
- -
- -
-
+
+ + +
{remoteInstance.get('host')}
-
+
diff --git a/app/soapbox/features/federation_restrictions/index.tsx b/app/soapbox/features/federation_restrictions/index.tsx index 396f527a0..95adc8b25 100644 --- a/app/soapbox/features/federation_restrictions/index.tsx +++ b/app/soapbox/features/federation_restrictions/index.tsx @@ -40,17 +40,15 @@ const FederationRestrictions = () => { return ( -
- - {intl.formatMessage(messages.boxMessage, { siteTitle })} - -
+ + {intl.formatMessage(messages.boxMessage, { siteTitle })} + -
+
{hosts.map((host) => )} diff --git a/app/styles/application.scss b/app/styles/application.scss index 1dcd2efd5..f27ab386e 100644 --- a/app/styles/application.scss +++ b/app/styles/application.scss @@ -67,7 +67,6 @@ @import 'components/backups'; @import 'components/crypto-donate'; @import 'components/remote-timeline'; -@import 'components/federation-restrictions'; @import 'components/aliases'; @import 'components/icon'; @import 'components/radio-button'; diff --git a/app/styles/components/federation-restrictions.scss b/app/styles/components/federation-restrictions.scss deleted file mode 100644 index 4bc42ff94..000000000 --- a/app/styles/components/federation-restrictions.scss +++ /dev/null @@ -1,69 +0,0 @@ -.federation-restrictions { - padding-top: 15px; - - .slist .item-list > article { - padding: 0 20px; - - &:last-child { - padding-bottom: 15px; - } - } -} - -.restricted-instance { - &__header { - padding: 10px 0; - display: flex; - text-decoration: none; - color: var(--primary-text-color); - } - - &__icon { - width: 16px; - - .svg-icon svg { - stroke-width: 1.3; - } - } - - &--expanded &__icon i.fa { - transform: translateX(-3px); - } - - &--reject &__host { - text-decoration: line-through; - } - - &__restrictions { - height: 0; - overflow: hidden; - } - - &--expanded &__restrictions { - height: auto; - } - - .instance-restrictions { - padding: 5px 0 5px 15px; - border-left: 3px solid hsla(var(--primary-text-color_hsl), 0.4); - color: var(--primary-text-color--faint); - margin-bottom: 15px; - - .federation-restriction { - padding: 7px 0; - font-size: 14px; - } - - &__message { - margin-bottom: 10px; - - i.fa { - padding-right: 10px; - } - - &:last-child { - margin-bottom: 0; - } - } - } -}