From 56cdc79b9a2119ecd207e63ef0b3fffbbb6255a5 Mon Sep 17 00:00:00 2001
From: jovuit <jvuitton@disroot.org>
Date: Mon, 25 Feb 2019 15:07:03 +0100
Subject: [PATCH] Replaced <p> tags by <div> tags to keep the usual button size
in <dangerous-button> modal-confirm's slots.
---
changes/changelog.d/702.bugfix | 1 +
front/src/components/auth/Settings.vue | 2 +-
front/src/components/auth/SubsonicTokenForm.vue | 4 ++--
front/src/components/common/ActionTable.vue | 2 +-
.../src/components/manage/moderation/InstancePolicyForm.vue | 4 ++--
front/src/components/playlists/Editor.vue | 2 +-
front/src/views/content/libraries/Form.vue | 4 ++--
front/src/views/content/libraries/Quota.vue | 6 +++---
front/src/views/content/remote/Card.vue | 2 +-
front/src/views/playlists/Detail.vue | 2 +-
front/src/views/radios/Detail.vue | 2 +-
11 files changed, 16 insertions(+), 15 deletions(-)
create mode 100644 changes/changelog.d/702.bugfix
diff --git a/changes/changelog.d/702.bugfix b/changes/changelog.d/702.bugfix
new file mode 100644
index 00000000..3c8090fc
--- /dev/null
+++ b/changes/changelog.d/702.bugfix
@@ -0,0 +1 @@
+Fixed alignement/size issue with some buttons (#702)
\ No newline at end of file
diff --git a/front/src/components/auth/Settings.vue b/front/src/components/auth/Settings.vue
index 73515a1b..3098d43f 100644
--- a/front/src/components/auth/Settings.vue
+++ b/front/src/components/auth/Settings.vue
@@ -102,7 +102,7 @@
<li><translate :translate-context="'Popup/Settings/List item'">Your Subsonic password will be changed to a new, random one, logging you out from devices that used the old Subsonic password</translate></li>
</ul>
</div>
- <p slot="modal-confirm"><translate :translate-context="'Popup/Setting/Button.Label'">Disable access</translate></p>
+ <div slot="modal-confirm"><translate :translate-context="'Popup/Setting/Button.Label'">Disable access</translate></div>
</dangerous-button>
</form>
<div class="ui hidden divider" />
diff --git a/front/src/components/auth/SubsonicTokenForm.vue b/front/src/components/auth/SubsonicTokenForm.vue
index 1e179dd9..496d69ea 100644
--- a/front/src/components/auth/SubsonicTokenForm.vue
+++ b/front/src/components/auth/SubsonicTokenForm.vue
@@ -34,7 +34,7 @@
<translate :translate-context="'Content/Settings/Button.Label/Verb'">Request a new password</translate>
<p slot="modal-header"><translate :translate-context="'Popup/Settings/Title'">Request a new Subsonic API password?</translate></p>
<p slot="modal-content"><translate :translate-context="'Popup/Settings/Paragraph'">This will log you out from existing devices that use the current password.</translate></p>
- <p slot="modal-confirm"><translate :translate-context="'Popup/Settings/Button.Label/Verb'">Request a new password</translate></p>
+ <div slot="modal-confirm"><translate :translate-context="'Popup/Settings/Button.Label/Verb'">Request a new password</translate></div>
</dangerous-button>
<button
v-else
@@ -49,7 +49,7 @@
<translate :translate-context="'Content/Settings/Button.Label/Verb'">Disable Subsonic access</translate>
<p slot="modal-header"><translate :translate-context="'Popup/Settings/Title'">Disable Subsonic API access?</translate></p>
<p slot="modal-content"><translate :translate-context="'Popup/Settings/Paragraph'">This will completely disable access to the Subsonic API using from account.</translate></p>
- <p slot="modal-confirm"><translate :translate-context="'Popup/Settings/Button.Label'">Disable access</translate></p>
+ <div slot="modal-confirm"><translate :translate-context="'Popup/Settings/Button.Label'">Disable access</translate></div>
</dangerous-button>
</template>
</form>
diff --git a/front/src/components/common/ActionTable.vue b/front/src/components/common/ActionTable.vue
index 5fcaceaa..f1c5a400 100644
--- a/front/src/components/common/ActionTable.vue
+++ b/front/src/components/common/ActionTable.vue
@@ -45,7 +45,7 @@
<p slot="modal-content">
<translate>This may affect a lot of elements or have irreversible consequences, please double check this is really what you want.</translate>
</p>
- <p slot="modal-confirm"><translate>Launch</translate></p>
+ <div slot="modal-confirm"><translate>Launch</translate></div>
</dangerous-button>
<div
v-else
diff --git a/front/src/components/manage/moderation/InstancePolicyForm.vue b/front/src/components/manage/moderation/InstancePolicyForm.vue
index 05ccecc5..7235b941 100644
--- a/front/src/components/manage/moderation/InstancePolicyForm.vue
+++ b/front/src/components/manage/moderation/InstancePolicyForm.vue
@@ -66,9 +66,9 @@
<p slot="modal-content">
<translate :translate-context="'Popup/Moderation/Paragraph'">This action is irreversible.</translate>
</p>
- <p slot="modal-confirm">
+ <div slot="modal-confirm">
<translate :translate-context="'Popup/Moderation/Button.Label/Verb'">Delete moderation rule</translate>
- </p>
+ </div>
</dangerous-button>
</form>
</template>
diff --git a/front/src/components/playlists/Editor.vue b/front/src/components/playlists/Editor.vue
index fee9ef6b..eb533fd0 100644
--- a/front/src/components/playlists/Editor.vue
+++ b/front/src/components/playlists/Editor.vue
@@ -43,7 +43,7 @@
<translate :translate-context="'Popup/Playlist/Title'" :translate-params="{playlist: playlist.name}">Do you want to clear the playlist "%{ playlist }"?</translate>
</p>
<p slot="modal-content"><translate :translate-context="'Popup/Playlist/Paragraph'">This will remove all tracks from this playlist and cannot be undone.</translate></p>
- <p slot="modal-confirm"><translate :translate-context="'Popup/Playlist/Button.Label'">Clear playlist</translate></p>
+ <div slot="modal-confirm"><translate :translate-context="'Popup/Playlist/Button.Label'">Clear playlist</translate></div>
</dangerous-button>
<div class="ui hidden divider"></div>
<template v-if="plts.length > 0">
diff --git a/front/src/views/content/libraries/Form.vue b/front/src/views/content/libraries/Form.vue
index 3ebbe152..378ca9b0 100644
--- a/front/src/views/content/libraries/Form.vue
+++ b/front/src/views/content/libraries/Form.vue
@@ -36,9 +36,9 @@
The library and all its tracks will be deleted. This can not be undone.
</translate>
</p>
- <p slot="modal-confirm">
+ <div slot="modal-confirm">
<translate :translate-context="'Popup/Library/Button.Label/Verb'">Delete library</translate>
- </p>
+ </div>
</dangerous-button>
</form>
</template>
diff --git a/front/src/views/content/libraries/Quota.vue b/front/src/views/content/libraries/Quota.vue
index 5a817b33..ddc304f7 100644
--- a/front/src/views/content/libraries/Quota.vue
+++ b/front/src/views/content/libraries/Quota.vue
@@ -37,7 +37,7 @@
<translate :translate-context="'Content/Library/Button.Label/Verb'">Purge</translate>
<p slot="modal-header"><translate :translate-context="'Popup/Library/Title'">Purge pending files?</translate></p>
<p slot="modal-content"><translate :translate-context="'Popup/Library/Paragraph'">Removes uploaded but yet to be processed tracks completely, adding the corresponding data to your quota.</translate></p>
- <p slot="modal-confirm"><translate :translate-context="'Popup/Library/Button.Label'">Purge</translate></p>
+ <div slot="modal-confirm"><translate :translate-context="'Popup/Library/Button.Label'">Purge</translate></div>
</dangerous-button>
</div>
</div>
@@ -63,7 +63,7 @@
<translate :translate-context="'Content/Library/Button.Label/Verb'">Purge</translate>
<p slot="modal-header"><translate :translate-context="'Popup/Library/Title'">Purge skipped files?</translate></p>
<p slot="modal-content"><translate :translate-context="'Popup/Library/Paragraph'">Removes uploaded tracks skipped during the import processes completely, adding the corresponding data to your quota.</translate></p>
- <p slot="modal-confirm"><translate :translate-context="'Popup/Library/Button.Label'">Purge</translate></p>
+ <div slot="modal-confirm"><translate :translate-context="'Popup/Library/Button.Label'">Purge</translate></div>
</dangerous-button>
</div>
</div>
@@ -89,7 +89,7 @@
<translate :translate-context="'Content/Library/Button.Label/Verb'">Purge</translate>
<p slot="modal-header"><translate :translate-context="'Popup/Library/Title'">Purge errored files?</translate></p>
<p slot="modal-content"><translate :translate-context="'Popup/Library/Paragraph'">Removes uploaded tracks that could not be processed by the server completely, adding the corresponding data to your quota.</translate></p>
- <p slot="modal-confirm"><translate :translate-context="'Popup/Library/Button.Label'">Purge</translate></p>
+ <div slot="modal-confirm"><translate :translate-context="'Popup/Library/Button.Label'">Purge</translate></div>
</dangerous-button>
</div>
</div>
diff --git a/front/src/views/content/remote/Card.vue b/front/src/views/content/remote/Card.vue
index f5965729..f42d0b06 100644
--- a/front/src/views/content/remote/Card.vue
+++ b/front/src/views/content/remote/Card.vue
@@ -103,7 +103,7 @@
<div slot="modal-content">
<p><translate :translate-context="'Popup/Library/Paragraph'">By unfollowing this library, you loose access to its content.</translate></p>
</div>
- <p slot="modal-confirm"><translate :translate-context="'Popup/Library/Button.Label'">Unfollow</translate></p>
+ <div slot="modal-confirm"><translate :translate-context="'Popup/Library/Button.Label'">Unfollow</translate></div>
</dangerous-button>
</div>
</div>
diff --git a/front/src/views/playlists/Detail.vue b/front/src/views/playlists/Detail.vue
index c96b8e38..afaa2a91 100644
--- a/front/src/views/playlists/Detail.vue
+++ b/front/src/views/playlists/Detail.vue
@@ -37,7 +37,7 @@
<translate :translate-params="{playlist: playlist.name}" :translate-context="'Popup/Playlist/Title/Call to action'">Do you want to delete the playlist "%{ playlist }"?</translate>
</p>
<p slot="modal-content"><translate :translate-context="'Popup/Playlist/Paragraph'">This will completely delete this playlist and cannot be undone.</translate></p>
- <p slot="modal-confirm"><translate :translate-context="'Popup/Playlist/Button.Label/Verb'">Delete playlist</translate></p>
+ <div slot="modal-confirm"><translate :translate-context="'Popup/Playlist/Button.Label/Verb'">Delete playlist</translate></div>
</dangerous-button>
</div>
</section>
diff --git a/front/src/views/radios/Detail.vue b/front/src/views/radios/Detail.vue
index c6cf51c5..5669c7ee 100644
--- a/front/src/views/radios/Detail.vue
+++ b/front/src/views/radios/Detail.vue
@@ -26,7 +26,7 @@
<i class="trash icon"></i> Delete
<p slot="modal-header"><translate :translate-context="'Popup/Radio/Title'" :translate-params="{radio: radio.name}">Do you want to delete the radio "%{ radio }"?</translate></p>
<p slot="modal-content"><translate :translate-context="'Popup/Radio/Paragraph'">This will completely delete this radio and cannot be undone.</translate></p>
- <p slot="modal-confirm"><translate :translate-context="'Popup/Radio/Button.Label/Verb'">Delete radio</translate></p>
+ <div slot="modal-confirm"><translate :translate-context="'Popup/Radio/Button.Label/Verb'">Delete radio</translate></div>
</dangerous-button>
</template>
</div>
--
GitLab