Skip to content

Commit

Permalink
Merge pull request #1238 from nextcloud/fix/css-nesting
Browse files Browse the repository at this point in the history
Don't wrap setting in a div
  • Loading branch information
nickvergessen authored Aug 1, 2022
2 parents dea0f7c + 274115f commit 03a1b4b
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 31 deletions.
4 changes: 2 additions & 2 deletions js/notifications-settings.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/notifications-settings.js.map

Large diffs are not rendered by default.

54 changes: 26 additions & 28 deletions src/views/UserSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,35 +19,33 @@
-->

<template>
<div>
<SettingsSection :title="t('notifications', 'Notifications')">
<div class="notification-frequency__warning">
<strong v-if="!config.is_email_set">{{ t('notifications', 'You need to set up your email address before you can receive notification emails.') }}</strong>
</div>
<p>
<label for="notify_setting_batchtime" class="notification-frequency__label">
{{ t('notifications', 'Send email reminders about unhandled notifications after:') }}
</label>
<select id="notify_setting_batchtime"
v-model="config.setting_batchtime"
class="notification-frequency__select"
@change="updateSettings()">
<option v-for="option in batchtime_options" :key="option.value" :value="option.value">
{{ option.text }}
</option>
</select>
</p>
<SettingsSection :title="t('notifications', 'Notifications')">
<div class="notification-frequency__warning">
<strong v-if="!config.is_email_set">{{ t('notifications', 'You need to set up your email address before you can receive notification emails.') }}</strong>
</div>
<p>
<label for="notify_setting_batchtime" class="notification-frequency__label">
{{ t('notifications', 'Send email reminders about unhandled notifications after:') }}
</label>
<select id="notify_setting_batchtime"
v-model="config.setting_batchtime"
class="notification-frequency__select"
@change="updateSettings()">
<option v-for="option in batchtime_options" :key="option.value" :value="option.value">
{{ option.text }}
</option>
</select>
</p>

<CheckboxRadioSwitch :checked.sync="config.sound_notification"
@update:checked="updateSettings">
{{ t('notifications', 'Play sound when a new notification arrives') }}
</CheckboxRadioSwitch>
<CheckboxRadioSwitch :checked.sync="config.sound_talk"
@update:checked="updateSettings">
{{ t('notifications', 'Play sound when a call started (requires Nextcloud Talk)') }}
</CheckboxRadioSwitch>
</SettingsSection>
</div>
<CheckboxRadioSwitch :checked.sync="config.sound_notification"
@update:checked="updateSettings">
{{ t('notifications', 'Play sound when a new notification arrives') }}
</CheckboxRadioSwitch>
<CheckboxRadioSwitch :checked.sync="config.sound_talk"
@update:checked="updateSettings">
{{ t('notifications', 'Play sound when a call started (requires Nextcloud Talk)') }}
</CheckboxRadioSwitch>
</SettingsSection>
</template>

<script>
Expand Down

0 comments on commit 03a1b4b

Please sign in to comment.