From cb1ac732c4df85cc082c4e40f2c8a7d144ceb9f2 Mon Sep 17 00:00:00 2001 From: "M.Shibuya" Date: Wed, 3 Nov 2021 14:41:28 +0900 Subject: [PATCH] Upgrade FontAwesome to 5.15.4 --- .../javascripts/rails_admin/ra.filter-box.js | 7 +- .../rails_admin/ra.filtering-select.js | 2 +- .../rails_admin/ra.nested-form-hooks.js | 4 +- .../javascripts/rails_admin/ra.widgets.js | 14 +- app/assets/javascripts/rails_admin/ui.js | 20 +- .../base/font-awesome-4-compability.scss | 153 - .../rails_admin/rails_admin.scss.erb | 1 - app/helpers/rails_admin/form_builder.rb | 2 +- .../main/_form_file_upload.html.haml | 2 +- .../_form_filtering_multiselect.html.haml | 2 +- .../main/_form_filtering_select.html.haml | 4 +- .../main/_form_multiple_file_upload.html.haml | 2 +- .../main/_form_nested_many.html.haml | 6 +- .../main/_form_nested_one.html.haml | 8 +- .../main/_submit_buttons.html.haml | 4 +- .../rails_admin/main/bulk_delete.html.haml | 4 +- app/views/rails_admin/main/delete.html.haml | 4 +- app/views/rails_admin/main/export.html.haml | 8 +- app/views/rails_admin/main/history.html.haml | 4 +- app/views/rails_admin/main/index.html.haml | 6 +- lib/rails_admin/config/actions/base.rb | 2 +- lib/rails_admin/config/actions/dashboard.rb | 2 +- lib/rails_admin/config/actions/delete.rb | 2 +- lib/rails_admin/config/actions/edit.rb | 2 +- lib/rails_admin/config/actions/export.rb | 2 +- .../config/actions/history_index.rb | 2 +- .../config/actions/history_show.rb | 2 +- lib/rails_admin/config/actions/index.rb | 2 +- lib/rails_admin/config/actions/new.rb | 2 +- lib/rails_admin/config/actions/show.rb | 2 +- lib/rails_admin/config/actions/show_in_app.rb | 2 +- .../config/fields/types/boolean.rb | 6 +- spec/integration/fields/boolean_spec.rb | 6 +- spec/integration/widgets/filter_box_spec.rb | 6 +- .../config/fields/types/boolean_spec.rb | 6 +- .../assets/fonts/rails_admin/FontAwesome.otf | Bin 134808 -> 0 bytes .../assets/fonts/rails_admin/fa-solid-900.eot | Bin 0 -> 203030 bytes .../assets/fonts/rails_admin/fa-solid-900.svg | 5034 +++++++++++++ .../assets/fonts/rails_admin/fa-solid-900.ttf | Bin 0 -> 202744 bytes .../fonts/rails_admin/fa-solid-900.woff | Bin 0 -> 101648 bytes .../fonts/rails_admin/fa-solid-900.woff2 | Bin 0 -> 78268 bytes .../fonts/rails_admin/fontawesome-webfont.eot | Bin 165742 -> 0 bytes .../fonts/rails_admin/fontawesome-webfont.svg | 2671 ------- .../fonts/rails_admin/fontawesome-webfont.ttf | Bin 165548 -> 0 bytes .../rails_admin/fontawesome-webfont.woff | Bin 98024 -> 0 bytes .../rails_admin/fontawesome-webfont.woff2 | Bin 77160 -> 0 bytes .../stylesheets/rails_admin/font-awesome.scss | 6692 +++++++++++------ 47 files changed, 9584 insertions(+), 5116 deletions(-) delete mode 100644 app/assets/stylesheets/rails_admin/base/font-awesome-4-compability.scss delete mode 100755 vendor/assets/fonts/rails_admin/FontAwesome.otf create mode 100644 vendor/assets/fonts/rails_admin/fa-solid-900.eot create mode 100644 vendor/assets/fonts/rails_admin/fa-solid-900.svg create mode 100644 vendor/assets/fonts/rails_admin/fa-solid-900.ttf create mode 100644 vendor/assets/fonts/rails_admin/fa-solid-900.woff create mode 100644 vendor/assets/fonts/rails_admin/fa-solid-900.woff2 delete mode 100755 vendor/assets/fonts/rails_admin/fontawesome-webfont.eot delete mode 100755 vendor/assets/fonts/rails_admin/fontawesome-webfont.svg delete mode 100755 vendor/assets/fonts/rails_admin/fontawesome-webfont.ttf delete mode 100755 vendor/assets/fonts/rails_admin/fontawesome-webfont.woff delete mode 100755 vendor/assets/fonts/rails_admin/fontawesome-webfont.woff2 diff --git a/app/assets/javascripts/rails_admin/ra.filter-box.js b/app/assets/javascripts/rails_admin/ra.filter-box.js index aae15e99c1..8439a218bf 100644 --- a/app/assets/javascripts/rails_admin/ra.filter-box.js +++ b/app/assets/javascripts/rails_admin/ra.filter-box.js @@ -97,7 +97,7 @@ ) .add( $('') - .append($('').addClass('icon-' + (multiple_values ? 'minus' : 'plus'))) + .append($('').addClass('fas fa-' + (multiple_values ? 'minus' : 'plus'))) ); break; case 'string': @@ -172,8 +172,7 @@ .attr('id', filterContainerId) .addClass('filter form-search') .append( - $('') - .append($('').append('').append(document.createTextNode(field_label))) + $('').append('').append(document.createTextNode(field_label)) ) .append(' ') .append(control) @@ -228,7 +227,7 @@ var not_selected_select = $(this).siblings('select:hidden'); not_selected_select.attr('name', not_selected_select.data('name')).show('slow'); selected_select.attr('name', null).hide('slow'); - $(this).find('i').toggleClass("icon-plus icon-minus") + $(this).find('i').toggleClass("fa-plus fa-minus") }); $(document).on('change', "#filters_box .switch-additional-fieldsets", function(e) { diff --git a/app/assets/javascripts/rails_admin/ra.filtering-select.js b/app/assets/javascripts/rails_admin/ra.filtering-select.js index 29fc397ae1..b292efb51e 100644 --- a/app/assets/javascripts/rails_admin/ra.filtering-select.js +++ b/app/assets/javascripts/rails_admin/ra.filtering-select.js @@ -51,7 +51,7 @@ this.button = this._buttonField(); } this.clearOption = $('').append( - ' ' + $('').text(RailsAdmin.I18n.t("clear")).html() + ' ' + $('').text(RailsAdmin.I18n.t("clear")).html() ); this.noObjectsPlaceholder = $('