Skip to content

Commit

Permalink
gui: Allow text wrapping in remove folder/device modals (syncthing#7976)
Browse files Browse the repository at this point in the history
Remove the embedded CSS that prevents the lines from wrapping, resulting
in device and folder names being hidden on small screens.
  • Loading branch information
tomasz1986 authored Nov 22, 2021
1 parent 1754c93 commit 7161a99
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
8 changes: 5 additions & 3 deletions gui/default/syncthing/device/removeDeviceDialogView.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<modal id="remove-device-confirmation" status="warning" icon="fas fa-question-circle" heading="{{'Remove Device' | translate}}" large="no" closeable="yes">
<div class="modal-body">
<p ng-model="currentDevice.name" style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
<span translate translate-value-name="{{currentDevice.name}}">Are you sure you want to remove device {%name%}?</span>
<p ng-model="currentDevice.name" translate translate-value-name="{{currentDevice.name}}">
Are you sure you want to remove device {%name%}?
</p>
<p ng-if="willBeReintroducedBy" translate translate-value-reintroducer="{{willBeReintroducedBy}}">
{%reintroducer%} might reintroduce this device.
</p>
<p ng-if="willBeReintroducedBy" translate translate-value-reintroducer="{{willBeReintroducedBy}}">{%reintroducer%} might reintroduce this device.</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-warning pull-left btn-sm" data-dismiss="modal" ng-click="deleteDevice()">
Expand Down
4 changes: 2 additions & 2 deletions gui/default/syncthing/folder/removeFolderDialogView.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<modal id="remove-folder-confirmation" status="warning" icon="fas fa-question-circle" heading="{{'Remove Folder' | translate}}" large="no" closeable="yes">
<div class="modal-body">
<p style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
<span translate translate-value-label="{{currentFolder.label}}">Are you sure you want to remove folder {%label%}?</span>
<p translate translate-value-label="{{currentFolder.label}}">
Are you sure you want to remove folder {%label%}?
</p>
<p translate>
No files will be deleted as a result of this operation.
Expand Down

0 comments on commit 7161a99

Please sign in to comment.