kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 17:45:39 +00:00
Code Issues Projects Releases Wiki Activity

Various small UI improvements for the shopping list

Browse Source
This commit is contained in:
Bernd Bestel 2018-11-18 14:19:50 +01:00
parent 34d1bdd53f
commit f7f2bf3fc0
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/css/grocy.css
View File

@ -203,6 +203,10 @@ td {
} }
} }
html {
min-height: inherit;
}
/* Third party component customizations - Tempus Dominus */ /* Third party component customizations - Tempus Dominus */
.date-only-datetimepicker .bootstrap-datetimepicker-widget.dropdown-menu { .date-only-datetimepicker .bootstrap-datetimepicker-widget.dropdown-menu {
width: auto !important; width: auto !important;

2
public/viewjs/shoppinglist.js
View File

@ -140,7 +140,7 @@ $(document).on('click', '.shopping-list-stock-add-workflow-list-item-button', fu
if (Grocy.ShoppingListToStockWorkflowAll) if (Grocy.ShoppingListToStockWorkflowAll)
{ {
$("#shopping-list-stock-add-workflow-modal .modal-footer").removeClass("d-none"); $("#shopping-list-stock-add-workflow-purchase-item-count").removeClass("d-none");
$("#shopping-list-stock-add-workflow-purchase-item-count").text(L("Adding shopping list item #1 of #2", Grocy.ShoppingListToStockWorkflowCurrent, Grocy.ShoppingListToStockWorkflowCount)); $("#shopping-list-stock-add-workflow-purchase-item-count").text(L("Adding shopping list item #1 of #2", Grocy.ShoppingListToStockWorkflowCurrent, Grocy.ShoppingListToStockWorkflowCount));
} }
}); });

7
views/shoppinglist.blade.php
View File

@ -95,7 +95,7 @@
</table> </table>
</div> </div>
<div class="col-xs-12 col-md-4"> <div class="col-xs-12 col-md-4 mt-md-2">
@include('components.calendarcard') @include('components.calendarcard')
</div> </div>
</div> </div>
@ -106,8 +106,9 @@
<div class="modal-body"> <div class="modal-body">
<iframe id="shopping-list-stock-add-workflow-purchase-form-frame" class="embed-responsive" src=""></iframe> <iframe id="shopping-list-stock-add-workflow-purchase-form-frame" class="embed-responsive" src=""></iframe>
</div> </div>
<div class="modal-footer d-none"> <div class="modal-footer">
<span id="shopping-list-stock-add-workflow-purchase-item-count"></span> <span id="shopping-list-stock-add-workflow-purchase-item-count" class="d-none mr-auto"></span>
<button type="button" class="btn btn-secondary" data-dismiss="modal">{{ $L('Close') }}</button>
</div> </div>
</div> </div>
</div> </div>