kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-19 20:11:16 +00:00
Code Issues Projects Releases Wiki Activity

Upgraded Font Awesome to v6

Browse Source
This commit is contained in:
Bernd Bestel
2022-04-04 20:10:29 +02:00
parent d871fe7aa8
commit e336f24225
85 changed files with 514 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
views/components/batterycard.blade.php
View File

@@ -12,7 +12,7 @@
href="#"
data-toggle="tooltip"
title="{{ $__t('Edit battery') }}">
<i class="fas fa-edit"></i>
<i class="fa-solid fa-edit"></i>
</a>
<a id="batterycard-battery-journal-button"
class="btn btn-sm btn-outline-secondary py-0 mr-1 float-right disabled show-as-dialog-link"

2
views/components/calendarcard.blade.php
View File

@@ -6,7 +6,7 @@
<div class="card">
<div class="card-header">
<i class="fas fa-calendar"></i> {{ $__t('Calendar') }}
<i class="fa-solid fa-calendar"></i> {{ $__t('Calendar') }}
</div>
<div class="card-body">
<div id="calendar"

2
views/components/chorecard.blade.php
View File

@@ -12,7 +12,7 @@
href="#"
data-toggle="tooltip"
title="{{ $__t('Edit chore') }}">
<i class="fas fa-edit"></i>
<i class="fa-solid fa-edit"></i>
</a>
<a id="chorecard-chore-journal-button"
class="btn btn-sm btn-outline-secondary py-0 mr-1 float-right disabled show-as-dialog-link"

4
views/components/datetimepicker.blade.php
View File

@@ -21,7 +21,7 @@
<div class="datetimepicker-wrapper form-group {{ $additionalGroupCssClasses }}">
<label for="{{ $id }}">{{ $__t($label) }}
@if(!empty($hint))
&nbsp;<i class="fas fa-question-circle text-muted"
&nbsp;<i class="fa-solid fa-question-circle text-muted"
data-toggle="tooltip"
data-trigger="hover click"
title="{{ $hint }}"></i>
@@ -60,7 +60,7 @@
<div class="input-group-append"
data-target="#{{ $id }}"
data-toggle="datetimepicker">
<div class="input-group-text"><i class="fas fa-calendar"></i></div>
<div class="input-group-text"><i class="fa-solid fa-calendar"></i></div>
</div>
<div class="invalid-feedback">{{ $invalidFeedback }}</div>
</div>

4
views/components/datetimepicker2.blade.php
View File

@@ -21,7 +21,7 @@
<div class="datetimepicker2-wrapper form-group {{ $additionalGroupCssClasses }}">
<label for="{{ $id }}">{{ $__t($label) }}
@if(!empty($hint))
&nbsp;<i class="fas fa-question-circle text-muted"
&nbsp;<i class="fa-solid fa-question-circle text-muted"
data-toggle="tooltip"
data-trigger="hover click"
title="{{ $hint }}"></i>
@@ -60,7 +60,7 @@
<div class="input-group-append"
data-target="#{{ $id }}"
data-toggle="datetimepicker">
<div class="input-group-text"><i class="fas fa-calendar"></i></div>
<div class="input-group-text"><i class="fa-solid fa-calendar"></i></div>
</div>
<div class="invalid-feedback">{{ $invalidFeedback }}</div>
</div>

2
views/components/locationpicker.blade.php
View File

@@ -16,7 +16,7 @@
data-prefill-by-id="{{ $prefillById }}">
<label for="location_id">{{ $__t('Location') }}
@if(!empty($hint))
<i class="fas fa-question-circle text-muted"
<i class="fa-solid fa-question-circle text-muted"
data-toggle="tooltip"
data-trigger="hover click"
title="{{ $hint }}"></i>

6
views/components/numberpicker.blade.php
View File

@@ -27,7 +27,7 @@
{{ $__t($label) }}
@if(!empty($hint) || !empty($hintId))
<i id="{{ $hintId }}"
class="fas fa-question-circle text-muted"
class="fa-solid fa-question-circle text-muted"
data-toggle="tooltip"
data-trigger="hover click"
title="{{ $hint }}"></i>
@@ -60,10 +60,10 @@
@endif
autocomplete="off">
<div class="input-group-append">
<div class="input-group-text numberpicker-up-button"><i class="fas fa-arrow-up"></i></div>
<div class="input-group-text numberpicker-up-button"><i class="fa-solid fa-arrow-up"></i></div>
</div>
<div class="input-group-append">
<div class="input-group-text numberpicker-down-button"><i class="fas fa-arrow-down"></i></div>
<div class="input-group-text numberpicker-down-button"><i class="fa-solid fa-arrow-down"></i></div>
</div>
<div class="invalid-feedback">{{ $invalidFeedback }}</div>
</div>

