MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replaced <p> tags by <div> tags to keep the usual button size in 

<dangerous-button> modal-confirm's slots.
This commit is contained in:
jovuit 2019-02-25 15:07:03 +01:00 committed by Eliot Berriot
parent a04edb3531
commit 56cdc79b9a
11 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changes/changelog.d/702.bugfix Normal file
View File

@ -0,0 +1 @@
Fixed alignement/size issue with some buttons (#702)

2
front/src/components/auth/Settings.vue
View File

@ -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" />

4
front/src/components/auth/SubsonicTokenForm.vue
View File

@ -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>

2
front/src/components/common/ActionTable.vue
View File

@ -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

4
front/src/components/manage/moderation/InstancePolicyForm.vue
View File

@ -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>

2
front/src/components/playlists/Editor.vue
View File

@ -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">

4
front/src/views/content/libraries/Form.vue
View File

@ -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>

6
front/src/views/content/libraries/Quota.vue
View File

@ -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>

2
front/src/views/content/remote/Card.vue
View File

@ -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>

2
front/src/views/playlists/Detail.vue
View File

@ -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>

2
front/src/views/radios/Detail.vue
View File

@ -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>