Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Miscellaneous improvements to settings page styling #4235

Merged
merged 4 commits into from
Nov 28, 2023
Merged

Miscellaneous improvements to settings page styling #4235

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e692c04
Miscellaneous improvements to settings page styling
MitchelPaulin Oct 26, 2023
4616a6c
remove superfluous flex box
MitchelPaulin Oct 26, 2023
c67e476
Leave buttons as primary color
MitchelPaulin Nov 22, 2023
6a2d1a2
PR suggestions
MitchelPaulin Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions src/renderer/components/data-settings/data-settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,21 @@
<ft-settings-section
:title="$t('Settings.Data Settings.Data Settings')"
>
<h4 class="groupTitle">
{{ $t('Subscriptions.Subscriptions') }}
</h4>
<ft-flex-box>
<ft-button
:label="$t('Settings.Data Settings.Import Subscriptions')"
@click="importSubscriptions"
/>
<ft-button
:label="$t('Settings.Data Settings.Export Subscriptions')"
@click="showExportSubscriptionsPrompt = true"
/>
</ft-flex-box>
<ft-flex-box>
<ft-button
:label="$t('Settings.Data Settings.Import History')"
@click="importHistory"
:label="$t('Settings.Data Settings.Manage Subscriptions')"
@click="openProfileSettings"
/>
<ft-button
:label="$t('Settings.Data Settings.Export History')"
@click="exportHistory"
:label="$t('Settings.Data Settings.Export Subscriptions')"
@click="showExportSubscriptionsPrompt = true"
/>
</ft-flex-box>
<ft-flex-box>
Expand All @@ -29,12 +26,22 @@
</a>
</p>
</ft-flex-box>
<h4 class="groupTitle">
{{ $t('History.History') }}
</h4>
<ft-flex-box>
<ft-button
:label="$t('Settings.Data Settings.Manage Subscriptions')"
@click="openProfileSettings"
:label="$t('Settings.Data Settings.Import History')"
@click="importHistory"
/>
<ft-button
:label="$t('Settings.Data Settings.Export History')"
@click="exportHistory"
/>
</ft-flex-box>
<h4 class="groupTitle">
{{ $t('Playlists') }}
</h4>
<ft-flex-box>
<ft-button
:label="$t('Settings.Data Settings.Import Playlists')"
Expand Down
1 change: 1 addition & 0 deletions src/renderer/components/ft-input/ft-input.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
padding: 1rem;
border: none;
margin-block-end: 10px;
margin-block-start: 10px;
font-size: 16px;
block-size: 45px;
color: var(--secondary-text-color);
Expand Down
6 changes: 0 additions & 6 deletions src/renderer/components/privacy-settings/privacy-settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,14 @@
<ft-flex-box>
<ft-button
:label="$t('Settings.Privacy Settings.Clear Search Cache')"
text-color="var(--text-with-main-color)"
background-color="var(--primary-color)"
@click="showSearchCachePrompt = true"
/>
<ft-button
:label="$t('Settings.Privacy Settings.Remove Watch History')"
text-color="var(--text-with-main-color)"
background-color="var(--primary-color)"
@click="showRemoveHistoryPrompt = true"
/>
<ft-button
:label="$t('Settings.Privacy Settings.Remove All Subscriptions / Profiles')"
text-color="var(--text-with-main-color)"
background-color="var(--primary-color)"
@click="showRemoveSubscriptionsPrompt = true"
/>
</ft-flex-box>
Expand Down