diff --git a/app/javascript/flavours/glitch/features/list_timeline/index.js b/app/javascript/flavours/glitch/features/list_timeline/index.js index c3156de8d..70e530bae 100644 --- a/app/javascript/flavours/glitch/features/list_timeline/index.js +++ b/app/javascript/flavours/glitch/features/list_timeline/index.js @@ -14,6 +14,7 @@ import { openModal } from 'flavours/glitch/actions/modal'; import MissingIndicator from 'flavours/glitch/components/missing_indicator'; import LoadingIndicator from 'flavours/glitch/components/loading_indicator'; import Icon from 'flavours/glitch/components/icon'; +import RadioButton from 'flavours/glitch/components/radio_button'; const messages = defineMessages({ deleteMessage: { id: 'confirmations.delete_list.message', defaultMessage: 'Are you sure you want to permanently delete this list?' }, @@ -176,7 +177,7 @@ class ListTimeline extends React.PureComponent { multiColumn={multiColumn} bindToDocument={!multiColumn} > -
+
@@ -187,19 +188,14 @@ class ListTimeline extends React.PureComponent {
{ replies_policy !== undefined && ( -
+
+ + +
-
- - { ['no_replies', 'list_replies', 'all_replies'].map(policy => ( -
- - -
- ))} -
+ { ['no_replies', 'list_replies', 'all_replies'].map(policy => ( + + ))}
)} diff --git a/app/javascript/flavours/glitch/styles/components/index.scss b/app/javascript/flavours/glitch/styles/components/index.scss index 2231874bc..306e62342 100644 --- a/app/javascript/flavours/glitch/styles/components/index.scss +++ b/app/javascript/flavours/glitch/styles/components/index.scss @@ -1356,7 +1356,6 @@ button.icon-button.active i.fa-retweet { } .setting-toggle__label, -.setting-radio__label, .setting-meta__label { color: $darker-text-color; display: inline-block; @@ -1365,25 +1364,8 @@ button.icon-button.active i.fa-retweet { vertical-align: middle; } -.setting-radio { +.column-settings__row .radio-button { display: block; - line-height: 18px; -} - -.setting-radio__label { - margin-bottom: 0; -} - -.column-settings__row legend { - color: $darker-text-color; - cursor: default; - display: block; - font-weight: 500; - margin-top: 10px; -} - -.setting-radio__input { - vertical-align: middle; } .setting-meta__label {