4
views/components/productcard.blade.php
View File

@@ -13,7 +13,7 @@
href="#"
data-toggle="tooltip"
title="{{ $__t('Edit product') }}">
<i class="fas fa-edit"></i>
<i class="fa-solid fa-edit"></i>
</a>
<a id="productcard-product-journal-button"
class="btn btn-sm btn-outline-secondary py-0 mr-1 float-right disabled show-as-dialog-link"
@@ -46,7 +46,7 @@
<span id="productcard-product-stock-opened-amount"
class="small font-italic locale-number locale-number-quantity-amount"></span>
<span id="productcard-aggregated-amounts"
class="pl-2 text-secondary d-none"><i class="fas fa-custom-sigma-sign"></i> <span id="productcard-product-stock-amount-aggregated"
class="pl-2 text-secondary d-none"><i class="fa-solid fa-custom-sigma-sign"></i> <span id="productcard-product-stock-amount-aggregated"
class="locale-number locale-number-quantity-amount"></span> <span id="productcard-product-stock-qu-name-aggregated"></span> <span id="productcard-product-stock-opened-amount-aggregated locale-number locale-number-quantity-amount"
class="small font-italic"></span></span><br>

6
views/components/productpicker.blade.php
View File

@@ -26,13 +26,13 @@
for="product_id">
{{ $__t($label) }}
@if(!$disallowAllProductWorkflows)
<i class="fas fa-question-circle text-muted"
<i class="fa-solid fa-question-circle text-muted"
data-toggle="tooltip"
data-trigger="hover click"
title="{{ $__t('Type a new product name or barcode and hit TAB or ENTER to start a workflow') }}"></i>
@endif
@if(!empty($hint))
<i class="fas fa-question-circle text-muted"
<i class="fa-solid fa-question-circle text-muted"
data-toggle="tooltip"
data-trigger="hover click"
title="{{ $hint }}"></i>
@@ -40,7 +40,7 @@
<span id="barcode-lookup-disabled-hint"
class="small text-muted d-none float-right"> {{ $__t('Barcode lookup is disabled') }}</span>
<i id="barcode-lookup-hint"
class="fas fa-barcode float-right mt-1"></i>
class="fa-solid fa-barcode float-right mt-1"></i>
</label>
<select class="form-control product-combobox barcodescanner-input"
id="product_id"

4
views/components/recipepicker.blade.php
View File

@@ -17,12 +17,12 @@
<label class="w-100"
for="recipe_id">{{ $__t('Recipe') }}
@if(!empty($hint))
<i class="fas fa-question-circle text-muted"
<i class="fa-solid fa-question-circle text-muted"
data-toggle="tooltip"
data-trigger="hover click"
title="{{ $hint }}"></i>
@endif
<i class="fas fa-barcode float-right mt-1"></i>
<i class="fa-solid fa-barcode float-right mt-1"></i>
</label>
<select class="form-control recipe-combobox barcodescanner-input"
id="recipe_id"

2
views/components/userfields_tbody.blade.php
View File

@@ -18,7 +18,7 @@ $excludeFieldTypes = [];
<td>
@if($userfieldObject !== null)
@if($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_CHECKBOX)
@if($userfieldObject->value == 1)<i class="fas fa-check"></i>@endif
@if($userfieldObject->value == 1)<i class="fa-solid fa-check"></i>@endif
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_PRESET_CHECKLIST)
{!! str_replace(',', '<br>', $userfieldObject->value) !!}
@elseif($userfield->type == \Grocy\Services\UserfieldsService::USERFIELD_TYPE_LINK)

6
views/components/userfieldsform.blade.php
View File

@@ -171,12 +171,12 @@
<div class="invalid-feedback">{{ $__t('Mandatory Userfield') }}</div>
</div>
<div class="input-group-append userfield-file-delete">
<span class="input-group-text"><i class="fas fa-trash"></i></span>
<span class="input-group-text"><i class="fa-solid fa-trash"></i></span>
</div>
<div class="input-group-append">
<a href="#"
target="_blank"
class="input-group-text userfield-file-show d-none discrete-link"><i class="fas fa-eye"></i></a>
class="input-group-text userfield-file-show d-none discrete-link"><i class="fa-solid fa-eye"></i></a>
</div>
</div>
</div>
@@ -196,7 +196,7 @@
<div class="invalid-feedback">{{ $__t('Mandatory Userfield') }}</div>
</div>
<div class="input-group-append userfield-file-delete">
<span class="input-group-text"><i class="fas fa-trash"></i></span>
<span class="input-group-text"><i class="fa-solid fa-trash"></i></span>
</div>
</div>
<img src=""