Skip to content

Commit 00d4695

Browse files
efb4f5ff-1298-471a-8973-3d47447115dcPikachuEXEabsidue
authored
Move General section within the Distraction Free Settings to top (#7719)
* Move General section to top * fix indent * add seperate class for side bar title Co-Authored-By: PikachuEXE <[email protected]> Co-Authored-By: absidue <[email protected]> * fix lint * Revert "fix lint" This reverts commit b1a7796. * Revert "add seperate class for side bar title" This reverts commit 7519e8a. * Add review suggestions Co-Authored-By: PikachuEXE <[email protected]> Co-Authored-By: absidue <[email protected]> --------- Co-authored-by: PikachuEXE <[email protected]> Co-authored-by: absidue <[email protected]>
1 parent d1182b5 commit 00d4695

File tree

2 files changed

+90
-86
lines changed

2 files changed

+90
-86
lines changed

‎src/renderer/components/distraction-settings/distraction-settings.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@
33
display: none;
44
}
55
}
6+
7+
.containingTextFlexBox {
8+
margin-block-end: 2em;
9+
}

‎src/renderer/components/distraction-settings/distraction-settings.vue‎

Lines changed: 86 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,92 @@
22
<ft-settings-section
33
:title="$t('Settings.Distraction Free Settings.Distraction Free Settings')"
44
>
5+
<h4
6+
class="groupTitle"
7+
>
8+
{{ $t('Settings.Distraction Free Settings.Sections.General') }}
9+
</h4>
10+
<div class="switchColumnGrid">
11+
<div class="switchColumn">
12+
<ft-toggle-switch
13+
:label="$t('Settings.Distraction Free Settings.Hide Video Views')"
14+
:compact="true"
15+
:default-value="hideVideoViews"
16+
@change="updateHideVideoViews"
17+
/>
18+
<ft-toggle-switch
19+
:label="$t('Settings.Distraction Free Settings.Hide Channel Subscribers')"
20+
:compact="true"
21+
:default-value="hideChannelSubscriptions"
22+
@change="updateHideChannelSubscriptions"
23+
/>
24+
<ft-toggle-switch
25+
:label="$t('Settings.Distraction Free Settings.Hide Sharing Actions')"
26+
:compact="true"
27+
:default-value="hideSharingActions"
28+
@change="updateHideSharingActions"
29+
/>
30+
<ft-toggle-switch
31+
:label="$t('Settings.Distraction Free Settings.Hide Videos on Watch')"
32+
:default-value="hideWatchedSubs"
33+
:compact="true"
34+
:tooltip="$t('Tooltips.Distraction Free Settings.Hide Videos on Watch')"
35+
@change="updateHideWatchedSubs"
36+
/>
37+
</div>
38+
<div class="switchColumn">
39+
<ft-toggle-switch
40+
:label="$t('Settings.Distraction Free Settings.Hide Live Streams')"
41+
:compact="true"
42+
:default-value="hideLiveStreams"
43+
@change="updateHideLiveStreams"
44+
/>
45+
<ft-toggle-switch
46+
:label="$t('Settings.Distraction Free Settings.Hide Upcoming Premieres')"
47+
:compact="true"
48+
:default-value="hideUpcomingPremieres"
49+
@change="updateHideUpcomingPremieres"
50+
/>
51+
<ft-toggle-switch
52+
:label="$t('Settings.Distraction Free Settings.Display Titles Without Excessive Capitalisation')"
53+
:compact="true"
54+
:default-value="showDistractionFreeTitles"
55+
@change="updateShowDistractionFreeTitles"
56+
/>
57+
</div>
58+
</div>
59+
<br class="hide-on-mobile">
60+
<ft-flex-box>
61+
<ft-input-tags
62+
:disabled="channelHiderDisabled"
63+
:disabled-msg="$t('Settings.Distraction Free Settings.Hide Channels Disabled Message')"
64+
:label="$t('Settings.Distraction Free Settings.Hide Channels')"
65+
:tag-name-placeholder="$t('Settings.Distraction Free Settings.Hide Channels Placeholder')"
66+
:tag-list="channelsHidden"
67+
:tooltip="$t('Tooltips.Distraction Free Settings.Hide Channels')"
68+
:validate-tag-name="validateChannelId"
69+
:find-tag-info="findChannelTagInfo"
70+
:are-channel-tags="true"
71+
:show-tags="showAddedChannelsHidden"
72+
@invalid-name="handleInvalidChannel"
73+
@error-find-tag-info="handleChannelAPIError"
74+
@change="handleChannelsHidden"
75+
@already-exists="handleChannelsExists"
76+
@toggle-show-tags="handleAddedChannelsHidden"
77+
/>
78+
</ft-flex-box>
79+
<ft-flex-box class="containingTextFlexBox">
80+
<ft-input-tags
81+
:label="$t('Settings.Distraction Free Settings.Hide Videos and Playlists Containing Text')"
82+
:tag-name-placeholder="$t('Settings.Distraction Free Settings.Hide Videos and Playlists Containing Text Placeholder')"
83+
:show-tags="showAddedForbiddenTitles"
84+
:tag-list="forbiddenTitles"
85+
:min-input-length="3"
86+
:tooltip="$t('Tooltips.Distraction Free Settings.Hide Videos and Playlists Containing Text')"
87+
@change="handleForbiddenTitles"
88+
@toggle-show-tags="handleAddedForbiddenTitles"
89+
/>
90+
</ft-flex-box>
591
<h4
692
class="groupTitle"
793
>
@@ -192,92 +278,6 @@
192278
/>
193279
</div>
194280
</div>
195-
<h4
196-
class="groupTitle"
197-
>
198-
{{ $t('Settings.Distraction Free Settings.Sections.General') }}
199-
</h4>
200-
<div class="switchColumnGrid">
201-
<div class="switchColumn">
202-
<ft-toggle-switch
203-
:label="$t('Settings.Distraction Free Settings.Hide Video Views')"
204-
:compact="true"
205-
:default-value="hideVideoViews"
206-
@change="updateHideVideoViews"
207-
/>
208-
<ft-toggle-switch
209-
:label="$t('Settings.Distraction Free Settings.Hide Channel Subscribers')"
210-
:compact="true"
211-
:default-value="hideChannelSubscriptions"
212-
@change="updateHideChannelSubscriptions"
213-
/>
214-
<ft-toggle-switch
215-
:label="$t('Settings.Distraction Free Settings.Hide Sharing Actions')"
216-
:compact="true"
217-
:default-value="hideSharingActions"
218-
@change="updateHideSharingActions"
219-
/>
220-
<ft-toggle-switch
221-
:label="$t('Settings.Distraction Free Settings.Hide Videos on Watch')"
222-
:default-value="hideWatchedSubs"
223-
:compact="true"
224-
:tooltip="$t('Tooltips.Distraction Free Settings.Hide Videos on Watch')"
225-
@change="updateHideWatchedSubs"
226-
/>
227-
</div>
228-
<div class="switchColumn">
229-
<ft-toggle-switch
230-
:label="$t('Settings.Distraction Free Settings.Hide Live Streams')"
231-
:compact="true"
232-
:default-value="hideLiveStreams"
233-
@change="updateHideLiveStreams"
234-
/>
235-
<ft-toggle-switch
236-
:label="$t('Settings.Distraction Free Settings.Hide Upcoming Premieres')"
237-
:compact="true"
238-
:default-value="hideUpcomingPremieres"
239-
@change="updateHideUpcomingPremieres"
240-
/>
241-
<ft-toggle-switch
242-
:label="$t('Settings.Distraction Free Settings.Display Titles Without Excessive Capitalisation')"
243-
:compact="true"
244-
:default-value="showDistractionFreeTitles"
245-
@change="updateShowDistractionFreeTitles"
246-
/>
247-
</div>
248-
</div>
249-
<br class="hide-on-mobile">
250-
<ft-flex-box>
251-
<ft-input-tags
252-
:disabled="channelHiderDisabled"
253-
:disabled-msg="$t('Settings.Distraction Free Settings.Hide Channels Disabled Message')"
254-
:label="$t('Settings.Distraction Free Settings.Hide Channels')"
255-
:tag-name-placeholder="$t('Settings.Distraction Free Settings.Hide Channels Placeholder')"
256-
:tag-list="channelsHidden"
257-
:tooltip="$t('Tooltips.Distraction Free Settings.Hide Channels')"
258-
:validate-tag-name="validateChannelId"
259-
:find-tag-info="findChannelTagInfo"
260-
:are-channel-tags="true"
261-
:show-tags="showAddedChannelsHidden"
262-
@invalid-name="handleInvalidChannel"
263-
@error-find-tag-info="handleChannelAPIError"
264-
@change="handleChannelsHidden"
265-
@already-exists="handleChannelsExists"
266-
@toggle-show-tags="handleAddedChannelsHidden"
267-
/>
268-
</ft-flex-box>
269-
<ft-flex-box>
270-
<ft-input-tags
271-
:label="$t('Settings.Distraction Free Settings.Hide Videos and Playlists Containing Text')"
272-
:tag-name-placeholder="$t('Settings.Distraction Free Settings.Hide Videos and Playlists Containing Text Placeholder')"
273-
:show-tags="showAddedForbiddenTitles"
274-
:tag-list="forbiddenTitles"
275-
:min-input-length="3"
276-
:tooltip="$t('Tooltips.Distraction Free Settings.Hide Videos and Playlists Containing Text')"
277-
@change="handleForbiddenTitles"
278-
@toggle-show-tags="handleAddedForbiddenTitles"
279-
/>
280-
</ft-flex-box>
281281
</ft-settings-section>
282282
</template>
283283

0 commit comments

Comments
 (0)