raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-10 23:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move select2 images to asset pipeline

Browse Source 
png sprites? That was a flashback..
This commit is contained in:
David Cook
2025-02-03 17:23:26 +11:00
parent d8a58b2257
commit 4ee35fc1ab
5 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/spree/admin/product_properties/index.html.haml
View File

@@ -12,7 +12,7 @@
= form_for @product, url: admin_product_url(@product, @url_filters), method: :put do |f|
%fieldset.no-border-top
.add_product_properties
= image_pack_tag 'select2-spinner.gif', plugin: 'spree', style: 'display:none;', id: 'busy_indicator'
= image_tag 'select2-spinner.gif', plugin: 'spree', style: 'display:none;', id: 'busy_indicator'
%table.index.sortable{"data-sortable-link" => update_positions_admin_product_product_properties_url}
%thead

4
app/views/spree/admin/states/index.html.haml
View File

@@ -1,4 +1,4 @@
= render partial: 'spree/admin/shared/configuration_menu'
dmin= render partial: 'spree/admin/shared/configuration_menu'
- content_for :page_title do
= t("spree.states")
@@ -11,6 +11,6 @@
- databaseurl = "#{admin_states_path(format: :js)}?country_id="
%select#country.observe_field.select2.fullwidth{"data-base-url" => databaseurl, "data-update" => "#state-list"}
= options_from_collection_for_select(@countries, :id, :name, @country.id)
= image_pack_tag 'select2-spinner.gif', plugin: 'spree', style: 'display:none;', id: 'busy_indicator'
= image_tag 'select2-spinner.gif', plugin: 'spree', style: 'display:none;', id: 'busy_indicator'
#state-list
= render partial: 'state_list'

2
app/webpacker/packs/application.js
View File

@@ -6,5 +6,3 @@ import "../js/matomo";
import "../js/moment";
require.context("../fonts", true);
const images = require.context("../images", true);
const imagePath = (name) => images(name, true);

3
config/webpacker.yml
View File

@@ -13,8 +13,7 @@ default: &default
'vendor',
'app/webpacker/css',
'app/webpacker/fonts',
'app/webpacker/images',
'app/assets/images', # images should be outside of webpacker where possible
'app/assets/images',
'engines/web/app/assets/stylesheets',
'app/components'
]

30
vendor/assets/stylesheets/select2.css.scss vendored
View File

@@ -95,7 +95,7 @@ Version: 3.4.3 Timestamp: Tue Sep 17 06:47:14 PDT 2013
text-decoration: none;
border: 0;
background: url('../images/select2.png') right top no-repeat;
background: url('../../assets/images/select2.png') right top no-repeat;
cursor: pointer;
outline: 0;
}
@@ -199,7 +199,7 @@ Version: 3.4.3 Timestamp: Tue Sep 17 06:47:14 PDT 2013
display: block;
width: 100%;
height: 100%;
background: url('../images/select2.png') no-repeat 0 1px;
background: url('../../assets/images/select2.png') no-repeat 0 1px;
}
.select2-search {
@@ -233,11 +233,11 @@ Version: 3.4.3 Timestamp: Tue Sep 17 06:47:14 PDT 2013
-webkit-box-shadow: none;
box-shadow: none;
background: #fff url('../images/select2.png') no-repeat 100% -22px;
background: url('../images/select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
background: url('../images/select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
background: url('../images/select2.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
background: url('../images/select2.png') no-repeat 100% -22px, linear-gradient(top, #fff 85%, #eee 99%);
background: #fff url('../../assets/images/select2.png') no-repeat 100% -22px;
background: url('../../assets/images/select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
background: url('../../assets/images/select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
background: url('../../assets/images/select2.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
background: url('../../assets/images/select2.png') no-repeat 100% -22px, linear-gradient(top, #fff 85%, #eee 99%);
}
.select2-drop.select2-drop-above .select2-search input {
@@ -245,11 +245,11 @@ Version: 3.4.3 Timestamp: Tue Sep 17 06:47:14 PDT 2013
}
.select2-search input.select2-active {
background: #fff url('../images/select2-spinner.gif') no-repeat 100%;
background: url('../images/select2-spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
background: url('../images/select2-spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
background: url('../images/select2-spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
background: url('../images/select2-spinner.gif') no-repeat 100%, linear-gradient(top, #fff 85%, #eee 99%);
background: #fff url('../../assets/images/select2-spinner.gif') no-repeat 100%;
background: url('../../assets/images/select2-spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
background: url('../../assets/images/select2-spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
background: url('../../assets/images/select2-spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
background: url('../../assets/images/select2-spinner.gif') no-repeat 100%, linear-gradient(top, #fff 85%, #eee 99%);
}
.select2-container-active .select2-choice,
@@ -393,7 +393,7 @@ disabled look for disabled choices in the results dropdown
}
.select2-more-results.select2-active {
background: #f4f4f4 url('../images/select2-spinner.gif') no-repeat 100%;
background: #f4f4f4 url('../../assets/images/select2-spinner.gif') no-repeat 100%;
}
.select2-more-results {
@@ -481,7 +481,7 @@ disabled look for disabled choices in the results dropdown
}
.select2-container-multi .select2-choices .select2-search-field input.select2-active {
background: #fff url('../images/select2-spinner.gif') no-repeat 100% !important;
background: #fff url('../../assets/images/select2-spinner.gif') no-repeat 100% !important;
}
.select2-default {
@@ -535,7 +535,7 @@ disabled look for disabled choices in the results dropdown
font-size: 1px;
outline: none;
background: url('../images/select2.png') right top no-repeat;
background: url('../../assets/images/select2.png') right top no-repeat;
}
.select2-container-multi .select2-search-choice-close {