Matt-Yorkley
5edd562691
Merge pull request #6238 from openfoodfoundation/mobile-5-product-listings
...
Merge Product Listings to master
2020-10-22 21:55:42 +02:00
Luis Ramos
61cfdb4038
Merge pull request #6114 from mbudm/issue/6031
...
Add matomo tag to admin pages
2020-10-22 15:24:34 +01:00
Matt-Yorkley
489529d30e
Merge pull request #5729 from luisramos0/image_settings
...
Remove Image settings page and standardise Paperclip styles
2020-10-22 15:58:14 +02:00
Matt-Yorkley
01adf459b1
Replace top padding on product list
2020-10-22 09:59:16 +01:00
Maikel Linke
2887751098
Move translation to its own section
2020-10-22 15:46:49 +11:00
Maikel Linke
e37fedc435
Add bulk ribbon to bulk products
2020-10-22 15:46:49 +11:00
Maikel Linke
b57c912aa0
Add space between products and filters
2020-10-22 15:46:48 +11:00
Maikel Linke
66d5f8d5c1
Align first product flush to the search bar
2020-10-22 15:46:47 +11:00
Matt-Yorkley
b79d9bd75b
Fix screen-width bug for desktop down
...
The width of these elements was ~105% of total screen width, adding horizontal scrollbars and whitespace on the left hand side
2020-10-22 15:46:47 +11:00
Matt-Yorkley
6bcf11e308
Adjust layout of variant rows for better use of vertical space
2020-10-22 15:46:47 +11:00
Matt-Yorkley
98e581c059
Remove pad-top class from products from to match alignment with filter sidebar
2020-10-22 15:46:46 +11:00
Matt-Yorkley
a89c81a033
Hide description paragraph if product has no description
...
Improves the appearance of the layout when no description is present
2020-10-22 15:46:46 +11:00
Maikel Linke
4ab2375832
Reduce margin on the right of product listing
2020-10-22 15:46:45 +11:00
Maikel Linke
1fb544b803
Remove margin of product listing on mobile and tablet
2020-10-22 15:46:45 +11:00
Maikel Linke
526d4f53ad
Remove red overlay and icon on product image hover
2020-10-22 15:46:45 +11:00
Maikel Linke
fe1618cada
Add description to product listing
...
It's truncated to one line and a click reveals the modal.
2020-10-22 15:46:45 +11:00
Maikel Linke
9f5cec6d08
Remove tractor in front of producer name
2020-10-22 15:46:44 +11:00
Maikel Linke
03d8ccfe2e
Remove modal open indicator
2020-10-22 15:46:44 +11:00
Maikel Linke
f05563b30f
Removal of category icon
2020-10-22 15:46:44 +11:00
Matt-Yorkley
f5ce0d501d
Merge pull request #5870 from luisramos0/prefs
...
[Bye bye Spree] Bring models app_configuration and preference from spree_core
2020-10-20 21:12:54 +02:00
Luis Ramos
9f568c1e9d
Merge pull request #5928 from luisramos0/spree_core_js
...
[Bye bye spree] Bring final bits of js and css from spree_core
2020-10-20 13:20:41 +01:00
Luis Ramos
0f06195baa
Remove Image settings page, these settings will come from ofn-install now
2020-10-20 11:20:37 +01:00
Maikel
8c65498661
Merge pull request #5998 from andrewpbrett/shipping-per-pound
...
Per-pound shipping calculator
2020-10-16 15:27:57 +11:00
Matt-Yorkley
f260a2d114
Merge pull request #6141 from Matt-Yorkley/mobile-shops-list
...
Make shops index page usable on mobile
2020-10-16 03:21:32 +02:00
Luis Ramos
6c95444339
Merge pull request #6020 from andresgutgon/fix/admin-menu-in-multiple-lines
...
Fixed admin header buttons dropping multiple lines.
2020-10-07 21:24:48 +01:00
Matt-Yorkley
a04c2ccd6e
Make producers and groups pages usable on mobile
2020-10-06 14:18:41 +01:00
Matt-Yorkley
469e4a4c87
Make shops index page usable on mobile
2020-10-06 14:18:39 +01:00
ivoloshy
7321e4ef89
show product description in creation form after errors appeared
2020-10-04 20:44:57 +03:00
Luis Ramos
ff9f374950
Merge pull request #6050 from Matt-Yorkley/stripe-checkout-spec
...
Stripe checkout spec
2020-10-02 18:57:22 +01:00
Steve Roberts
8679e438e8
Add matomo tag to admin pages
2020-10-01 21:37:05 +10:00
Luis Ramos
1b4e19b32d
Remore preferences not used in OFN
2020-09-23 22:16:56 +01:00
Luis Ramos
bfd4164c0b
Remove handlebar extensions and some dead translations
...
This is not needed, these translations are always used through Spree.translations and this system is deprecated anyway
2020-09-23 12:45:30 +01:00
Luis Ramos
496f9c106e
Bring the very last bits of js and css from spree_core
2020-09-23 12:45:29 +01:00
Luis Ramos
a2610279d9
Merge pull request #5976 from luisramos0/address_form
...
Fix address state selector and "use billing address" checkbox in order customer details page
2020-09-23 12:42:37 +01:00
Luis Ramos
7ebdc1d0da
Merge pull request #6059 from andresgutgon/fix/sticky-search-bar-disapears-when-cart-is-open
...
Fix sticky search bar disappearing when cart is open.
2020-09-22 10:52:33 +01:00
Andy Brett
9ef706a201
update styles on enterprise fee UI
2020-09-21 15:21:18 -07:00
Matt-Yorkley
6737270ab7
Rename partial
2020-09-19 15:49:14 +01:00
Matt-Yorkley
1d01fc955d
Include StripeJS fixture and refactor to partial
2020-09-19 12:20:55 +01:00
andresgutgon
636da229ad
Fix sticky search bar disappearing when cart is open.
...
So I think the issue is that all the HTML is wrapped on an
`off-canvas-wrap` class that is used for doing the sidebar car open over
main content. The problem is that when this car sidebar is open body of
HTML overflow is changed to `overflow: hidden` and search bar use CSS
`position: sticky;` which doesn't work when its parent has overflow
hidden. The issue was that `off-canvas-wrap` had an `overflow: inherit`
which means when body is set to overflow hidden this div inherits it and
break search bar position sticky when cart sidebar is opened. The
solution is to use `position: initial` which means use what a div has as
default value for `overflow` which I think it's `visible`. This class is
overriding the same class that comes from Foundation Framework that set
this div to be `overflow: hidden`. The override was added when [we added
search sticky](ff69389bb0https://css-tricks.com/dealing-with-overflow-and-position-sticky/ ) also info about [position initial vs inherit](https://stackoverflow.com/a/29661356 )
2020-09-19 12:21:24 +02:00
andresgutgon
ef85ac3e27
Fixed admin header buttons dropping multiple lines.
2020-09-19 11:37:09 +02:00
Andy Brett
96fb65600e
refactor views to oneliners without single letter variable names
2020-09-17 16:45:55 -07:00
Andy Brett
988abf7a8c
update preference field interface to be more clear
2020-09-17 08:27:45 -07:00
Luis Ramos
212820b3da
Merge pull request #5912 from luisramos0/tcs
...
Terms and Conditions - upload PDF in the Enterprise Business Details and read them on Checkout
2020-09-17 12:01:45 +01:00
Luis Ramos
f1358dfa9a
Merge pull request #5722 from rioug/4206-back-from-Edit-Product-removed-filters-products-page
...
4206 back from edit product removed filters products page
2020-09-17 11:51:58 +01:00
Luis Ramos
f061545a92
Merge pull request #5995 from andresgutgon/fix/datetime-picker-ui-pick-the-right-translations-on-order-cycles
...
Fix date time picker translations on Order cycles screen
2020-09-17 11:50:37 +01:00
Luis Ramos
e99fdeb972
Merge pull request #5996 from andresgutgon/fix/iframe-shop-failing-because-jquery-is-not-loaded
...
Fix embedded shops failing javascript because jQuery is try to be accessed before being loaded
2020-09-17 11:32:08 +01:00
Andy Brett
d32ed6b48f
improve styling on calculators UI
2020-09-12 10:43:14 -07:00
Luis Ramos
6f59158153
Remove useless TODOs
2020-09-10 17:36:25 +01:00
andresgutgon
2297e20c78
Fix embedded shops failing javascript because jQuery is try to be
...
accessed before being loaded
Show we check for $.ready when jQuery is not downloaded yet in the
browser. The solution is to check if document is ready with plain DOM
javascript event `DOMContentLoaded`
2020-09-06 15:24:22 +02:00
andresgutgon
d1331ac78a
Fix datetime picker translations on Order cycles screen
...
So the thing is we initialize jQuery plugin on `admin/util.js.erb` but
then we override those defaults on order_cycles.js.erb.coffe. Now both
plugin initializations use the same defaults. Also added 3 missing
translations for `Done`, `Now` and `Time` copies on that timepicker popover
2020-09-06 13:43:35 +02:00
