Skip to content

Commit c8d6d85

Browse files
tobias-93tobias-93
committed
Move to Font Awesome 6 icons
1 parent 462cb47 commit c8d6d85

File tree

12 files changed

+36
-36
lines changed

12 files changed

+36
-36
lines changed

‎Form/Type/DatePickerType.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ public function configureOptions(OptionsResolver $resolver): void
3535
'width' => null,
3636
'config' => [
3737
'icons' => [
38-
'time' => "fa fa-clock-o",
39-
'date' => "fa fa-calendar",
38+
'time' => "fa fa-clock fa-regular",
39+
'date' => "fa fa-calendar-days fa-regular",
4040
'up' => "fa fa-arrow-up",
4141
'down' => "fa fa-arrow-down"
4242
]

‎Form/Type/DateTimePickerType.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ public function buildView(FormView $view, FormInterface $form, array $options):
2020
$view->vars['width'] = $options['width'];
2121
$view->vars['config'] = array_replace($options['config'], array(
2222
'icons' => array(
23-
'time' => "fa fa-clock-o",
24-
'date' => "fa fa-calendar",
23+
'time' => "fa fa-clock fa-regular",
24+
'date' => "fa fa-calendar-days fa-regular",
2525
'up' => "fa fa-arrow-up",
2626
'down' => "fa fa-arrow-down"
2727
)
@@ -44,8 +44,8 @@ public function configureOptions(OptionsResolver $resolver): void
4444
'config' => [
4545
'sideBySide' => false,
4646
'icons' => [
47-
'time' => "fa fa-clock-o",
48-
'date' => "fa fa-calendar",
47+
'time' => "fa fa-clock fa-regular",
48+
'date' => "fa fa-calendar-days fa-regular",
4949
'up' => "fa fa-arrow-up",
5050
'down' => "fa fa-arrow-down"
5151
]

‎Form/Type/TimePickerType.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function buildView(FormView $view, FormInterface $form, array $options):
2222

2323
if ($options['with_minutes'] && $options['with_seconds']) {
2424
$widgetFormat = 'HH:mm:ss';
25-
} else if ($options['with_minutes']) {
25+
} else if ($options['with_minutes']) {
2626
$widgetFormat = 'HH:mm';
2727
} else {
2828
$widgetFormat = 'HH';
@@ -31,9 +31,9 @@ public function buildView(FormView $view, FormInterface $form, array $options):
3131
if ($view->vars['value']) {
3232
$view->vars['widget_value'] = $view->vars['value'];
3333
}
34-
34+
3535
$view->vars['widget_format'] = $widgetFormat;
36-
36+
3737
}
3838

3939
public function configureOptions(OptionsResolver $resolver)
@@ -43,8 +43,8 @@ public function configureOptions(OptionsResolver $resolver)
4343
'width' => null,
4444
'config' => [
4545
'icons' => [
46-
'time' => "fa fa-clock-o",
47-
'date' => "fa fa-calendar",
46+
'time' => "fa fa-clock fa-regular",
47+
'date' => "fa fa-calendar-days fa-regular",
4848
'up' => "fa fa-arrow-up",
4949
'down' => "fa fa-arrow-down"
5050
]

‎Resources/public/bootstrap-collection/css/bootstrap-collection.css

+5-5
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,19 @@ tr.collection-item .panel-heading .panel-toggle:focus label.control-label {
7272
text-decoration: underline;
7373
}
7474

75-
tr.collection-item .panel-heading .panel-toggle .fa.fa-chevron-right {
75+
tr.collection-item .panel-heading .panel-toggle .fa-chevron-right {
7676
display: none;
7777
}
7878

79-
tr.collection-item .panel-heading .panel-toggle .fa.fa-chevron-down {
79+
tr.collection-item .panel-heading .panel-toggle .fa-chevron-down {
8080
display: inline;
8181
}
8282

83-
tr.collection-item .panel-heading .panel-toggle.collapsed .fa.fa-chevron-down {
83+
tr.collection-item .panel-heading .panel-toggle.collapsed .fa-chevron-down {
8484
display: none;
8585
}
8686

87-
tr.collection-item .panel-heading .panel-toggle.collapsed .fa.fa-chevron-right {
87+
tr.collection-item .panel-heading .panel-toggle.collapsed .fa-chevron-right {
8888
display: inline;
8989
}
9090

@@ -207,4 +207,4 @@ fieldset.collection-item > .collection-item-actions > .btn-toggle > input[type="
207207
cursor: -webkit-grabbing;
208208
cursor: -moz-grabbing;
209209
cursor: move\9; /* fallback cursor for IE */
210-
}
210+
}

‎Resources/public/bootstrap-collection/css/bootstrap-collection.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Resources/public/daterange-picker/js/daterangepicker.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -97,21 +97,21 @@
9797
'<div class="calendar left">' +
9898
'<div class="daterangepicker_input">' +
9999
'<input class="input-mini form-control" type="text" name="daterangepicker_start" value="" />' +
100-
'<i class="fa fa-calendar glyphicon glyphicon-calendar"></i>' +
100+
'<i class="fa fa-calendar-days fa-regular glyphicon glyphicon-calendar"></i>' +
101101
'<div class="calendar-time">' +
102102
'<div></div>' +
103-
'<i class="fa fa-clock-o glyphicon glyphicon-time"></i>' +
103+
'<i class="fa fa-clock fa-regular glyphicon glyphicon-time"></i>' +
104104
'</div>' +
105105
'</div>' +
106106
'<div class="calendar-table"></div>' +
107107
'</div>' +
108108
'<div class="calendar right">' +
109109
'<div class="daterangepicker_input">' +
110110
'<input class="input-mini form-control" type="text" name="daterangepicker_end" value="" />' +
111-
'<i class="fa fa-calendar glyphicon glyphicon-calendar"></i>' +
111+
'<i class="fa fa-calendar-days fa-regular glyphicon glyphicon-calendar"></i>' +
112112
'<div class="calendar-time">' +
113113
'<div></div>' +
114-
'<i class="fa fa-clock-o glyphicon glyphicon-time"></i>' +
114+
'<i class="fa fa-clock fa-regular glyphicon glyphicon-time"></i>' +
115115
'</div>' +
116116
'</div>' +
117117
'<div class="calendar-table"></div>' +

‎Resources/public/daterange-picker/js/daterangepicker.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Resources/views/Form/BootstrapCollection/collection_batch_delete.html.twig

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{% if allow_delete %}
22
{% apply spaceless %}
33
<a class="btn btn-danger batch-delete">
4-
<i class="fa fa-trash-o"></i>
4+
<i class="fa fa-trash-can fa-regular"></i>
55
{{- ' ' ~ 's2a_bootstrap_collection.delete'|trans({}, 'AdmingeneratorFormExtensions') -}}
66
</a>
77
<label class="btn btn-link btn-toggle input-append">
88
<input type="checkbox" name="toggle">
99
</label>
1010
{% endapply %}
11-
{% endif %}
11+
{% endif %}

‎Resources/views/Form/SingleUpload/controls.html.twig

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{% if deleteable %}
2121
<div class="btn-wrapper">
2222
<button type="button" class="btn btn-danger delete" style="display: none;">
23-
<i class="fa fa-trash-o"></i>
23+
<i class="fa fa-trash-can fa-regular"></i>
2424
<span> {{ 's2a_single_upload.button.delete'|trans({}, 'AdmingeneratorFormExtensions') }}</span>
2525
</button>
2626
</div>

‎Resources/views/Form/SingleUpload/upload.html.twig

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<i class="fa fa-plus"></i> {{ 's2a_single_upload.button.add'|trans({}, 'AdmingeneratorFormExtensions') }}
33
</span>
44
<span class="replace" {% if form.vars.data|default is empty %}style="display: none;"{% endif %}>
5-
<i class="fa fa-refresh"></i> {{ 's2a_single_upload.button.replace'|trans({}, 'AdmingeneratorFormExtensions') }}
6-
</span>
5+
<i class="fa fa-arrows-rotate"></i> {{ 's2a_single_upload.button.replace'|trans({}, 'AdmingeneratorFormExtensions') }}
6+
</span>

‎Resources/views/Form/UploadCollection/template_download.html.twig

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
{% if (file.uid) { %}
9595
{% endverbatim %}
9696
<button class="btn btn-warning remove">
97-
<i class="fa fa-trash-o"></i>
97+
<i class="fa fa-trash-can fa-regular"></i>
9898
<span> {{ 's2a_upload_collection.cancel'|trans({}, 'AdmingeneratorFormExtensions') }}</span>
9999
</button>
100100
{% verbatim %}
@@ -108,7 +108,7 @@
108108
{% endif %}
109109
{% if allow_delete %}
110110
<button class="btn btn-danger delete">
111-
<i class="fa fa-trash-o"></i>
111+
<i class="fa fa-trash-can fa-regular"></i>
112112
<span> {{ 's2a_upload_collection.delete'|trans({}, 'AdmingeneratorFormExtensions') }}</span>
113113
</button>
114114
<span class="btn btn-toggle btn-link input-append">

‎Resources/views/Form/form_html.html.twig

+7-7
Original file line numberDiff line numberDiff line change
@@ -146,15 +146,15 @@
146146
{% endif %}
147147
{% if allow_delete %}
148148
<button type="button" class="btn btn-danger delete">
149-
<i class="fa fa-fw fa-trash"></i>
149+
<i class="fa fa-fw fa-trash-can"></i>
150150
<span> {{ 's2a_upload_collection.delete'|trans({}, 'AdmingeneratorFormExtensions') }}</span>
151151
</button>
152152
<label class="btn btn-toggle btn-link input-append">
153153
<input type="checkbox" class="toggle">
154154
</label>
155155
{% endif %}
156156
<div class="fileupload-progressbar">
157-
<i class="fa fa-fw fa-cog fa-2x fa-spin"></i>
157+
<i class="fa fa-fw fa-gear fa-2x fa-spin"></i>
158158
</div>
159159
</div>
160160
{% endif %}
@@ -281,21 +281,21 @@
281281

282282
{% block s2a_datetime_picker_widget %}
283283
{% apply spaceless %}
284-
{% set widgetIcon = 'fa fa-calendar' %}
284+
{% set widgetIcon = 'fa-regular fa-calendar-days' %}
285285
{{ block('s2a_datetime_family_prototype') }}
286286
{% endapply %}
287287
{% endblock s2a_datetime_picker_widget %}
288288

289289
{% block s2a_date_picker_widget %}
290290
{% apply spaceless %}
291-
{% set widgetIcon = 'fa fa-calendar' %}
291+
{% set widgetIcon = 'fa-regular fa-calendar-days' %}
292292
{{ block('s2a_datetime_family_prototype') }}
293293
{% endapply %}
294294
{% endblock s2a_date_picker_widget %}
295295

296296
{% block s2a_time_picker_widget %}
297297
{% apply spaceless %}
298-
{% set widgetIcon = 'fa fa-clock-o' %}
298+
{% set widgetIcon = 'fa-regular fa-clock' %}
299299
{{ block('s2a_datetime_family_prototype') }}
300300
{% endapply %}
301301
{% endblock s2a_time_picker_widget %}
@@ -308,7 +308,7 @@
308308
<input id="{{ id ~ '_search' }}" type="text" class="s2a-gmap-input form-control" placeholder="{{ 's2a_google_map.placeholder'|trans({}, 'AdmingeneratorFormExtensions') }}">
309309
<span class="input-group-btn">
310310
<button id="{{ id ~ '_search_button' }}" class="s2a-gmap-search_button btn btn-default" type="button">
311-
<i class="fa fa-search"></i> {{ 's2a_google_map.search'|trans({}, 'AdmingeneratorFormExtensions') }}
311+
<i class="fa fa-magnifying-glass"></i> {{ 's2a_google_map.search'|trans({}, 'AdmingeneratorFormExtensions') }}
312312
</button>
313313
</span>
314314
<span class="input-group-btn">
@@ -338,7 +338,7 @@
338338
{% block s2a_daterange_picker_widget %}
339339
{% apply spaceless %}
340340
<div class="input-group">
341-
<span class="input-group-addon"><i class="fa fa-calendar fa-fw"></i></span>
341+
<span class="input-group-addon"><i class="fa fa-calendar-days fa-regular fa-fw"></i></span>
342342
{{ block('form_widget_simple') }}
343343
</div>
344344
{% endapply %}

0 commit comments

Comments
 (0)